Index: kitsh/build.sh ================================================================== --- kitsh/build.sh +++ kitsh/build.sh @@ -32,16 +32,25 @@ cd "${BUILDDIR}" || exit 1 # Cleanup, just incase the incoming directory was not pre-cleaned ${MAKE:-make} distclean >/dev/null 2>/dev/null - # Figure out if zlib compiled + # Figure out if zlib compiled (if not, the system zlib will be used and we + # will need to have that present) ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)" export ZLIBDIR if [ -z "${ZLIBDIR}" -o ! -f "${ZLIBDIR}/lib/libz.a" ]; then unset ZLIBDIR fi + + # Copy user specified kit.rc and kit.ico in to build directory, if found + if [ -f "${OTHERPKGSDIR}/kit.rc" ]; then + cp "${OTHERPKGSDIR}/kit.rc" "${BUILDDIR}" + fi + if [ -f "${OTHERPKGSDIR}/kit.ico" ]; then + cp "${OTHERPKGSDIR}/kit.ico" "${BUILDDIR}" + fi # Include extra objects as required ## Initialize list of extra objects EXTRA_OBJS="" Index: kitsh/buildsrc/kitsh-0.0/Makefile.in ================================================================== --- kitsh/buildsrc/kitsh-0.0/Makefile.in +++ kitsh/buildsrc/kitsh-0.0/Makefile.in @@ -1,15 +1,19 @@ CC = @CC@ +RC = @RC@ CFLAGS = @CFLAGS@ @DEFS@ -DSTDC_HEADERS=1 -DTK_LOCAL_APPINIT=TclKit_AppInit CPPFLAGS = @CPPFLAGS@ @DEFS@ -DSTDC_HEADERS=1 -DTK_LOCAL_APPINIT=TclKit_AppInit LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ARCHS = @ARCHS@ OBJS = kitInit.o main.o pwb.o rechan.o zlib.o winMain.o @EXTRA_OBJS@ all: kit +kit.res.o: kit.rc kit.ico + $(RC) -o kit.res.o $(CPPFLAGS) kit.rc + kit: $(OBJS) $(ARCHS) $(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(ARCHS) $(LDFLAGS) $(LIBS) mk4tcl.tcl.h: mk4tcl.tcl ./stringify.tcl mk4tcl.tcl > mk4tcl.tcl.h Index: kitsh/buildsrc/kitsh-0.0/configure.ac ================================================================== --- kitsh/buildsrc/kitsh-0.0/configure.ac +++ kitsh/buildsrc/kitsh-0.0/configure.ac @@ -21,10 +21,18 @@ dnl Find archives we need to link to DC_FIND_TCLKIT_LIBS dnl Find extra objects we need to link as a part of "kit" AC_SUBST(EXTRA_OBJS) + +dnl Check for Windows Resource Compiler +AC_CHECK_TOOL([RC], [windres], [false]) + +dnl If we found the resource compiler, add "kit.res.o" to our list of objects to build +if ! test "$RC" = "false"; then + EXTRA_OBJS="$EXTRA_OBJS kit.res.o" +fi dnl Determine if we have "Tcl_SetStartupScript" (8.6.x) or "TclSetStartupScriptPath" (8.4.x) SAVE_LIBS="${LIBS}" LIBS="${ARCHS} ${LIBS}" AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath) ADDED kitsh/buildsrc/kitsh-0.0/kit.ico Index: kitsh/buildsrc/kitsh-0.0/kit.ico ================================================================== --- /dev/null +++ kitsh/buildsrc/kitsh-0.0/kit.ico cannot compute difference between binary files ADDED kitsh/buildsrc/kitsh-0.0/kit.rc Index: kitsh/buildsrc/kitsh-0.0/kit.rc ================================================================== --- /dev/null +++ kitsh/buildsrc/kitsh-0.0/kit.rc @@ -0,0 +1,66 @@ +// +// Version Resource Script +// + +#include +#include + +// +// build-up the name suffix that defines the type of build this is. +// +#if TCL_THREADS +#define SUFFIX_THREADS "t" +#else +#define SUFFIX_THREADS "" +#endif + +#if STATIC_BUILD +#define SUFFIX_STATIC "s" +#else +#define SUFFIX_STATIC "" +#endif + +#if DEBUG && !UNCHECKED +#define SUFFIX_DEBUG "g" +#else +#define SUFFIX_DEBUG "" +#endif + +#define SUFFIX SUFFIX_THREADS SUFFIX_STATIC SUFFIX_DEBUG + + +LANGUAGE 0x9, 0x1 /* LANG_ENGLISH, SUBLANG_DEFAULT */ + +VS_VERSION_INFO VERSIONINFO + FILEVERSION TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL + PRODUCTVERSION TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "Tclkit Application\0" + VALUE "OriginalFilename", "tclkit-" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".exe\0" + VALUE "CompanyName", "ActiveState Corporation\0" + VALUE "FileVersion", TCL_PATCH_LEVEL + VALUE "LegalCopyright", "Copyright \251 2000 by ActiveState Corporation, et al\0" + VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0" + VALUE "ProductVersion", TCL_PATCH_LEVEL + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +// +// Icon +// + +tclsh ICON DISCARDABLE "kit.ico"