Check-in [079f112af3]
Overview
Comment:Added file "tclkit.ico" to VFS
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:079f112af30d2f3e9aaa68b586225a8571e1c21d
User & Date: rkeene on 2013-09-29 23:17:07
Other Links: manifest | tags
Context
2013-09-30
06:08
Fixed Mk4tcl compiling issue check-in: 3bd068a425 user: rkeene tags: trunk
2013-09-29
23:17
Added file "tclkit.ico" to VFS check-in: 079f112af3 user: rkeene tags: trunk
2013-09-25
04:30
Removed dead code check-in: 4816a85fc1 user: rkeene tags: trunk
Changes

Modified kitcreator from [e99d7e9821] to [b1de5629ac].

   101    101   	fi
   102    102   fi
   103    103   
   104    104   # Find Windows resource-related files
   105    105   if [ -f "kit.ico" ]; then
   106    106   	KITCREATOR_ICON="$(pwd)/kit.ico"
   107    107   else
   108         -	KITCREATOR_ICON="$(echo "$(pwd)/kitsh/buildsrc"/kitsh-*/kit.ico)"
          108  +	KITCREATOR_ICON="$(echo "$(pwd)/kitsh/buildsrc"/kitsh-*/tclkit.ico)"
   109    109   fi
   110    110   if [ -f "kit.rc" ]; then
   111    111   	KITCREATOR_RC="$(pwd)/kit.rc"
   112    112   else
   113    113   	KITCREATOR_RC="$(echo "$(pwd)/kitsh/buildsrc"/kitsh-*/kit.rc)"
   114    114   fi
   115    115   export KITCREATOR_ICON KITCREATOR_RC

Modified kitsh/build.sh from [7ea93d7b1e] to [d39ebd9770].

    75     75   
    76     76   	## Rename the "vfs" package directory to what "boot.tcl" expects
    77     77   	mv 'starpack.vfs/lib'/vfs* 'starpack.vfs/lib/vfs'
    78     78   
    79     79   	## Install "boot.tcl"
    80     80   	cp 'boot.tcl' 'starpack.vfs/'
    81     81   
           82  +	## Install "tclkit.ico"
           83  +	cp 'tclkit.ico' 'starpack.vfs/'
           84  +
    82     85   	# Figure out if zlib compiled (if not, the system zlib will be used and we
    83     86   	# will need to have that present)
    84     87   	ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
    85     88   	export ZLIBDIR
    86     89   	if [ -z "${ZLIBDIR}" -o ! -f "${ZLIBDIR}/lib/libz.a" ]; then
    87     90   		unset ZLIBDIR
    88     91   	fi
    89     92   
    90         -	# Copy user specified kit.rc and kit.ico in to build directory, if found
    91         -	cp "${KITCREATOR_ICON}" "${BUILDDIR}/kit.ico"
           93  +	# Copy user specified kit.rc and tclkit.ico in to build directory, if found
           94  +	cp "${KITCREATOR_ICON}" "${BUILDDIR}/tclkit.ico"
    92     95   	cp "${KITCREATOR_RC}" "${BUILDDIR}/kit.rc"
    93     96   
    94     97   	# Include extra objects as required
    95     98   	## Initialize list of extra objects
    96     99   	EXTRA_OBJS=""
    97    100   	export EXTRA_OBJS
    98    101   

Modified kitsh/buildsrc/kitsh-0.0/Makefile.common.in from [79dfb5dde5] to [60b5e343af].

    35     35   ## Objects
    36     36   kitInit.o: kitInit.c boot.tcl.h $(EXTRA_KIT_DEPS)
    37     37   rechan.o: rechan.c
    38     38   pwb.o: pwb.c
    39     39   zlib.o: zlib.c
    40     40   
    41     41   ### Windows resources
    42         -kit.res.o: kit.rc kit.ico
           42  +kit.res.o: kit.rc tclkit.ico
    43     43   	$(RC) -o kit.res.o $(CPPFLAGS) kit.rc
    44     44   
    45     45   # Cleanup routines
    46     46   clean:
    47     47   	rm -f kit kit.res.o
    48     48   	rm -f libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
    49     49   	rm -f $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS)

Modified kitsh/buildsrc/kitsh-0.0/kit.rc from [5b3ee21b9d] to [ddaee7b41b].

    59     59       END
    60     60   END
    61     61   
    62     62   //
    63     63   // Icon
    64     64   //
    65     65   
    66         -tclsh                      ICON    DISCARDABLE     "kit.ico"
           66  +tclsh                      ICON    DISCARDABLE     "tclkit.ico"

Name change from kitsh/buildsrc/kitsh-0.0/kit.ico to kitsh/buildsrc/kitsh-0.0/tclkit.ico.

cannot compute difference between binary files