Improve consistency in handling of build outputs and native library paths in the...

FossilOrigin-Name: e71f2de2cc7c4ef5ee31da81b6615886f6e601e7

diff --git a/Makefile.msc b/Makefile.msc
index c8142b4517d590f74c2a2157f84d94e79c0ee8e4..a7daea756dbfeae80bab0eb66af639ced4cfe404 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -92,9 +92,10 @@ NCC = $(CC)
 #
 !IFNDEF NCRTLIBPATH
 NCRTLIBPATH = $(VCINSTALLDIR)\lib
-NCRTLIBPATH = $(NCRTLIBPATH:\\=\)
 !ENDIF
 
+NCRTLIBPATH = $(NCRTLIBPATH:\\=\)
+
 # Check for the Platform SDK library path macro.  Othertise, this
 # value will default to the 'lib' directory underneath the Windows
 # SDK installation directory (the environment variable used appears
@@ -103,9 +104,10 @@ NCRTLIBPATH = $(NCRTLIBPATH:\\=\)
 #
 !IFNDEF NSDKLIBPATH
 NSDKLIBPATH = $(WINDOWSSDKDIR)\lib
-NSDKLIBPATH = $(NSDKLIBPATH:\\=\)
 !ENDIF
 
+NSDKLIBPATH = $(NSDKLIBPATH:\\=\)
+
 # C compiler and options for use in building executables that
 # will run on the platform that is doing the build.
 #

diff --git a/manifest b/manifest
index 9d4536e1622b84a38d5240fd8ff005cc2576fe9c..acf282d786fd89ab7a7481e9bd4cbdce90ed353e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Minor\sadjustments\sto\sthe\smulti-platform\sbuild\stool\sfor\sMSVC.
-D 2012-07-27T22:29:26.000
+C Improve\sconsistency\sin\shandling\sof\sbuild\soutputs\sand\snative\slibrary\spaths\sin\sthe\smulti-platform\sbuild\stool\sfor\sMSVC.
+D 2012-07-27T23:03:47.862
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 4d7f170e4cef939bec3c90e149ab8241c8e36703
+F Makefile.msc c1293ece66e237b545eae4484e3e81571fb5f47c
 F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@ -966,7 +966,7 @@ F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/win32lock.test b2a539e85ae6b2d78475e016a9636b4451dc7fb9
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F test/zerodamage.test 0de750389990b1078bab203c712dc3fefd1d8b82
-F tool/build-all-msvc.bat d0a65da7a96b15fabf5e8d9586ff30ebe2279163 x
+F tool/build-all-msvc.bat f8e272fc74c48e7697f4744aacce1ee4df5edb20 x
 F tool/build-shell.sh b64a481901fc9ffe5ca8812a2a9255b6cfb77381
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
@@ -1008,7 +1008,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 84163b633f01f35cb47495c05dd2b640159677ff
-P d575d9619abd03322b73f89882d6da7c0820f285
-R ddae9c94b79aa7fedb3193f520c7c29e
+P e76b8f7765a91f4306cddb245e731084008f0b8c
+R cb74972be2d529442347b1af34814a0a
 U mistachkin
-Z 7226a750f1ba945c71fd0c02712e92d7
+Z 1c22abf12838e6e39c724ae138286b68

diff --git a/manifest.uuid b/manifest.uuid
index 2ebe790acff7b1466ba147b97f608f0908491607..4ee6e83bc645884fc686644ff8387cfce69743cc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e76b8f7765a91f4306cddb245e731084008f0b8c
\ No newline at end of file
+e71f2de2cc7c4ef5ee31da81b6615886f6e601e7
\ No newline at end of file

diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index e7832284ee7a71785363a7be3132f92ea6957c41..bc6dbf2ad8419a0e4732cacd9cc4fb04be7cc805 100755 (executable)
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -225,16 +225,20 @@ FOR %%P IN (%PLATFORMS%) DO (
       REM       the "lib" sub-directory beneath the location specified in the\r
       REM       WindowsSdkDir environment variable because that location does\r
       REM       not actually contain the necessary library files for x86.\r
+      REM       This must be done for each iteration because it relies upon\r
+      REM       the WindowsSdkDir environment variable being set by the batch\r
+      REM       file used to setup the MSVC environment.\r
       REM\r
       IF DEFINED SET_NSDKLIBPATH (\r
         CALL :fn_SetVariable WindowsSdkDir NSDKLIBPATH\r
-        CALL :fn_AppendVariable NSDKLIBPATH lib\win8\um\x86\r
+        CALL :fn_AppendVariable NSDKLIBPATH \lib\win8\um\x86\r
       )\r
 \r
       REM\r
-      REM NOTE: Invoke NMAKE with the MSVC makefile to clean any stale build\r
-      REM       output from previous iterations of this loop and/or previous\r
-      REM       runs of this batch file, etc.\r
+      REM NOTE: Unless prevented from doing so, invoke NMAKE with the MSVC\r
+      REM       makefile to clean any stale build output from previous\r
+      REM       iterations of this loop and/or previous runs of this batch\r
+      REM       file, etc.\r
       REM\r
       IF NOT DEFINED NOCLEAN (\r
         %__ECHO% nmake -f Makefile.msc clean\r
@@ -243,6 +247,13 @@ FOR %%P IN (%PLATFORMS%) DO (
           ECHO Failed to clean for platform %%P.\r
           GOTO errors\r
         )\r
+      ) ELSE (\r
+        REM\r
+        REM NOTE: Even when the cleaning step has been disabled, we still need\r
+        REM       to remove the build output for the files we are specifically\r
+        REM       wanting to build for each platform.\r
+        REM\r
+        %__ECHO% DEL /Q sqlite3.dll sqlite3.lib\r
       )\r
 \r
       REM\r