Avoid overlength command lines in Makefile.msc when using TOP= with a large

directory name.

FossilOrigin-Name: 0cdd59bf36aa4c2cad9a15bb7237643fb4222d55

diff --git a/Makefile.msc b/Makefile.msc
index 1908794840cd957c1a38c38114b20979c279f283..f480b30058cf780e3643ed7e7c9669879124f1a5 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -714,7 +714,7 @@ LIBRESOBJS =
 
 # All of the source code files.
 #
-SRC = \
+SRC1 = \
   $(TOP)\src\alter.c \
   $(TOP)\src\analyze.c \
   $(TOP)\src\attach.c \
@@ -764,7 +764,8 @@ SRC = \
   $(TOP)\src\os_setup.h \
   $(TOP)\src\os_unix.c \
   $(TOP)\src\os_win.c \
-  $(TOP)\src\os_win.h \
+  $(TOP)\src\os_win.h
+SRC2 = \
   $(TOP)\src\pager.c \
   $(TOP)\src\pager.h \
   $(TOP)\src\parse.y \
@@ -811,15 +812,14 @@ SRC = \
 
 # Source code for extensions
 #
-SRC = $(SRC) \
+SRC3 = \
   $(TOP)\ext\fts1\fts1.c \
   $(TOP)\ext\fts1\fts1.h \
   $(TOP)\ext\fts1\fts1_hash.c \
   $(TOP)\ext\fts1\fts1_hash.h \
   $(TOP)\ext\fts1\fts1_porter.c \
   $(TOP)\ext\fts1\fts1_tokenizer.h \
-  $(TOP)\ext\fts1\fts1_tokenizer1.c
-SRC = $(SRC) \
+  $(TOP)\ext\fts1\fts1_tokenizer1.c \
   $(TOP)\ext\fts2\fts2.c \
   $(TOP)\ext\fts2\fts2.h \
   $(TOP)\ext\fts2\fts2_hash.c \
@@ -829,7 +829,7 @@ SRC = $(SRC) \
   $(TOP)\ext\fts2\fts2_tokenizer.h \
   $(TOP)\ext\fts2\fts2_tokenizer.c \
   $(TOP)\ext\fts2\fts2_tokenizer1.c
-SRC = $(SRC) \
+SRC4 = \
   $(TOP)\ext\fts3\fts3.c \
   $(TOP)\ext\fts3\fts3.h \
   $(TOP)\ext\fts3\fts3Int.h \
@@ -846,18 +846,16 @@ SRC = $(SRC) \
   $(TOP)\ext\fts3\fts3_tokenize_vtab.c \
   $(TOP)\ext\fts3\fts3_unicode.c \
   $(TOP)\ext\fts3\fts3_unicode2.c \
-  $(TOP)\ext\fts3\fts3_write.c
-SRC = $(SRC) \
+  $(TOP)\ext\fts3\fts3_write.c \
   $(TOP)\ext\icu\sqliteicu.h \
-  $(TOP)\ext\icu\icu.c
-SRC = $(SRC) \
+  $(TOP)\ext\icu\icu.c \
   $(TOP)\ext\rtree\rtree.h \
   $(TOP)\ext\rtree\rtree.c
 
 
 # Generated source code files
 #
-SRC = $(SRC) \
+SRC5 = \
   keywordhash.h \
   opcodes.c \
   opcodes.h \
@@ -865,6 +863,10 @@ SRC = $(SRC) \
   parse.h \
   sqlite3.h
 
+# All source code files.
+#
+SRC = $(SRC1) $(SRC2) $(SRC3) $(SRC4) $(SRC5)
+
 # Source code to the test files.
 #
 TESTSRC = \
@@ -1052,7 +1054,11 @@ mptester.exe:    $(TOP)\mptest\mptest.c libsqlite3.lib $(LIBRESOBJS) sqlite3.h
 .target_source:        $(SRC) $(TOP)\tool\vdbe-compress.tcl
        -rmdir /S/Q tsrc
        -mkdir tsrc
-       for %i in ($(SRC)) do copy /Y %i tsrc
+       for %i in ($(SRC1)) do copy /Y %i tsrc
+       for %i in ($(SRC2)) do copy /Y %i tsrc
+       for %i in ($(SRC3)) do copy /Y %i tsrc
+       for %i in ($(SRC4)) do copy /Y %i tsrc
+       for %i in ($(SRC5)) do copy /Y %i tsrc
        del /Q tsrc\sqlite.h.in tsrc\parse.y
        $(TCLSH_CMD) $(TOP)\tool\vdbe-compress.tcl $(OPTS) < tsrc\vdbe.c > vdbe.new
        move vdbe.new tsrc\vdbe.c

diff --git a/manifest b/manifest
index 6550109ae898d0df928c91e8ce6e973d9fe8dd28..98a9812dcbe0d446d964a997b95c952d1e25a062 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Experimental\ssqlite_db_config()\ssetting\sto\sdisable\swriting\sto\sall\sbtrees\s\nexcept\sfor\sone\sbtree\swith\sa\sparticular\sroot\spage.
-D 2015-01-29T02:26:40.456
+C Avoid\soverlength\scommand\slines\sin\sMakefile.msc\swhen\susing\sTOP=\swith\sa\slarge\ndirectory\sname.
+D 2015-01-29T14:48:36.055
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 2b1cb8881bdefcb0a8ed41c34c81cfa630374222
+F Makefile.msc 1edfd7dd45d98a04f9a2fa81a01c49faeb628578
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
 F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@ -1237,10 +1237,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e7d2ec048c88237c124fbe598f8f7e950d43d90f
-R 32287aaaa29e1c7ae3cede33e9d09a0f
-T *branch * one-writable-btree
-T *sym-one-writable-btree *
-T -sym-trunk *
+P 2305411097c4985b61c5faf4361c4da8414101f2
+R 3630050c6c1dd97fb4a47db3b5491230
 U drh
-Z f4cb1a3bf874e800356effffac85d8d8
+Z 6afbf0e41cb02db92c3354378ab76211

diff --git a/manifest.uuid b/manifest.uuid
index 161fe9d696dab64c485def7e2d2d7e7fcc6d7ae5..dc70127e8fbf356cbaae84868702ab45a9f886e6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2305411097c4985b61c5faf4361c4da8414101f2
\ No newline at end of file
+0cdd59bf36aa4c2cad9a15bb7237643fb4222d55
\ No newline at end of file