Adjust the symbols.sh script for STAT3. Add the symbols-mingw.sh script for

testing on windows with MinGW.

FossilOrigin-Name: c41d1d4652b8c7608322e9360c30f06965fd0942

diff --git a/manifest b/manifest
index c92b136d8ac25d83e92ca0d6e98e30f8d5964e9a..0e37b2a722878cb7acf1fc3ae7e09f94aa170b27 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sall\snon-API\sfunctions\sin\sos_win.c\shave\sfile\sscope.\nTicket\s[35c54c874987]
-D 2011-10-13T14:05:32.038
+C Adjust\sthe\ssymbols.sh\sscript\sfor\sSTAT3.\s\sAdd\sthe\ssymbols-mingw.sh\sscript\sfor\ntesting\son\swindows\swith\sMinGW.
+D 2011-10-13T14:18:51.846
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -962,11 +962,12 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
-F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
+F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
+F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 1c00d5454c85dfddb6c628c3742b4ddeaad6423a
-R 62079adc2aa04b6b18d74fffb6482754
+P 17e4fde5c541f1bba723386938b6123b2431bffc
+R 486400a177be812669a333a82555c1f5
 U drh
-Z a52af7b3a4f3b4ce4a34929a0d76fe19
+Z f27e2c68607b57fc251f5ab7e7102c22

diff --git a/manifest.uuid b/manifest.uuid
index b9cc217f671e1037a2529b98b73cf56b1113891e..e7ccaae9091bc93a8d4adc26a80c1198433b5da7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-17e4fde5c541f1bba723386938b6123b2431bffc
\ No newline at end of file
+c41d1d4652b8c7608322e9360c30f06965fd0942
\ No newline at end of file

diff --git a/tool/symbols-mingw.sh b/tool/symbols-mingw.sh
new file mode 100644 (file)
index 0000000..bf93eec
--- /dev/null
+++ b/tool/symbols-mingw.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Run this script in a directory that contains a valid SQLite makefile in
+# order to verify that unintentionally exported symbols.
+#
+make sqlite3.c
+
+echo '****** Exported symbols from a build including RTREE && FTS4 ******'
+gcc -c -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE \
+  -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_STAT3 \
+  -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_ENABLE_UNLOCK_NOTIFY \
+  -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_ATOMIC_WRITE \
+  sqlite3.c
+nm sqlite3.o | grep " [TD] "
+
+echo '****** Surplus symbols from a build including RTREE & FTS4 ******'
+nm sqlite3.o | grep " [TD] " | grep -v " .*sqlite3_"
+
+echo '****** Dependencies of the core. No extensions. No OS interface *******'
+gcc -c -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_STAT3 \
+  -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_ENABLE_UNLOCK_NOTIFY \
+  -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_ATOMIC_WRITE \
+  -DSQLITE_OS_OTHER -DSQLITE_THREADSAFE=0 \
+  sqlite3.c
+nm sqlite3.o | grep " U "
+
+echo '****** Dependencies including RTREE & FTS4 *******'
+gcc -c -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE \
+  -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_STAT3 \
+  -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_ENABLE_UNLOCK_NOTIFY \
+  -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_ATOMIC_WRITE \
+  sqlite3.c
+nm sqlite3.o | grep " U "

diff --git a/tool/symbols.sh b/tool/symbols.sh
index 74b1243e6e0e066b2c2a8f0bc3df04b67ace058e..befffce5c4c43403f7c6cd99aa25cf72fe26fe0d 100644 (file)
--- a/tool/symbols.sh
+++ b/tool/symbols.sh
@@ -7,7 +7,7 @@ make sqlite3.c
 
 echo '****** Exported symbols from a build including RTREE, FTS4 & ICU ******'
 gcc -c -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE \
-  -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_STAT2 \
+  -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_STAT3 \
   -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_ENABLE_UNLOCK_NOTIFY \
   -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_ATOMIC_WRITE \
   -DSQLITE_ENABLE_ICU \
@@ -18,7 +18,7 @@ echo '****** Surplus symbols from a build including RTREE, FTS4 & ICU ******'
 nm sqlite3.o | grep ' [TD] ' | grep -v ' .*sqlite3_'
 
 echo '****** Dependencies of the core. No extensions. No OS interface *******'
-gcc -c -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_STAT2 \
+gcc -c -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_STAT3 \
   -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_ENABLE_UNLOCK_NOTIFY \
   -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_ATOMIC_WRITE \
   -DSQLITE_OS_OTHER -DSQLITE_THREADSAFE=0 \
@@ -27,7 +27,7 @@ nm sqlite3.o | grep ' U ' | sort -k 3
 
 echo '****** Dependencies including RTREE & FTS4 *******'
 gcc -c -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE \
-  -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_STAT2 \
+  -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_STAT3 \
   -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_ENABLE_UNLOCK_NOTIFY \
   -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_ATOMIC_WRITE \
   sqlite3.c