From: mistachkin <mistachkin@noemail.net>
Date: Sat, 10 Oct 2015 23:39:55 +0000 (+0000)
Subject: Enhance TclKit batch tool (and MSVC makefile) to support targets that require the... 
X-Git-Tag: version-3.10.0~237^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b66350ac70d98df05caee2953803f9175bebb46;p=thirdparty%2Fsqlite.git

Enhance TclKit batch tool (and MSVC makefile) to support targets that require the Tcl stub library.

FossilOrigin-Name: bc6223b1d6c31a47c7b734cfb8a9ecf15ab809fc
---

diff --git a/Makefile.msc b/Makefile.msc
index d838aa685c..d980e3c652 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -569,6 +569,10 @@ TCLLIBDIR = c:\tcl\lib
 LIBTCL = tcl85.lib
 !ENDIF
 
+!IFNDEF LIBTCLSTUB
+LIBTCLSTUB = tclstub85.lib
+!ENDIF
+
 # The locations of the ICU header and library files.  These variables
 # (ICUINCDIR, ICULIBDIR, and LIBICU) may be overridden via the environment
 # prior to running nmake in order to match the actual installed location on
@@ -1223,7 +1227,7 @@ libsqlite3.lib:	$(LIBOBJ)
 	$(LTLIB) $(LTLIBOPTS) /OUT:$@ $(LIBOBJ) $(TLIBS)
 
 libtclsqlite3.lib:	tclsqlite.lo libsqlite3.lib
-	$(LTLIB) $(LTLIBOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCL:tcl=tclstub) $(TLIBS)
+	$(LTLIB) $(LTLIBOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCLSTUB) $(TLIBS)
 
 sqlite3.exe:	$(TOP)\src\shell.c $(JSON1_DEP) $(SHELL_CORE_DEP) $(LIBRESOBJS) sqlite3.h
 	$(LTLINK) $(SHELL_COMPILE_OPTS) $(JSON1_OPT) $(READLINE_FLAGS) $(TOP)\src\shell.c $(JSON1_SRC) \
diff --git a/manifest b/manifest
index 7f0ed5c665..3b57e44a30 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Remove\sa\scouple\ssuperfluous\sdouble\squotes\sin\sthe\sMSVC\smakefile.
-D 2015-10-10T02:06:05.870
+C Enhance\sTclKit\sbatch\stool\s(and\sMSVC\smakefile)\sto\ssupport\stargets\sthat\srequire\sthe\sTcl\sstub\slibrary.
+D 2015-10-10T23:39:55.377
 F Makefile.in 2a247c733c2dd6fab703df04dd009b26413956f5
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc b32cae4343a16d4eb1c0dec49ee6877e54ad9678
+F Makefile.msc f846966b1c38bdc12a384bd48bfbdb257fb5b558
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1332,7 +1332,7 @@ F test/wordcount.c 9915e06cb33d8ca8109b8700791afe80d305afda
 F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
 F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
 F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
-F tool/GetTclKit.bat 786f6a075beaa0187bd0e6751263f77f831bff77
+F tool/GetTclKit.bat 32000d7c7cb27e5aac5d58789535bb1be662138f
 F tool/addopcodes.tcl 7cc82ecca456a6b3148abf492b0419b83140881a
 F tool/build-all-msvc.bat 761d8c82a1a529261291812732a853a1b4256d85 x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
@@ -1390,7 +1390,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f8c2193b64979a2fe480fcf913573b5fac06235e
-R 7cc2a5813618966360cf80bf66f0084c
+P 0f9e205b28e013412b19dfd588f2a6cf341c40e8
+R 3257d1b5b394e4f53f94f7465d06faaf
 U mistachkin
-Z d70bac36f21bbf58c368f1d4e150ed30
+Z ec0928dd2133e890176fa11b64cc0e8a
diff --git a/manifest.uuid b/manifest.uuid
index b2060c7cc5..b13e4b4a8a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f9e205b28e013412b19dfd588f2a6cf341c40e8
\ No newline at end of file
+bc6223b1d6c31a47c7b734cfb8a9ecf15ab809fc
\ No newline at end of file
diff --git a/tool/GetTclKit.bat b/tool/GetTclKit.bat
index 5bd9ab6345..8e250d9793 100644
--- a/tool/GetTclKit.bat
+++ b/tool/GetTclKit.bat
@@ -75,10 +75,12 @@ IF /I "%PROCESSOR%" == "x86" (
   GOTO usage
 )
 
+%_VECHO% TclKitVersion = '%TCLKIT_VERSION%'
 %_VECHO% TclKitPatchLevel = '%TCLKIT_PATCHLEVEL%'
 %_VECHO% TclKitNoSdk = '%TCLKIT_NOSDK%'
 %_VECHO% TclKitExe = '%TCLKIT_EXE%'
 %_VECHO% TclKitLib = '%TCLKIT_LIB%'
+%_VECHO% TclKitLibStub = '%TCLKIT_LIB_STUB%'
 %_VECHO% TclKitSdk = '%TCLKIT_SDK%'
 %_VECHO% TclKitSdkZip = '%TCLKIT_SDK_ZIP%'
 %_VECHO% TclKitFiles = '%TCLKIT_FILES%'
@@ -125,11 +127,13 @@ SET PATH=%FRAMEWORKDIR%;%PATH%
 
 :skip_addToPath
 
-%__ECHO% csc.exe "/out:%TEMP%\GetFile.exe" /target:exe "%TOOLS%\GetFile.cs"
+IF NOT EXIST "%TEMP%\GetFile.exe" (
+  %__ECHO% csc.exe "/out:%TEMP%\GetFile.exe" /target:exe "%TOOLS%\GetFile.cs"
 
-IF ERRORLEVEL 1 (
-  ECHO Compilation of "%TOOLS%\GetFile.cs" failed.
-  GOTO errors
+  IF ERRORLEVEL 1 (
+    ECHO Compilation of "%TOOLS%\GetFile.cs" failed.
+    GOTO errors
+  )
 )
 
 FOR %%F IN (%TCLKIT_FILES%) DO (
@@ -170,6 +174,7 @@ IF DEFINED TCLKIT_NOSDK GOTO skip_sdkVariables
 %__ECHO% ECHO SET TCLINCDIR=%TEMP%\%TCLKIT_SDK%\include%APPEND%"%ROOT%\SetTclKitEnv.bat"
 %__ECHO% ECHO SET TCLLIBDIR=%TEMP%\%TCLKIT_SDK%\lib%APPEND%"%ROOT%\SetTclKitEnv.bat"
 %__ECHO% ECHO SET LIBTCL=%TCLKIT_LIB%%APPEND%"%ROOT%\SetTclKitEnv.bat"
+%__ECHO% ECHO SET LIBTCLSTUB=%TCLKIT_LIB_STUB%%APPEND%"%ROOT%\SetTclKitEnv.bat"
 
 :skip_sdkVariables
 
@@ -184,8 +189,11 @@ GOTO no_errors
   IF NOT DEFINED TCLKIT_PATCHLEVEL (
     SET TCLKIT_PATCHLEVEL=8.6.4
   )
+  SET TCLKIT_VERSION=%TCLKIT_PATCHLEVEL:.=%
+  SET TCLKIT_VERSION=%TCLKIT_VERSION:~0,2%
   SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe
   SET TCLKIT_LIB=libtclkit%TCLKIT_PATCHLEVEL:.=%.lib
+  SET TCLKIT_LIB_STUB=libtclstub%TCLKIT_VERSION:.=%.a
   SET TCLKIT_SDK=libtclkit-sdk-x86-%TCLKIT_PATCHLEVEL%
   SET TCLKIT_SDK_ZIP=%TCLKIT_SDK%.zip
   SET TCLKIT_FILES=%TCLKIT_EXE% unzip.exe %TCLKIT_SDK_ZIP%
@@ -204,7 +212,10 @@ GOTO no_errors
   ) ELSE (
     SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe
   )
+  SET TCLKIT_VERSION=%TCLKIT_PATCHLEVEL:.=%
+  SET TCLKIT_VERSION=%TCLKIT_VERSION:~0,2%
   SET TCLKIT_LIB=libtclkit%TCLKIT_PATCHLEVEL:.=%.lib
+  SET TCLKIT_LIB_STUB=libtclstub%TCLKIT_VERSION:.=%.a
   SET TCLKIT_SDK=libtclkit-sdk-x64-%TCLKIT_PATCHLEVEL%
   SET TCLKIT_SDK_ZIP=%TCLKIT_SDK%.zip
   SET TCLKIT_FILES=%TCLKIT_EXE% unzip.exe %TCLKIT_SDK_ZIP%