From 71fa6d71a0c499d298b8a8d1db3eb00994bf44c6 Mon Sep 17 00:00:00 2001 From: davidg Date: Tue, 31 Oct 2000 01:20:08 +0000 Subject: 2000-10-30 David Gravereaux * win/configure.in: * win/Makefile.in: * win/makefile.vc: * win/tcl.rc: * win/tclsh.rc: Added logic to derive filenames better in the resource scripts based on compile options. --- win/Makefile.in | 4 ++-- win/configure.in | 23 ++++++++++++++++++++++- win/makefile.vc | 8 ++++++-- win/tcl.rc | 45 ++++++++++++++++++++++++++++++--------------- win/tclsh.rc | 45 ++++++++++++++++++++++++++++++++++++--------- 5 files changed, 96 insertions(+), 29 deletions(-) diff --git a/win/Makefile.in b/win/Makefile.in index 107e14b..659e78a 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.40 2000/09/29 21:43:32 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.41 2000/10/31 01:20:09 davidg Exp $ VERSION = @TCL_VERSION@ @@ -419,7 +419,7 @@ tclStubLib.${OBJEXT}: tclStubLib.c $(CC) -c $(CC_SWITCHES) -DBUILD_tcl ${DEPARG} $(CC_OBJNAME) .rc.$(RES): - $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(WIN_DIR_NATIVE)" $(DEPARG) + $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_DEFINES@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(WIN_DIR_NATIVE)" $(DEPARG) install: all install-binaries install-libraries install-doc diff --git a/win/configure.in b/win/configure.in index 5173dfe..74f9f0c 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,7 @@ # generate the file "configure", which is run during Tcl installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.28 2000/09/06 18:50:17 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.29 2000/10/31 01:20:08 davidg Exp $ AC_INIT(../generic/tcl.h) @@ -140,6 +140,26 @@ CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX} CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX} CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX} +#-------------------------------------------------------------------- +# Adjust the defines for how the resources are built depending +# on symbols and static vs. shared. +#-------------------------------------------------------------------- + +if test ${SHARED_BUILD} = 0 ; then + if test "${DBGX}" = "d"; then + RC_DEFINES="-d STATIC_BUILD -d DEBUG" + else + RC_DEFINES="-d STATIC_BUILD" + fi +else + if test "${DBGX}" = "d"; then + RC_DEFINES="-d DEBUG" + else + RC_DEFINES="" + fi +fi + + AC_SUBST(TCL_VERSION) AC_SUBST(TCL_MAJOR_VERSION) AC_SUBST(TCL_MINOR_VERSION) @@ -187,6 +207,7 @@ AC_SUBST(RC) AC_SUBST(RC_OUT) AC_SUBST(RC_TYPE) AC_SUBST(RC_INCLUDE) +AC_SUBST(RC_DEFINES) AC_SUBST(RES) AC_SUBST(LIBS) AC_SUBST(LIBS_GUI) diff --git a/win/makefile.vc b/win/makefile.vc index c867551..7672f2d 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -6,7 +6,7 @@ # Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-1999 by Scriptics Corporation. # -# RCS: @(#) $Id: makefile.vc,v 1.55 2000/09/28 06:35:40 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.56 2000/10/31 01:20:09 davidg Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -514,7 +514,11 @@ $(GENERICDIR)\regguts.h: $(GENERICDIR)\regcustom.h {$(WINDIR)}.rc{$(TMPDIR)}.res: $(rc32) -fo $@ -r -i $(GENERICDIR) -i $(WINDIR) -D__WIN32__ \ - $(TCL_DEFINES) $< + $(TCL_DEFINES) \ +!if "$(NODEBUG)" == "0" + -d DEBUG \ +!endif + $< clean: -@$(RM) $(OUTDIR)\*.exp diff --git a/win/tcl.rc b/win/tcl.rc index 5b9a8cf..f10acc2 100644 --- a/win/tcl.rc +++ b/win/tcl.rc @@ -1,22 +1,44 @@ -// RCS: @(#) $Id: tcl.rc,v 1.5 2000/04/18 23:26:45 redman Exp $ +// RCS: @(#) $Id: tcl.rc,v 1.6 2000/10/31 01:20:09 davidg Exp $ // -// Version +// Version Resource Script // -#define VS_VERSION_INFO 1 +#include #define RESOURCE_INCLUDED #include +// +// build-up the name suffix that defines the type of build this is. +// +#ifdef TCL_THREADS +#define SUFFIX_THREADS "t" +#else +#define SUFFIX_THREADS "" +#endif + +#ifdef DEBUG +#define SUFFIX_DEBUG "d" +#else +#define SUFFIX_DEBUG "" +#endif + +#define SUFFIX SUFFIX_THREADS 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 +#ifdef DEBUG + FILEFLAGS VS_FF_DEBUG +#else FILEFLAGS 0x0L - FILEOS 0x4 /* VOS__WINDOWS32 */ - FILETYPE 0x2 /* VFT_DLL */ +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" @@ -24,10 +46,10 @@ BEGIN BLOCK "040904b0" /* LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP */ BEGIN VALUE "FileDescription", "Tcl DLL\0" - VALUE "OriginalFilename", "tcl" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) ".dll\0" - VALUE "CompanyName", "Scriptics Corporation\0" + VALUE "OriginalFilename", "tcl" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".dll\0" + VALUE "CompanyName", "Ajuba Solutions\0" VALUE "FileVersion", TCL_PATCH_LEVEL - VALUE "LegalCopyright", "Copyright (c) 2000 by Scriptics Corporation\0" + VALUE "LegalCopyright", "Copyright (c) 2000 by Ajuba Solutions\0" VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0" VALUE "ProductVersion", TCL_PATCH_LEVEL END @@ -37,10 +59,3 @@ BEGIN VALUE "Translation", 0x409, 1200 END END - - - - - - - diff --git a/win/tclsh.rc b/win/tclsh.rc index 874abd7..7226753 100644 --- a/win/tclsh.rc +++ b/win/tclsh.rc @@ -1,22 +1,50 @@ -// RCS: @(#) $Id: tclsh.rc,v 1.5 2000/04/18 23:26:45 redman Exp $ +// RCS: @(#) $Id: tclsh.rc,v 1.6 2000/10/31 01:20:09 davidg Exp $ // -// Version +// Version Resource Script // -#define VS_VERSION_INFO 1 +#include #define RESOURCE_INCLUDED #include +// +// build-up the name suffix that defines the type of build this is. +// +#ifdef TCL_THREADS +#define SUFFIX_THREADS "t" +#else +#define SUFFIX_THREADS "" +#endif + +#ifdef STATIC_BUILD +#define SUFFIX_STATIC "s" +#else +#define SUFFIX_STATIC "" +#endif + +#ifdef DEBUG +#define SUFFIX_DEBUG "d" +#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 +#ifdef DEBUG + FILEFLAGS VS_FF_DEBUG +#else FILEFLAGS 0x0L - FILEOS 0x4 /* VOS__WINDOWS32 */ - FILETYPE 0x2 /* VFT_DLL */ +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" @@ -24,10 +52,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Tclsh Application\0" - VALUE "OriginalFilename", "tclsh" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) ".exe\0" - VALUE "CompanyName", "Scriptics Corporation\0" + VALUE "OriginalFilename", "tclsh" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".exe\0" + VALUE "CompanyName", "Ajuba Solutions\0" VALUE "FileVersion", TCL_PATCH_LEVEL - VALUE "LegalCopyright", "Copyright (c) 2000 by Scriptics Corporation\0" + VALUE "LegalCopyright", "Copyright (c) 2000 by Ajuba Solutions\0" VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0" VALUE "ProductVersion", TCL_PATCH_LEVEL END @@ -43,4 +71,3 @@ END // tclsh ICON DISCARDABLE "tclsh.ico" - -- cgit v0.12