merge trunk

6 files changed, 42 insertions, 40 deletions

diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 49f21f2..7acc9ad 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -229,8 +229,7 @@ TclCreateLiteral(
     }
 
     /*
-     * The literal is new to the interpreter. Add it to the global literal
-     * table.
+     * The literal is new to the interpreter.
      */
 
     TclNewObj(objPtr);
@@ -241,8 +240,11 @@ TclCreateLiteral(
 	TclInitStringRep(objPtr, bytes, length);
     }
 
+    /* Should the new literal be shared globally? */
+
     if ((flags & LITERAL_UNSHARED)) {
 	/*
+	 * No, do *not* add it the global literal table
 	 * Make clear, that no global value is returned
 	 */
 	if (globalPtrPtr != NULL) {
@@ -251,6 +253,9 @@ TclCreateLiteral(
 	return objPtr;
     }
 
+    /*
+     * Yes, add it to the global literal table.
+     */
 #ifdef TCL_COMPILE_DEBUG
     if (LookupLiteralEntry((Tcl_Interp *) iPtr, objPtr) != NULL) {
 	Tcl_Panic("%s: literal \"%.*s\" found globally but shouldn't be",
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl
index a8c9c8d..6e7ed39 100644
--- a/library/dde/pkgIndex.tcl
+++ b/library/dde/pkgIndex.tcl
@@ -1,3 +1,3 @@
 if {([info commands ::tcl::pkgconfig] eq "")
 	|| ([info sharedlibextension] ne ".dll")} return
-package ifneeded dde 1.4.0 [list load [file join $dir tcldde14.dll] dde]
+package ifneeded dde 1.4.0 [list load [file join $dir tcldde1.dll] dde]
diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl
index 1018cda..4c00cb8 100755
--- a/library/reg/pkgIndex.tcl
+++ b/library/reg/pkgIndex.tcl
@@ -1,4 +1,4 @@
 if {([info commands ::tcl::pkgconfig] eq "")
 	|| ([info sharedlibextension] ne ".dll")} return
 package ifneeded registry 1.3.2 \
-	[list load [file join $dir tclreg13.dll] registry]
+	[list load [file join $dir tclreg1.dll] registry]
diff --git a/win/Makefile.in b/win/Makefile.in
index 4eac03c..98123f4 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -78,7 +78,7 @@ CFLAGS_OPTIMIZE	= @CFLAGS_OPTIMIZE@
 #CFLAGS = 		$(CFLAGS_DEBUG)
 #CFLAGS = 		$(CFLAGS_OPTIMIZE)
 #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE
+CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE -D_ATL_XP_TARGETING
 
 # To compile without backward compatibility and deprecated code uncomment the
 # following
@@ -128,10 +128,8 @@ LIBSUFFIX		= @LIBSUFFIX@
 EXESUFFIX		= @EXESUFFIX@
 
 VER				= @TCL_MAJOR_VERSION@
-DDEVER			= @TCL_DDE_MAJOR_VERSION@@TCL_DDE_MINOR_VERSION@
-DDEDOTVER		= @TCL_DDE_MAJOR_VERSION@.@TCL_DDE_MINOR_VERSION@
-REGVER			= @TCL_REG_MAJOR_VERSION@@TCL_REG_MINOR_VERSION@
-REGDOTVER		= @TCL_REG_MAJOR_VERSION@.@TCL_REG_MINOR_VERSION@
+DDEVER			= @TCL_DDE_MAJOR_VERSION@
+REGVER			= @TCL_REG_MAJOR_VERSION@
 
 TCL_STUB_LIB_FILE	= @TCL_STUB_LIB_FILE@
 TCL_DLL_FILE		= @TCL_DLL_FILE@
@@ -567,7 +565,7 @@ install-binaries: binaries
 		else true; \
 		fi; \
 	    done;
-	@for i in tcl8 tcl8/dde${DDEDOTVER} tcl8/reg${REGDOTVER}; \
+	@for i in tcl8 tcl8/dde${DDEVER} tcl8/reg${REGVER}; \
 	    do \
 	    if [ ! -d $(LIB_INSTALL_DIR)/$$i ] ; then \
 		echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \
@@ -591,23 +589,23 @@ install-binaries: binaries
 	    done
 	@if [ -f $(DDE_DLL_FILE) ]; then \
 	    echo Installing $(DDE_DLL_FILE); \
-	    $(COPY) $(DDE_DLL_FILE) $(LIB_INSTALL_DIR)/tcl8/dde${DDEDOTVER}; \
+	    $(COPY) $(DDE_DLL_FILE) $(LIB_INSTALL_DIR)/tcl8/dde${DDEVER}; \
 	    $(COPY) $(ROOT_DIR)/library/dde/pkgIndex.tcl \
-		$(LIB_INSTALL_DIR)/tcl8/dde${DDEDOTVER}; \
+		$(LIB_INSTALL_DIR)/tcl8/dde${DDEVER}; \
 	    fi
 	@if [ -f $(DDE_LIB_FILE) ]; then \
 	    echo Installing $(DDE_LIB_FILE); \
-	    $(COPY) $(DDE_LIB_FILE) $(LIB_INSTALL_DIR)/tcl8/dde${DDEDOTVER}; \
+	    $(COPY) $(DDE_LIB_FILE) $(LIB_INSTALL_DIR)/tcl8/dde${DDEVER}; \
 	    fi
 	@if [ -f $(REG_DLL_FILE) ]; then \
 	    echo Installing $(REG_DLL_FILE); \
-	    $(COPY) $(REG_DLL_FILE) $(LIB_INSTALL_DIR)/tcl8/reg${REGDOTVER}; \
+	    $(COPY) $(REG_DLL_FILE) $(LIB_INSTALL_DIR)/tcl8/reg${REGVER}; \
 	    $(COPY) $(ROOT_DIR)/library/reg/pkgIndex.tcl \
-		$(LIB_INSTALL_DIR)/tcl8/reg${REGDOTVER}; \
+		$(LIB_INSTALL_DIR)/tcl8/reg${REGVER}; \
 	    fi
 	@if [ -f $(REG_LIB_FILE) ]; then \
 	    echo Installing $(REG_LIB_FILE); \
-	    $(COPY) $(REG_LIB_FILE) $(LIB_INSTALL_DIR)/tcl8/reg${REGDOTVER}; \
+	    $(COPY) $(REG_LIB_FILE) $(LIB_INSTALL_DIR)/tcl8/reg${REGVER}; \
 	    fi
 
 install-libraries: libraries install-tzdata install-msgs
diff --git a/win/makefile.vc b/win/makefile.vc
index 9b2cf35..4e7410b 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -190,11 +190,9 @@ STUBPREFIX      = $(PROJECT)stub
 DOTVERSION      = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

 VERSION         = $(TCL_MAJOR_VERSION)

 

-DDEDOTVERSION = 1.4

-DDEVERSION = $(DDEDOTVERSION:.=)

+DDEVERSION = 1

 

-REGDOTVERSION = 1.3

-REGVERSION = $(REGDOTVERSION:.=)

+REGVERSION = 1

 

 BINROOT		= $(MAKEDIR)     # originally .

 ROOT		= $(MAKEDIR)\..  # originally ..

@@ -737,7 +735,7 @@ gentommath_h:
 !ifndef HHC

 HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""

 !endif

-HTMLDIR=$(ROOT)\html

+HTMLDIR=$(OUT_DIR)\html

 HTMLBASE=TclTk$(VERSION)

 HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp

 CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm

@@ -745,25 +743,27 @@ CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
 htmlhelp: chmsetup $(CHMFILE)

 

 $(CHMFILE): $(DOCDIR)\*

-	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl

+	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"

 	@echo Compiling HTML help project

-	@$(HHC) <<$(HHPFILE) >NUL

+	-$(HHC) <<$(HHPFILE) >NUL

 [OPTIONS]

 Compatibility=1.1 or later

 Compiled file=$(HTMLBASE).chm

+Default topic=contents.htm

 Display compile progress=no

 Error log file=$(HTMLBASE).log

+Full-text search=Yes

 Language=0x409 English (United States)

 Title=Tcl/Tk $(DOT_VERSION) Help

 [FILES]

 contents.htm

 docs.css

-Keywords

-TclCmd

-TclLib

-TkCmd

-TkLib

-UserCmd

+Keywords\*.htm

+TclCmd\*.htm

+TclLib\*.htm

+TkCmd\*.htm

+TkLib\*.htm

+UserCmd\*.htm

 <<

 

 chmsetup:

@@ -1150,9 +1150,9 @@ install-libraries: tclConfig install-msgs install-tzdata
 	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\"

 !endif

 !else

-	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\tcl8\dde$(DDEDOTVERSION)\"

+	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\tcl8\dde$(DDEVERSION)\"

 	@$(CPY) "$(ROOT)\library\dde\pkgIndex.tcl" \

-	    "$(LIB_INSTALL_DIR)\tcl8\dde$(DDEDOTVERSION)\"

+	    "$(LIB_INSTALL_DIR)\tcl8\dde$(DDEVERSION)\"

 !endif

 	@echo Installing $(TCLREGLIBNAME)

 !if $(STATIC_BUILD)

@@ -1160,9 +1160,9 @@ install-libraries: tclConfig install-msgs install-tzdata
 	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\"

 !endif

 !else

-	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\tcl8\reg$(REGDOTVERSION)\"

+	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\tcl8\reg$(REGVERSION)\"

 	@$(CPY) "$(ROOT)\library\reg\pkgIndex.tcl" \

-	    "$(LIB_INSTALL_DIR)\tcl8\reg$(REGDOTVERSION)\"

+	    "$(LIB_INSTALL_DIR)\tcl8\reg$(REGVERSION)\"

 !endif

 	@echo Installing encodings

 	@$(CPY) "$(ROOT)\library\encoding\*.enc" \

diff --git a/win/rules.vc b/win/rules.vc
index bdc66e5..a7da1e4 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -159,7 +159,7 @@ DEBUGFLAGS     = $(DEBUGFLAGS) -RTC1
 DEBUGFLAGS     = $(DEBUGFLAGS) -GZ

 !endif

 

-COMPILERFLAGS  =-W3 -DUNICODE -D_UNICODE

+COMPILERFLAGS  =-W3 /DUNICODE /D_UNICODE /D_ATL_XP_TARGETING

 

 # In v13 -GL and -YX are incompatible.

 !if [nmakehlp -c -YX]

@@ -230,6 +230,10 @@ STATIC_BUILD	= 1
 !else

 STATIC_BUILD	= 0

 !endif

+!if [nmakehlp -f $(OPTS) "nomsvcrt"]

+!message *** Doing nomsvcrt

+MSVCRT		= 0

+!else

 !if [nmakehlp -f $(OPTS) "msvcrt"]

 !message *** Doing msvcrt

 MSVCRT		= 1

@@ -240,6 +244,7 @@ MSVCRT		= 1
 MSVCRT		= 0

 !endif

 !endif

+!endif

 !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)

 !message *** Doing staticpkg

 TCL_USE_STATIC_PACKAGES	= 1

@@ -539,12 +544,6 @@ Failed to find tcl.h.  The TCLDIR macro does not appear correct.
 !if [echo PKG_SHELL_VER = \>> versions.vc] \

    && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc]

 !endif

-!if [echo PKG_DDE_VER = \>> versions.vc] \

-   && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc]

-!endif

-!if [echo PKG_REG_VER =\>> versions.vc] \

-   && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc]

-!endif

 !endif

 

 !include versions.vc