More fine-tuning to the new TclKit tools.

FossilOrigin-Name: 43addd8aa04c3faceb9d303672e330294af01a16

diff --git a/manifest b/manifest
index 0196378f6d7c5ffd5bfb622c72ea90e9ca5202a3..689702bf1b012d4a5b5f3024089fb1d3202d0cf2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Tweak\sbatch\stool\sadded\sin\sthe\sprevious\scheck-in\sto\spermit\sthe\sbase\sURI\sto\sbe\soverridden.
-D 2015-10-09T18:48:47.670
+C More\sfine-tuning\sto\sthe\snew\sTclKit\stools.
+D 2015-10-10T00:53:28.483
 F Makefile.in 2a247c733c2dd6fab703df04dd009b26413956f5
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 17ce18bb7e9ca2ad3abed9b0a1fcbef3fbe8f307
@@ -1331,8 +1331,8 @@ F test/without_rowid6.test 1f99644e6508447fb050f73697350c7ceca3392e
 F test/wordcount.c 9915e06cb33d8ca8109b8700791afe80d305afda
 F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
 F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
-F tool/GetFile.cs 963f7064b0b221b08feadb28894c3537916261ac
-F tool/GetTclKit.bat b9fb86e129c43d51f53fe0320e7f5ad7c1f6a56f
+F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
+F tool/GetTclKit.bat 786f6a075beaa0187bd0e6751263f77f831bff77
 F tool/addopcodes.tcl 7cc82ecca456a6b3148abf492b0419b83140881a
 F tool/build-all-msvc.bat 761d8c82a1a529261291812732a853a1b4256d85 x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
@@ -1389,7 +1389,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 50673ddaf813335777673fa8585997a7551e5323
-R 633d2a263e4011119b12c5c71c6c891a
+P 1d2f82df6774f8d66bfc5d67d5dad9f068a1069c
+R e581949b3345aa5207b2c38f2d8bf17e
 U mistachkin
-Z 9124d78764e09fb7c7e86be9f7b744d5
+Z 2c1d38a7e80b3d62039ba691f1ca8a45

diff --git a/manifest.uuid b/manifest.uuid
index b23b983a9e47b89eccdeb09241f93f6eb4a19328..e20379fb17ced1e53a4bd78ae5415e7b9c9ae5bc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1d2f82df6774f8d66bfc5d67d5dad9f068a1069c
\ No newline at end of file
+43addd8aa04c3faceb9d303672e330294af01a16
\ No newline at end of file

diff --git a/tool/GetFile.cs b/tool/GetFile.cs
index 9c489c67380b53ea73ca612710728edc8da5ffd2..56601f3e851e2006038620004fd3373cb76b1c86 100644 (file)
--- a/tool/GetFile.cs
+++ b/tool/GetFile.cs
@@ -350,7 +350,7 @@ namespace GetFile
 \r
             if (!Uri.TryCreate(args[0], UriKind.Absolute, out uri))\r
             {\r
-                Error("First argument is not an absolute URI.", false);\r
+                Error("Could not create absolute URI from argument.", false);\r
                 return (int)ExitCode.BadUri;\r
             }\r
 \r

diff --git a/tool/GetTclKit.bat b/tool/GetTclKit.bat
index 41ebceec0325ef24da6c2ea710ce69c7cfa0a7b8..5bd9ab63452c6a275581df94e168cbfc6c327573 100644 (file)
--- a/tool/GetTclKit.bat
+++ b/tool/GetTclKit.bat
@@ -133,7 +133,7 @@ IF ERRORLEVEL 1 (
 )\r
 \r
 FOR %%F IN (%TCLKIT_FILES%) DO (\r
-  IF NOT EXIST "%%F" (\r
+  IF NOT EXIST "%TEMP%\%%F" (\r
     %__ECHO% "%TEMP%\GetFile.exe" "%TCLKIT_URI%%%F"\r
 \r
     IF ERRORLEVEL 1 (\r
@@ -154,7 +154,7 @@ IF NOT EXIST "%TEMP%\%TCLKIT_SDK%" (
   )\r
 )\r
 \r
-%__ECHO% "%TEMP%\unzip.exe" -o "%TEMP%\%TCLKIT_SDK_ZIP%" -d "%TEMP%\%TCLKIT_SDK%"\r
+%__ECHO% "%TEMP%\unzip.exe" -n "%TEMP%\%TCLKIT_SDK_ZIP%" -d "%TEMP%\%TCLKIT_SDK%"\r
 \r
 IF ERRORLEVEL 1 (\r
   ECHO Could not unzip "%TEMP%\%TCLKIT_SDK_ZIP%" to "%TEMP%\%TCLKIT_SDK%".\r
@@ -173,6 +173,11 @@ IF DEFINED TCLKIT_NOSDK GOTO skip_sdkVariables
 \r
 :skip_sdkVariables\r
 \r
+ECHO.\r
+ECHO Wrote "%ROOT%\SetTclKitEnv.bat".\r
+ECHO Please run it to set the necessary Tcl environment variables.\r
+ECHO.\r
+\r
 GOTO no_errors\r
 \r
 :fn_TclKitX86Variables\r