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

Modified Makefile from [c0b5c5eabc] to [f12b3352f7].

   108    108   $(TWAPI_ZIP):
   109    109   	@-mkdir -p archive >/dev/null 2>/dev/null
   110    110   	wget --no-use-server-timestamps -O "$(TWAPI_ZIP).new" "$(TWAPI_URL)"
   111    111   	@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
   112    112   	unzip -l "$(TWAPI_ZIP).new"
   113    113   	mv "$(TWAPI_ZIP).new" "$(TWAPI_ZIP)"
   114    114   
          115  +# Icon
          116  +icon/tcpdump.ico: icon/tcpdump.png icon/Makefile
          117  +	$(MAKE) -C icon tcpdump.ico
          118  +
   115    119   # Tclkit
   116    120   $(KITCREATOR_TARBALL):
   117    121   	@-mkdir -p archive >/dev/null 2>/dev/null
   118    122   	wget --no-use-server-timestamps -O "$(KITCREATOR_TARBALL).new" "$(KITCREATOR_URL)"
   119    123   	@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
   120    124   	gzip -dc "$(KITCREATOR_TARBALL).new" | tar -tf - >/dev/null
   121    125   	mv "$(KITCREATOR_TARBALL).new" "$(KITCREATOR_TARBALL)"
   122    126   
   123         -tclkit-zip: $(KITCREATOR_TARBALL)
          127  +tclkit-zip: $(KITCREATOR_TARBALL) tcpdump.rc icon/tcpdump.ico
   124    128   	rm -rf kitcreator-$(KITCREATOR_VERSION)
   125    129   	gzip -dc "$(KITCREATOR_TARBALL)" | tar -xf -
          130  +	cp icon/tcpdump.ico kitcreator-$(KITCREATOR_VERSION)/kit.ico
          131  +	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
   126    132   	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
   127    133   	cp kitcreator-$(KITCREATOR_VERSION)/tclkit-8.5.15 tclkit-zip.new
   128    134   	mv tclkit-zip.new tclkit-zip
   129    135   	rm -rf kitcreator-$(KITCREATOR_VERSION)
   130    136   
   131    137   # The wrapper
   132    138   ## Split Tclkit header from zip file contents
................................................................................
   146    152   	zip -A tcpdump.exe
   147    153   
   148    154   # Cleanup
   149    155   clean:
   150    156   	rm -f tcpdump.exe.zip tcpdump.exe.bin tcpdump.exe.new tcpdump.exe
   151    157   	rm -rf kitcreator-$(KITCREATOR_VERSION)
   152    158   	rm -rf __TMP_TCP__ __TMP_WPCAP__
          159  +	$(MAKE) -C icon clean
   153    160   
   154    161   distclean: clean
   155    162   	rm -f "$(TWAPI_ZIP)" "$(TCPDUMP_TARBALL)" "$(WINPCAP_DEV_ZIP)" "$(KITCREATOR_TARBALL)" "$(WINPCAP_INST_7ZIP)"
   156    163   	rm -f "$(TWAPI_ZIP).new" "$(TCPDUMP_TARBALL).new" "$(WINPCAP_DEV_ZIP).new" "$(KITCREATOR_TARBALL).new" "$(WINPCAP_INST_7ZIP).new"
   157    164   	rm -f $(WINPCAP_INST_FILES)
   158    165   	rm -f tclkit-zip files/tcpdump.exe
   159    166   	-rmdir archive files
   160    167   
   161    168   .PHONY: all clean distclean

Added icon/Makefile version [38e6b0ee90].

            1  +all:
            2  +	@echo "Nothing to do."
            3  +
            4  +tcpdump-%x8.png: tcpdump.png
            5  +	@echo convert "$^" -colors 255 `echo "$@" | sed 's@^.*-\([0-9]*x[0-9]*\)x\([0-9]\).png@ -resize \1 -depth \2@'`  $@; \
            6  +	convert "$^" -colors 255 `echo "$@" | sed 's@^.*-\([0-9]*x[0-9]*\)x\([0-9]\).png@ -resize \1 -depth \2@'`  $@
            7  +
            8  +tcpdump-%x4.png: tcpdump.png
            9  +	@echo convert "$^" -colors 15 `echo "$@" | sed 's@^.*-\([0-9]*x[0-9]*\)x\([0-9]\).png@ -resize \1 -depth \2@'`  $@; \
           10  +	convert "$^" -colors 15 `echo "$@" | sed 's@^.*-\([0-9]*x[0-9]*\)x\([0-9]\).png@ -resize \1 -depth \2@'`  $@
           11  +
           12  +%.png.pgm: %.png
           13  +	pngtopnm -alpha "$^" > "$@"
           14  +
           15  +%x4.png.ppm: %x4.png
           16  +	pngtopnm "$^" | ppmquant 15 > "$@"
           17  +
           18  +%x8.png.ppm: %x8.png
           19  +	pngtopnm "$^" | ppmquant 255 > "$@"
           20  +
           21  +%.png.ico: %.png.ppm %.png.pgm
           22  +	ppmtowinicon -andpgms -output "$@" $^
           23  +
           24  +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
           25  +	ppmtowinicon -andpgms -output "$@" $^
           26  +
           27  +clean:
           28  +	rm -f *.png.ico *.png.ppm *.png.pgm tcpdump.ico tcpdump-*.png
           29  +
           30  +.PHONY: clean all

Added icon/tcpdump.png version [e37cab7948].

cannot compute difference between binary files

Added tcpdump.rc version [75a24fe89c].

            1  +//
            2  +// Version Resource Script
            3  +//
            4  +
            5  +#include <winver.h>
            6  +
            7  +LANGUAGE 0x9, 0x1	/* LANG_ENGLISH, SUBLANG_DEFAULT */
            8  +
            9  +VS_VERSION_INFO VERSIONINFO
           10  + FILEVERSION 	@@TCPDUMP_VERSION_COMMA@@
           11  + PRODUCTVERSION @@TCPDUMP_VERSION_COMMA@@
           12  + FILEFLAGSMASK 	0x3fL
           13  + FILEFLAGS 	0x0L
           14  + FILEOS 	VOS__WINDOWS32
           15  + FILETYPE 	VFT_APP
           16  + FILESUBTYPE 	0x0L
           17  +BEGIN
           18  +    BLOCK "StringFileInfo"
           19  +    BEGIN
           20  +        BLOCK "040904b0"
           21  +        BEGIN
           22  +            VALUE "FileDescription", "tcpdump wrapper\0"
           23  +            VALUE "OriginalFilename", "tcpdump.exe\0"
           24  +            VALUE "CompanyName", "tcpdump.org, winpcap.org, rkeene.org\0"
           25  +            VALUE "FileVersion", "@@TCPDUMP_VERSION@@\0"
           26  +            VALUE "LegalCopyright", "Copyright \251 tcpdump.org, winpcap.org, et al\0"
           27  +            VALUE "ProductName", "tcpdump @@TCPDUMP_VERSION@@ for Windows\0"
           28  +            VALUE "ProductVersion", "@@TCPDUMP_VERSION@@\0"
           29  +        END
           30  +    END
           31  +    BLOCK "VarFileInfo"
           32  +    BEGIN
           33  +        VALUE "Translation", 0x409, 1200
           34  +    END
           35  +END
           36  +
           37  +//
           38  +// Icon
           39  +//
           40  +
           41  +tcpdump                      ICON    DISCARDABLE     "kit.ico"