Use the native name for the MSVC makefile as well.

FossilOrigin-Name: e457c615647a5bacb32d7d1d9ddfcfb0c7d56e82

diff --git a/manifest b/manifest
index 0347e7e67c37f0516fe0c8253f5d2eaefddc04a2..b37dc4bb87a67c0a88b8f4ee89e70270bbc802a9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Attempt\sto\scentralize\sand\ssimplify\sthe\sMSVC\shandling.
-D 2015-11-02T23:29:58.179
+C Use\sthe\snative\sname\sfor\sthe\sMSVC\smakefile\sas\swell.
+D 2015-11-03T02:47:11.042
 F Makefile.in 4469ed8b02a9934fea9503d791165367d19db2f7
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
@@ -948,7 +948,7 @@ F test/rbu.test 168573d353cd0fd10196b87b0caa322c144ef736
 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/releasetest.tcl 203d4ae4b5967f45aff3a702f5ceca0e374c2701
+F test/releasetest.tcl bad82f39a04a0167a4f66e8e08b17b23f204af47
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
 F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14
@@ -1397,10 +1397,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f625bce8b7c2884a092c70675a9c6ce15c29937e
-R eb29c38bdfc8b6dd27ad862c284260aa
-T *branch * msvcRefactor
-T *sym-msvcRefactor *
-T -sym-mp-releasetest *
+P 4ae96d6dde7fc0a913d7719ec498686f9a1e3b98
+R 14492f88a18ae330845ea78da3703df0
 U mistachkin
-Z b0a92943833683434e791bb83f5a4e2b
+Z 0806ab004061ebe41f0631a896122666

diff --git a/manifest.uuid b/manifest.uuid
index c1778b7e5cf6bda496645f3b1674fcf862d97855..40cad1b83f3923b0d5aa7d1e8828b2060d8a33d9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4ae96d6dde7fc0a913d7719ec498686f9a1e3b98
\ No newline at end of file
+e457c615647a5bacb32d7d1d9ddfcfb0c7d56e82
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index dea09a6ebeb8336b20c85eceb964a4636bc6db51..a4d379b4d952ae1ace493b0681d0828b647bfe0e 100644 (file)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -648,7 +648,7 @@ proc makeCommand { targets makeOpts cflags opts } {
   set result [list trace_cmd exec]
   if {$::MSVC} {
     set nmakeDir [file nativename $::SRCDIR]
-    set nmakeFile [file join $nmakeDir Makefile.msc]
+    set nmakeFile [file nativename [file join $nmakeDir Makefile.msc]]
     lappend result nmake /f $nmakeFile TOP=$nmakeDir
   } else {
     lappend result make