diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2020-12-11 09:12:45 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2020-12-11 09:12:45 (GMT) |
| commit | 7b3afa79ed7eca6bf1ee6fd63934cf8f2653ebf0 (patch) | |
| tree | 02f19bf2d123197e3cc94bf0be9e299a36f49c4e | |
| parent | 21553ac98cd87e6f4edddfdb610bd35d9be46f65 (diff) | |
| download | tcl-7b3afa79ed7eca6bf1ee6fd63934cf8f2653ebf0.zip tcl-7b3afa79ed7eca6bf1ee6fd63934cf8f2653ebf0.tar.gz tcl-7b3afa79ed7eca6bf1ee6fd63934cf8f2653ebf0.tar.bz2 | |
nmake: export zip metadata for Tk and extensions
| -rw-r--r-- | win/makefile.vc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index a5465ce..9629e58 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -446,14 +446,7 @@ TCLSTUBOBJS = \ TOMMATHDIR = $(ROOT)\libtommath
PKGSDIR = $(ROOT)\pkgs
-# TIP430 ZIP file
LIBTCLVFS = $(OUT_DIR)\libtcl.vfs
-!if "$(TCL_PATCH_LETTER)" == "."
-LIBTCLZIP = $(OUT_DIR)\libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_RELEASE_SERIAL).zip
-!else
-LIBTCLZIP = $(OUT_DIR)\libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_PATCH_LETTER)$(TCL_RELEASE_SERIAL).zip
-!endif
-
# Additional include and C macro definitions for the implicit rules
# defined in rules.vc
@@ -480,14 +473,14 @@ release: setup $(TCLSH) $(TCLSTUBLIB) dlls libtclzip embed pkgs core: setup $(TCLLIB) $(TCLSTUBLIB)
shell: setup $(TCLSH)
dlls: setup $(TCLREGLIB) $(TCLDDELIB) $(OUT_DIR)\zlib1.dll $(OUT_DIR)\libtommath.dll
-libtclzip: core dlls $(LIBTCLZIP)
+libtclzip: core dlls $(TCLSCRIPTZIP)
all: setup $(TCLSH) $(TCLSTUBLIB) dlls libtclzip embed pkgs
embed: setup $(TCLSH) $(TCLSTUBLIB) libtclzip
!if $(TCL_EMBED_SCRIPTS)
!if $(STATIC_BUILD)
- @copy /y /b "$(TCLSH)"+"$(LIBTCLZIP)" "$(TCLSH)"
+ @copy /y /b "$(TCLSH)"+"$(TCLSCRIPTZIP)" "$(TCLSH)"
!else
- @copy /y /b "$(TCLLIB)"+"$(LIBTCLZIP)" "$(TCLLIB)"
+ @copy /y /b "$(TCLLIB)"+"$(TCLSCRIPTZIP)" "$(TCLLIB)"
!endif
!endif
@@ -582,7 +575,7 @@ $(OUT_DIR)\tommath.lib: $(TOMMATHDIR)\win32\tommath.lib $(COPY) $(TOMMATHDIR)\win32\tommath.lib $(OUT_DIR)\tommath.lib
!endif
-$(LIBTCLZIP): .PHONY
+$(TCLSCRIPTZIP): .PHONY
@echo Building Tcl library zip file
@if exist "$(LIBTCLVFS)" $(RMDIR) "$(LIBTCLVFS)"
@$(MKDIR) "$(LIBTCLVFS)"
@@ -1013,7 +1006,7 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata !endif
@$(CPY) "$(OUT_DIR)\tclConfig.sh" "$(LIB_INSTALL_DIR)\"
@$(CPY) "$(WIN_DIR)\tclooConfig.sh" "$(LIB_INSTALL_DIR)\"
- @$(CPY) "$(LIBTCLZIP)" "$(LIB_INSTALL_DIR)\"
+ @$(CPY) "$(TCLSCRIPTZIP)" "$(LIB_INSTALL_DIR)\"
@$(CPY) "$(WIN_DIR)\rules.vc" "$(LIB_INSTALL_DIR)\nmake\"
@$(CPY) "$(WIN_DIR)\targets.vc" "$(LIB_INSTALL_DIR)\nmake\"
@$(CPY) "$(WIN_DIR)\nmakehlp.c" "$(LIB_INSTALL_DIR)\nmake\"
|