The 'releasetest' tool should pass the TCLDIR macro for MSVC to nmake.

FossilOrigin-Name: eaa9c0dda73808f1458f9968be59947636fbd4781c9fc535eb50bcaf790093c1

diff --git a/manifest b/manifest
index 992a88310c33c02eb3d08e209099364730366a4c..56e9862e9851196eb4c3d3e2eeb6091de1280149 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\sthe\sMSVC\sMakefile,\sthe\s'sqlite3_checker.exe'\starget\srequires\sthe\sTcl\slibrary.
-D 2018-01-05T19:25:52.005
+C The\s'releasetest'\stool\sshould\spass\sthe\sTCLDIR\smacro\sfor\sMSVC\sto\snmake.
+D 2018-01-05T19:27:19.800
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in f5c6285ac43b2e567d6cf463dff3744da960a19f2cf141744b4472842a97681e
@@ -1151,7 +1151,7 @@ F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/releasetest.tcl 0b0b3d926e36822ff63b405d683544ce1014303b029f2678bbcf40c162b5f246 x
+F test/releasetest.tcl 6aaa853f7a7bbdc458d4cb42c0425228729b0f3e5769e9b41088c08eee999a49 x
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test f580934279800d480a19176c6b44909df31ce7ad45267ea475a541daa522f3d3
 F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
@@ -1694,7 +1694,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 148b8aee78e40cab9a758a920589bd3ca8fc1c45cc93598bc50d96b85cd17e6c
-R 3bd57aef0f7576f9a9295eae8b71396f
+P 38109a47ffa977f1f962af2e183285d4e5db6fac2344868c5f1de64779dd0839
+R 9eed99f952d882095a7640a2b2c94c61
 U mistachkin
-Z 21f077ad1d1dc6de7af623b34ca85770
+Z 7e88bc6a5eaa12b61e53263c5085cc0a

diff --git a/manifest.uuid b/manifest.uuid
index 77e9c2d595303994c3f912b54c9301ef08d26137..f9e69f73dfffe8142305467c4df896618dfc3db0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38109a47ffa977f1f962af2e183285d4e5db6fac2344868c5f1de64779dd0839
\ No newline at end of file
+eaa9c0dda73808f1458f9968be59947636fbd4781c9fc535eb50bcaf790093c1
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 5055e81129d12374f93c60b36c0d2f08f19be645..599ebd791df7b1ffd64d5577b1e844766ad0e29b 100755 (executable)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -734,6 +734,9 @@ proc makeCommand { targets makeOpts cflags opts } {
     set nmakeDir [file nativename $::SRCDIR]
     set nmakeFile [file nativename [file join $nmakeDir Makefile.msc]]
     lappend result nmake /f $nmakeFile TOP=$nmakeDir
+    set tclDir [file nativename [file normalize \
+        [file dirname [file dirname [info nameofexecutable]]]]]
+    lappend result "TCLDIR=$tclDir"
     if {[regexp {USE_STDCALL=1} $cflags]} {
       lappend result USE_STDCALL=1
     }