Overview
Comment: | Added support for using an icon and file information resource under Windows
Allow the user to place a kit.ico and kit.rc in root dir to replace one built into tclkit Copied tclsh RC and icon as default |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 587e28b4b30d6ec7c6940c7a72b751a10c212d89 |
User & Date: | rkeene on 2010-09-26 04:43:32 |
Other Links: | manifest | tags |
Context
2010-09-26
| ||
04:43 | Added unmodified zipvfs from tclvfs 20080503 check-in: 91c236fce7 user: rkeene tags: trunk | |
04:43 |
Added support for using an icon and file information resource under Windows
Allow the user to place a kit.ico and kit.rc in root dir to replace one built into tclkit Copied tclsh RC and icon as default check-in: 587e28b4b3 user: rkeene tags: trunk | |
04:43 | Changed configuration encoding to use UTF-8 to work around bug where tcl::pkgconfig doesn't work because it's populated with the specified encoding, which may be a file on disk and not available. check-in: ec2b0ff806 user: rkeene tags: trunk | |
Changes
Modified kitsh/build.sh from [6be18087ad] to [0c09a58b49].
30 30 ( 31 31 cp -r 'buildsrc' 'build' 32 32 cd "${BUILDDIR}" || exit 1 33 33 34 34 # Cleanup, just incase the incoming directory was not pre-cleaned 35 35 ${MAKE:-make} distclean >/dev/null 2>/dev/null 36 36 37 - # Figure out if zlib compiled 37 + # Figure out if zlib compiled (if not, the system zlib will be used and we 38 + # will need to have that present) 38 39 ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)" 39 40 export ZLIBDIR 40 41 if [ -z "${ZLIBDIR}" -o ! -f "${ZLIBDIR}/lib/libz.a" ]; then 41 42 unset ZLIBDIR 42 43 fi 44 + 45 + # Copy user specified kit.rc and kit.ico in to build directory, if found 46 + if [ -f "${OTHERPKGSDIR}/kit.rc" ]; then 47 + cp "${OTHERPKGSDIR}/kit.rc" "${BUILDDIR}" 48 + fi 49 + if [ -f "${OTHERPKGSDIR}/kit.ico" ]; then 50 + cp "${OTHERPKGSDIR}/kit.ico" "${BUILDDIR}" 51 + fi 43 52 44 53 # Include extra objects as required 45 54 ## Initialize list of extra objects 46 55 EXTRA_OBJS="" 47 56 48 57 ## Tk Resources (needed for Win32 support) 49 58 TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)"
Modified kitsh/buildsrc/kitsh-0.0/Makefile.in from [28bd753a6b] to [4fbebeccc2].
1 1 CC = @CC@ 2 +RC = @RC@ 2 3 CFLAGS = @CFLAGS@ @DEFS@ -DSTDC_HEADERS=1 -DTK_LOCAL_APPINIT=TclKit_AppInit 3 4 CPPFLAGS = @CPPFLAGS@ @DEFS@ -DSTDC_HEADERS=1 -DTK_LOCAL_APPINIT=TclKit_AppInit 4 5 LDFLAGS = @LDFLAGS@ 5 6 LIBS = @LIBS@ 6 7 ARCHS = @ARCHS@ 7 8 OBJS = kitInit.o main.o pwb.o rechan.o zlib.o winMain.o @EXTRA_OBJS@ 8 9 9 10 all: kit 10 11 12 +kit.res.o: kit.rc kit.ico 13 + $(RC) -o kit.res.o $(CPPFLAGS) kit.rc 14 + 11 15 kit: $(OBJS) $(ARCHS) 12 16 $(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(ARCHS) $(LDFLAGS) $(LIBS) 13 17 14 18 mk4tcl.tcl.h: mk4tcl.tcl 15 19 ./stringify.tcl mk4tcl.tcl > mk4tcl.tcl.h 16 20 17 21 clean:
Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [66c2193783] to [0932e98879].
19 19 DC_DO_TCL 20 20 21 21 dnl Find archives we need to link to 22 22 DC_FIND_TCLKIT_LIBS 23 23 24 24 dnl Find extra objects we need to link as a part of "kit" 25 25 AC_SUBST(EXTRA_OBJS) 26 + 27 +dnl Check for Windows Resource Compiler 28 +AC_CHECK_TOOL([RC], [windres], [false]) 29 + 30 +dnl If we found the resource compiler, add "kit.res.o" to our list of objects to build 31 +if ! test "$RC" = "false"; then 32 + EXTRA_OBJS="$EXTRA_OBJS kit.res.o" 33 +fi 26 34 27 35 dnl Determine if we have "Tcl_SetStartupScript" (8.6.x) or "TclSetStartupScriptPath" (8.4.x) 28 36 SAVE_LIBS="${LIBS}" 29 37 LIBS="${ARCHS} ${LIBS}" 30 38 AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath) 31 39 LIBS="${SAVE_LIBS}" 32 40
Added kitsh/buildsrc/kitsh-0.0/kit.ico version [f3beb03ad5].
cannot compute difference between binary files
Added kitsh/buildsrc/kitsh-0.0/kit.rc version [5b3ee21b9d].
1 +// 2 +// Version Resource Script 3 +// 4 + 5 +#include <winver.h> 6 +#include <tcl.h> 7 + 8 +// 9 +// build-up the name suffix that defines the type of build this is. 10 +// 11 +#if TCL_THREADS 12 +#define SUFFIX_THREADS "t" 13 +#else 14 +#define SUFFIX_THREADS "" 15 +#endif 16 + 17 +#if STATIC_BUILD 18 +#define SUFFIX_STATIC "s" 19 +#else 20 +#define SUFFIX_STATIC "" 21 +#endif 22 + 23 +#if DEBUG && !UNCHECKED 24 +#define SUFFIX_DEBUG "g" 25 +#else 26 +#define SUFFIX_DEBUG "" 27 +#endif 28 + 29 +#define SUFFIX SUFFIX_THREADS SUFFIX_STATIC SUFFIX_DEBUG 30 + 31 + 32 +LANGUAGE 0x9, 0x1 /* LANG_ENGLISH, SUBLANG_DEFAULT */ 33 + 34 +VS_VERSION_INFO VERSIONINFO 35 + FILEVERSION TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL 36 + PRODUCTVERSION TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL 37 + FILEFLAGSMASK 0x3fL 38 + FILEFLAGS 0x0L 39 + FILEOS VOS__WINDOWS32 40 + FILETYPE VFT_APP 41 + FILESUBTYPE 0x0L 42 +BEGIN 43 + BLOCK "StringFileInfo" 44 + BEGIN 45 + BLOCK "040904b0" 46 + BEGIN 47 + VALUE "FileDescription", "Tclkit Application\0" 48 + VALUE "OriginalFilename", "tclkit-" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".exe\0" 49 + VALUE "CompanyName", "ActiveState Corporation\0" 50 + VALUE "FileVersion", TCL_PATCH_LEVEL 51 + VALUE "LegalCopyright", "Copyright \251 2000 by ActiveState Corporation, et al\0" 52 + VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0" 53 + VALUE "ProductVersion", TCL_PATCH_LEVEL 54 + END 55 + END 56 + BLOCK "VarFileInfo" 57 + BEGIN 58 + VALUE "Translation", 0x409, 1200 59 + END 60 +END 61 + 62 +// 63 +// Icon 64 +// 65 + 66 +tclsh ICON DISCARDABLE "kit.ico"