Copy fts5.h into the build directory as part of building fts5.c. Also remove code...

FossilOrigin-Name: 4d8f03dc7b6529cf8d46fc0fcc82112c0394dc13

diff --git a/Makefile.in b/Makefile.in
index 24c414f515b1ace05e844a72a61b9066f6e5ca0a..63d311d375bd7a0b7a79dba3663f355d06274ac5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -999,14 +999,12 @@ fts5parse.c:      $(TOP)/ext/fts5/fts5parse.y lemon
        cp $(TOP)/ext/fts5/fts5parse.y .
        rm -f fts5parse.h
        ./lemon $(OPTS) fts5parse.y
-       mv fts5parse.c fts5parse.c.orig
-       cat fts5parse.c.orig | sed 's/yy/fts5yy/g' | sed 's/YY/fts5YY/g' \
-               | sed 's/TOKEN/FTS5TOKEN/g' >> fts5parse.c
 
 fts5parse.h: fts5parse.c
 
 fts5.c: $(FTS5_SRC)
        $(TCLSH_CMD) $(TOP)/ext/fts5/tool/mkfts5c.tcl
+       cp $(TOP)/ext/fts5/fts5.h .
 
 fts5.lo:       fts5.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c fts5.c

diff --git a/Makefile.msc b/Makefile.msc
index ec553a742d7c13e1a076e2da6a320af3ff58f73a..ba008561803898e3c20a3f8887c998b28fb6dc96 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1679,16 +1679,12 @@ fts5parse.c:    $(TOP)\ext\fts5\fts5parse.y lemon.exe
        copy $(TOP)\ext\fts5\fts5parse.y .
        del /Q fts5parse.h 2>NUL
        .\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(OPTS) fts5parse.y
-       move fts5parse.c fts5parse.c.orig
-       type fts5parse.c.orig \
-               | $(NAWK) "/.*/ { gsub(/yy/,\"fts5yy\");print }" \
-               | $(NAWK) "/.*/ { gsub(/YY/,\"fts5YY\");print }" \
-               | $(NAWK) "/.*/ { gsub(/TOKEN/,\"FTS5TOKEN\");print }" > $@
 
 fts5parse.h: fts5parse.c
 
 fts5.c: $(FTS5_SRC)
        $(TCLSH_CMD) $(TOP)\ext\fts5\tool\mkfts5c.tcl
+       copy $(TOP)\ext\fts5\fts5.h .
 
 fts5.lo:       fts5.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c fts5.c

diff --git a/ext/fts5/tool/mkfts5c.tcl b/ext/fts5/tool/mkfts5c.tcl
index c21243fd139c7ca6213f76ad4eeb4227147b5f41..5d292e95d16eda9c32d30a59deb3fcf6be2c2129 100644 (file)
--- a/ext/fts5/tool/mkfts5c.tcl
+++ b/ext/fts5/tool/mkfts5c.tcl
@@ -77,15 +77,20 @@ proc fts5c_init {zOut} {
 proc fts5c_printfile {zIn} {
   global G
   set data [readfile $zIn]
-  puts $G(fd) "#line 1 \"[file tail $zIn]\""
+  set zTail [file tail $zIn]
+  puts $G(fd) "#line 1 \"$zTail\""
+
+  set sub_map [list --FTS5-SOURCE-ID-- [fts5_source_id $::srcdir]]
+  if {$zTail=="fts5parse.c"} {
+    lappend sub_map yy fts5yy YY fts5YY TOKEN FTS5TOKEN
+  }
 
-  set srcid_map [list --FTS5-SOURCE-ID-- [fts5_source_id $::srcdir]]
   foreach line [split $data "\n"] {
     if {[regexp {^#include.*fts5} $line]} continue
     if {[regexp {^(const )?[a-zA-Z][a-zA-Z0-9]* [*]?sqlite3Fts5} $line]} {
       set line "static $line"
     }
-    set line [string map $srcid_map $line]
+    set line [string map $sub_map $line]
     puts $G(fd) $line
   }
 }

diff --git a/main.mk b/main.mk
index 2d087e618438a8ece0cf84db3a9dab3d99f47e6b..b3a240f4ecce0032532b567870d23a33695f73f2 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -655,14 +655,12 @@ fts5parse.c:      $(TOP)/ext/fts5/fts5parse.y lemon
        cp $(TOP)/ext/fts5/fts5parse.y .
        rm -f fts5parse.h
        ./lemon $(OPTS) fts5parse.y
-       mv fts5parse.c fts5parse.c.orig
-       cat fts5parse.c.orig | sed 's/yy/fts5yy/g' | sed 's/YY/fts5YY/g' \
-               | sed 's/TOKEN/FTS5TOKEN/g' >> fts5parse.c
 
 fts5parse.h: fts5parse.c
 
 fts5.c: $(FTS5_SRC)
        tclsh $(TOP)/ext/fts5/tool/mkfts5c.tcl
+       cp $(TOP)/ext/fts5/fts5.h .
 
 
 userauth.o:    $(TOP)/ext/userauth/userauth.c $(HDR) $(EXTHDR)

diff --git a/manifest b/manifest
index d4f207025716e41dc3bbe68e10bd2628432fc7bd..391ee1d4fae558e43ddc7df3be0d1c9f8a49479b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C When\sdoing\scoverage\sanalysis\sof\sa\sbtree\spage\sfor\spragma\sintegrity_check,\nmake\sthe\sfirst\sentry\s(that\scovers\sthe\sheader,\scell\sindex,\sand\sgap)\simplied,\nfor\sa\sperformance\sboost\sand\ssize\sreduction.
-D 2015-07-02T19:47:08.924
+C Copy\sfts5.h\sinto\sthe\sbuild\sdirectory\sas\spart\sof\sbuilding\sfts5.c.\sAlso\sremove\scode\sto\sedit\sfts5parse.c\sfrom\svarious\sMakefiles\sand\sadd\sit\sto\smkfts5c.tcl.
+D 2015-07-02T20:12:34.556
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 1f525f24e2d3a4defd0ce819c10980caeec967fe
+F Makefile.in 78db7e3b643002849258892ab2a9df10c24ee63d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 704da8dafbe56e3a734262d07003f203a7e490b6
+F Makefile.msc 8c5911bcee5867bd594f99cae130b2796520b6f4
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@ -178,7 +178,7 @@ F ext/fts5/test/fts5unindexed.test e9539d5b78c677315e7ed8ea911d4fd25437c680
 F ext/fts5/test/fts5version.test bed59038e937c40d3c0056d08076db7874c6cd4a
 F ext/fts5/test/fts5vocab.test cdf97b9678484e9bad5062edf9c9106e5c3b0c5c
 F ext/fts5/tool/loadfts5.tcl 7ef3e62131f0434a78e4f5c5b056b09d221710a8
-F ext/fts5/tool/mkfts5c.tcl f9ada2ab7a96a471c7e28a2e390cf4f098348cff
+F ext/fts5/tool/mkfts5c.tcl 6efea6d3fad978a18e2514971f7b16e00a495275
 F ext/fts5/tool/showfts5.tcl 921f33b30c3189deefd2b2cc81f951638544aaf1
 F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
 F ext/icu/icu.c b2732aef0b076e4276d9b39b5a33cec7a05e1413
@@ -248,7 +248,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 439afc754d942e614e70fbde1d16e29d6dab18a9
+F main.mk a5b0c90e724860fdab98dd54d3a73d9e32cb0702
 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
 F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@ -1364,7 +1364,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 edbcccd349090efff3f975e27451608136a429fc
-R cdbc7a7113ac1ac4a12173f49bd7408c
-U drh
-Z 652b7ed6ab7d80fc7ccd06705dfdfa60
+P e53d497c2d2fbc5014b39f5624b52ce207800698
+R 1584f35d5dde8b2b947b977e6cc7cb5d
+U dan
+Z 1aebafb090eb6eb9b114980658da8eef

diff --git a/manifest.uuid b/manifest.uuid
index 77cf6612a312db2b8ed59bfada718b7daac43d3b..8adf4ef83c9b15f21755d3b0f2198d680062f144 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e53d497c2d2fbc5014b39f5624b52ce207800698
\ No newline at end of file
+4d8f03dc7b6529cf8d46fc0fcc82112c0394dc13
\ No newline at end of file