Index: .fossil-settings/ignore-glob ================================================================== --- .fossil-settings/ignore-glob +++ .fossil-settings/ignore-glob @@ -12,13 +12,16 @@ 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-*/* Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -110,21 +110,27 @@ 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) +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) @@ -148,14 +154,15 @@ # 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 Index: icon/Makefile ================================================================== --- icon/Makefile +++ icon/Makefile @@ -0,0 +1,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 Index: icon/tcpdump.png ================================================================== --- icon/tcpdump.png +++ icon/tcpdump.png cannot compute difference between binary files ADDED tcpdump.rc Index: tcpdump.rc ================================================================== --- tcpdump.rc +++ tcpdump.rc @@ -0,0 +1,41 @@ +// +// Version Resource Script +// + +#include + +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"