Add a --nostatic option to mksqlite3c.tcl. With this option turned on,

the extra "static" storage class markers are not inserted into the
amalgamation. (CVS 4013)

FossilOrigin-Name: 57e17c7cda23a3b3e1d0a691af07c35c1c644dcc

diff --git a/manifest b/manifest
index 540a396ba908989d41d711582762eb5c4ee501d1..a08fdb6a6be96474dc8021d0b2327c77121bed49 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Keep\sthe\sfull\sprecision\sof\sintegers\sif\spossible\swhen\scasting\sto\s"numeric".\nTicket\s#2364.\s(CVS\s4012)
-D 2007-05-16T11:55:57
+C Add\sa\s--nostatic\soption\sto\smksqlite3c.tcl.\s\sWith\sthis\soption\sturned\son,\nthe\sextra\s"static"\sstorage\sclass\smarkers\sare\snot\sinserted\sinto\sthe\namalgamation.\s(CVS\s4013)
+D 2007-05-16T13:55:26
 F Makefile.in 87b200ad9970907f76df734d29dff3d294c10935
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -426,7 +426,7 @@ F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
 F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
 F tool/mkkeywordhash.c fe15d1cbc61c2b0375634b6d8c1ef24520799ea0
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
-F tool/mksqlite3c.tcl 73453da6ff4e0af53c708922e69447bc393c19d8
+F tool/mksqlite3c.tcl a1c49f75558b32cadae8b4f558af44a2292fb6f3
 F tool/mksqlite3internalh.tcl 09152fdc0c5fd779a3ac5759a043f08d2f609248
 F tool/omittest.tcl e6b3d6a1285f9813bc1dea53bb522b4b72774710
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -492,7 +492,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 448d3ef670dce6d27c7d7b1be58088d45f8b6274
-R c8d1b4af067fdea86c8ef5e23b538719
+P 2ac985a38034da87b0fa3837976e1f2164b22672
+R 5e790419b578af9a1263f12ce379977a
 U drh
-Z 5f8f6c00eb0bad475fb07ee3737fa3b6
+Z a49104c063bb649dce202b1f8aae51b8

diff --git a/manifest.uuid b/manifest.uuid
index 792e474af72cc617a93ce8a2999ab651dc394633..87c09274e590e7e3937065d84e2968371f35a444 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2ac985a38034da87b0fa3837976e1f2164b22672
\ No newline at end of file
+57e17c7cda23a3b3e1d0a691af07c35c1c644dcc
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index a399cf5de8bf169ca1335a9db8f7c87d11acc3b5..389f7a21dcff071ae352d9d2f39b0965061a2f69 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -26,6 +26,11 @@
 # in this file and extract the version number.  That information will be
 # needed in order to generate the header of the amalgamation.
 #
+if {[lsearch $argv --nostatic]>=0} {
+  set addstatic 0
+} else {
+  set addstatic 1
+}
 set in [open tsrc/sqlite3.h]
 set cnt 0
 set VERSION ?????
@@ -111,7 +116,7 @@ proc section_comment {text} {
 # process them approprately.
 #
 proc copy_file {filename} {
-  global seen_hdr available_hdr out
+  global seen_hdr available_hdr out addstatic
   set tail [file tail $filename]
   section_comment "Begin file $tail"
   set in [open $filename r]
@@ -140,7 +145,8 @@ proc copy_file {filename} {
       puts $out "#if 0"
     } elseif {[regexp {^#line} $line]} {
       # Skip #line directives.
-    } elseif {[regexp $declpattern $line] && ![regexp {^static} $line]} {
+    } elseif {$addstatic && [regexp $declpattern $line] 
+                  && ![regexp {^static} $line]} {
       # Add the "static" keyword before internal functions.
       puts $out "static $line"
     } else {
@@ -217,31 +223,4 @@ foreach file {
   copy_file tsrc/$file
 }
 
-if 0 {
-puts $out "#ifdef SQLITE_TEST"
-foreach file {
-   test1.c
-   test2.c
-   test3.c
-   test4.c
-   test5.c
-   test6.c
-   test7.c
-   test8.c
-   test_async.c
-   test_autoext.c
-   test_loadext.c
-   test_md5.c
-   test_schema.c
-   test_server.c
-   test_tclvar.c
-} {
-  copy_file ../sqlite/src/$file
-}
-puts $out "#endif /* SQLITE_TEST */"
-puts $out "#ifdef SQLITE_TCL"
-copy_file ../sqlite/src/tclsqlite.c
-puts $out "#endif /* SQLITE_TCL */"
-}
-
 close $out