Check-in [2af245b1db]
Overview
SHA1:2af245b1dbc964307166c8b154fbf1679183e6c3
Date: 2014-01-25 08:23:32
User: rkeene
Comment:Added icon
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2014-01-25
08:40
[5dcad0ff2a] Updated to register console handler, which seems to be enough to cause cleanup routines to usually run (user: rkeene, tags: trunk)
08:23
[2af245b1db] Added icon (user: rkeene, tags: trunk)
07:27
[f45867a536] Updated to compile threaded Tcl for tclkit (user: rkeene, tags: trunk)
Changes

Modified .fossil-settings/ignore-glob from [04bcbec1ed] to [028dd3bec6].

10
11
12
13
14
15
16



17
18
19
20
21
22
23
24
archive/winpcap-inst-*.exe
files/npf32.sys
files/npf64.sys
files/packet.dll
files/pthreadvc.dll
files/tcpdump.exe
files/wpcap.dll



tclkit-zip
tcpdump.exe
tcpdump.exe.bin
tcpdump.exe.zip
tcpdump.exe.new
__TMP_TCP__/*
__TMP_WPCAP__/*
kitcreator-*/*







>
>
>








10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
archive/winpcap-inst-*.exe
files/npf32.sys
files/npf64.sys
files/packet.dll
files/pthreadvc.dll
files/tcpdump.exe
files/wpcap.dll
icon/tcpdump-*x*x*.png.pgm
icon/tcpdump-*x*x*.png.ppm
icon/tcpdump.ico
tclkit-zip
tcpdump.exe
tcpdump.exe.bin
tcpdump.exe.zip
tcpdump.exe.new
__TMP_TCP__/*
__TMP_WPCAP__/*
kitcreator-*/*

Modified Makefile from [c0b5c5eabc] to [f12b3352f7].

108
109
110
111
112
113
114




115
116
117
118
119
120
121
122
123
124
125


126
127
128
129
130
131
132
...
146
147
148
149
150
151
152

153
154
155
156
157
158
159
160
161
$(TWAPI_ZIP):
	@-mkdir -p archive >/dev/null 2>/dev/null
	wget --no-use-server-timestamps -O "$(TWAPI_ZIP).new" "$(TWAPI_URL)"
	@if test -n "$(TWAPI_SHA256)"; then if test "`openssl sha256 "$(TWAPI_ZIP).new" | sed 's@^.*= *@@'`" != "$(TWAPI_SHA256)"; then echo "$(TWAPI_ZIP): Checksum Mismatch!"; exit 1; fi; fi
	unzip -l "$(TWAPI_ZIP).new"
	mv "$(TWAPI_ZIP).new" "$(TWAPI_ZIP)"





# Tclkit
$(KITCREATOR_TARBALL):
	@-mkdir -p archive >/dev/null 2>/dev/null
	wget --no-use-server-timestamps -O "$(KITCREATOR_TARBALL).new" "$(KITCREATOR_URL)"
	@if test -n "$(KITCREATOR_SHA256)"; then if test "`openssl sha256 "$(KITCREATOR_TARBALL).new" | sed 's@^.*= *@@'`" != "$(KITCREATOR_SHA256)"; then echo "$(KITCREATOR_TARBALL): Checksum Mismatch!"; exit 1; fi; fi
	gzip -dc "$(KITCREATOR_TARBALL).new" | tar -tf - >/dev/null
	mv "$(KITCREATOR_TARBALL).new" "$(KITCREATOR_TARBALL)"

tclkit-zip: $(KITCREATOR_TARBALL)
	rm -rf kitcreator-$(KITCREATOR_VERSION)
	gzip -dc "$(KITCREATOR_TARBALL)" | tar -xf -


	cd kitcreator-$(KITCREATOR_VERSION) && KITCREATOR_PKGS=' ' AR=$(TOOLCHAIN_CMD)ar CC=$(TOOLCHAIN_CMD)gcc ./kitcreator 8.5.15 --host=$(TOOLCHAIN) --enable-kit-storage=zip --enable-threads
	cp kitcreator-$(KITCREATOR_VERSION)/tclkit-8.5.15 tclkit-zip.new
	mv tclkit-zip.new tclkit-zip
	rm -rf kitcreator-$(KITCREATOR_VERSION)

# The wrapper
## Split Tclkit header from zip file contents
................................................................................
	zip -A tcpdump.exe

# Cleanup
clean:
	rm -f tcpdump.exe.zip tcpdump.exe.bin tcpdump.exe.new tcpdump.exe
	rm -rf kitcreator-$(KITCREATOR_VERSION)
	rm -rf __TMP_TCP__ __TMP_WPCAP__


distclean: clean
	rm -f "$(TWAPI_ZIP)" "$(TCPDUMP_TARBALL)" "$(WINPCAP_DEV_ZIP)" "$(KITCREATOR_TARBALL)" "$(WINPCAP_INST_7ZIP)"
	rm -f "$(TWAPI_ZIP).new" "$(TCPDUMP_TARBALL).new" "$(WINPCAP_DEV_ZIP).new" "$(KITCREATOR_TARBALL).new" "$(WINPCAP_INST_7ZIP).new"
	rm -f $(WINPCAP_INST_FILES)
	rm -f tclkit-zip files/tcpdump.exe
	-rmdir archive files

.PHONY: all clean distclean







>
>
>
>








|


>
>







 







>









108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
...
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
$(TWAPI_ZIP):
	@-mkdir -p archive >/dev/null 2>/dev/null
	wget --no-use-server-timestamps -O "$(TWAPI_ZIP).new" "$(TWAPI_URL)"
	@if test -n "$(TWAPI_SHA256)"; then if test "`openssl sha256 "$(TWAPI_ZIP).new" | sed 's@^.*= *@@'`" != "$(TWAPI_SHA256)"; then echo "$(TWAPI_ZIP): Checksum Mismatch!"; exit 1; fi; fi
	unzip -l "$(TWAPI_ZIP).new"
	mv "$(TWAPI_ZIP).new" "$(TWAPI_ZIP)"

# Icon
icon/tcpdump.ico: icon/tcpdump.png icon/Makefile
	$(MAKE) -C icon tcpdump.ico

# Tclkit
$(KITCREATOR_TARBALL):
	@-mkdir -p archive >/dev/null 2>/dev/null
	wget --no-use-server-timestamps -O "$(KITCREATOR_TARBALL).new" "$(KITCREATOR_URL)"
	@if test -n "$(KITCREATOR_SHA256)"; then if test "`openssl sha256 "$(KITCREATOR_TARBALL).new" | sed 's@^.*= *@@'`" != "$(KITCREATOR_SHA256)"; then echo "$(KITCREATOR_TARBALL): Checksum Mismatch!"; exit 1; fi; fi
	gzip -dc "$(KITCREATOR_TARBALL).new" | tar -tf - >/dev/null
	mv "$(KITCREATOR_TARBALL).new" "$(KITCREATOR_TARBALL)"

tclkit-zip: $(KITCREATOR_TARBALL) tcpdump.rc icon/tcpdump.ico
	rm -rf kitcreator-$(KITCREATOR_VERSION)
	gzip -dc "$(KITCREATOR_TARBALL)" | tar -xf -
	cp icon/tcpdump.ico kitcreator-$(KITCREATOR_VERSION)/kit.ico
	sed 's/@@TCPDUMP_VERSION_COMMA@@/$(shell echo $(TCPDUMP_VERSION) | sed 's@\.@,@g'),0/;s/@@TCPDUMP_VERSION@@/$(TCPDUMP_VERSION)/' tcpdump.rc > kitcreator-$(KITCREATOR_VERSION)/kit.rc
	cd kitcreator-$(KITCREATOR_VERSION) && KITCREATOR_PKGS=' ' AR=$(TOOLCHAIN_CMD)ar CC=$(TOOLCHAIN_CMD)gcc ./kitcreator 8.5.15 --host=$(TOOLCHAIN) --enable-kit-storage=zip --enable-threads
	cp kitcreator-$(KITCREATOR_VERSION)/tclkit-8.5.15 tclkit-zip.new
	mv tclkit-zip.new tclkit-zip
	rm -rf kitcreator-$(KITCREATOR_VERSION)

# The wrapper
## Split Tclkit header from zip file contents
................................................................................
	zip -A tcpdump.exe

# Cleanup
clean:
	rm -f tcpdump.exe.zip tcpdump.exe.bin tcpdump.exe.new tcpdump.exe
	rm -rf kitcreator-$(KITCREATOR_VERSION)
	rm -rf __TMP_TCP__ __TMP_WPCAP__
	$(MAKE) -C icon clean

distclean: clean
	rm -f "$(TWAPI_ZIP)" "$(TCPDUMP_TARBALL)" "$(WINPCAP_DEV_ZIP)" "$(KITCREATOR_TARBALL)" "$(WINPCAP_INST_7ZIP)"
	rm -f "$(TWAPI_ZIP).new" "$(TCPDUMP_TARBALL).new" "$(WINPCAP_DEV_ZIP).new" "$(KITCREATOR_TARBALL).new" "$(WINPCAP_INST_7ZIP).new"
	rm -f $(WINPCAP_INST_FILES)
	rm -f tclkit-zip files/tcpdump.exe
	-rmdir archive files

.PHONY: all clean distclean

Added icon/Makefile version [38e6b0ee90].





























































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
all:
	@echo "Nothing to do."

tcpdump-%x8.png: tcpdump.png
	@echo convert "$^" -colors 255 `echo "$@" | sed 's@^.*-\([0-9]*x[0-9]*\)x\([0-9]\).png@ -resize \1 -depth \2@'`  $@; \
	convert "$^" -colors 255 `echo "$@" | sed 's@^.*-\([0-9]*x[0-9]*\)x\([0-9]\).png@ -resize \1 -depth \2@'`  $@

tcpdump-%x4.png: tcpdump.png
	@echo convert "$^" -colors 15 `echo "$@" | sed 's@^.*-\([0-9]*x[0-9]*\)x\([0-9]\).png@ -resize \1 -depth \2@'`  $@; \
	convert "$^" -colors 15 `echo "$@" | sed 's@^.*-\([0-9]*x[0-9]*\)x\([0-9]\).png@ -resize \1 -depth \2@'`  $@

%.png.pgm: %.png
	pngtopnm -alpha "$^" > "$@"

%x4.png.ppm: %x4.png
	pngtopnm "$^" | ppmquant 15 > "$@"

%x8.png.ppm: %x8.png
	pngtopnm "$^" | ppmquant 255 > "$@"

%.png.ico: %.png.ppm %.png.pgm
	ppmtowinicon -andpgms -output "$@" $^

tcpdump.ico: tcpdump-16x16x4.png.ppm tcpdump-16x16x4.png.pgm tcpdump-16x16x8.png.ppm tcpdump-16x16x8.png.pgm tcpdump-32x32x4.png.ppm tcpdump-32x32x4.png.pgm tcpdump-32x32x8.png.ppm tcpdump-32x32x8.png.pgm tcpdump-48x48x4.png.ppm tcpdump-48x48x4.png.pgm tcpdump-48x48x8.png.ppm tcpdump-48x48x8.png.pgm
	ppmtowinicon -andpgms -output "$@" $^

clean:
	rm -f *.png.ico *.png.ppm *.png.pgm tcpdump.ico tcpdump-*.png

.PHONY: clean all

Added icon/tcpdump.png version [e37cab7948].

cannot compute difference between binary files

Added tcpdump.rc version [75a24fe89c].



















































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
//
// Version Resource Script
//

#include <winver.h>

LANGUAGE 0x9, 0x1	/* LANG_ENGLISH, SUBLANG_DEFAULT */

VS_VERSION_INFO VERSIONINFO
 FILEVERSION 	@@TCPDUMP_VERSION_COMMA@@
 PRODUCTVERSION @@TCPDUMP_VERSION_COMMA@@
 FILEFLAGSMASK 	0x3fL
 FILEFLAGS 	0x0L
 FILEOS 	VOS__WINDOWS32
 FILETYPE 	VFT_APP
 FILESUBTYPE 	0x0L
BEGIN
    BLOCK "StringFileInfo"
    BEGIN
        BLOCK "040904b0"
        BEGIN
            VALUE "FileDescription", "tcpdump wrapper\0"
            VALUE "OriginalFilename", "tcpdump.exe\0"
            VALUE "CompanyName", "tcpdump.org, winpcap.org, rkeene.org\0"
            VALUE "FileVersion", "@@TCPDUMP_VERSION@@\0"
            VALUE "LegalCopyright", "Copyright \251 tcpdump.org, winpcap.org, et al\0"
            VALUE "ProductName", "tcpdump @@TCPDUMP_VERSION@@ for Windows\0"
            VALUE "ProductVersion", "@@TCPDUMP_VERSION@@\0"
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
        VALUE "Translation", 0x409, 1200
    END
END

//
// Icon
//

tcpdump                      ICON    DISCARDABLE     "kit.ico"