Update tool/symbols.sh to ignore symbols from sessions and rebaser and to not

try to compile with ICU which is not available on all platforms.

FossilOrigin-Name: 0bab4ece6e81916d0f7255a8e553b8ca040cb8a96ab21e294212e232119f8ddc

diff --git a/manifest b/manifest
index 90d558aa5488525e436710d2095fb7e40263435e..ffbb6178320c0e4321d13fe9f336d6aaf4e263c6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sstray\stab\sfrom\sthe\ssource\scode.
-D 2019-04-14T00:40:29.664
+C Update\stool/symbols.sh\sto\signore\ssymbols\sfrom\ssessions\sand\srebaser\sand\sto\snot\ntry\sto\scompile\swith\sICU\swhich\sis\snot\savailable\son\sall\splatforms.
+D 2019-04-15T13:51:27.890
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1790,7 +1790,7 @@ F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14e
 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f
 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
-F tool/symbols.sh c5a617b8c61a0926747a56c65f5671ef8ac0e148
+F tool/symbols.sh 1612bd947750e21e7b47befad5f6b3825b06cce0705441f903bf35ced65ae9b9
 F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
 F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
 F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
@@ -1818,7 +1818,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P cd084427319394386844d6651479256a2fd57a412fccb79ba53172ce76693eb1
-R bdea7eaed004b4cfa9fc23d1bb7a767a
+P 0ada58e9303d53aba8bdc37abe5904aa40e91f80e247eb51cb1192387b0d661c
+R d06e34268d47fe60caa0abd72ec2148e
 U drh
-Z c99e67ebce64d8ba06986a4aac00b602
+Z 9d31d16ab161c9ea2ddf9f92f3cb599e

diff --git a/manifest.uuid b/manifest.uuid
index e97460cb86f876801a2d3b274a4c23474a1a2ba5..69505ae92ea046237b6e54737d1a56f75c4c5d1f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0ada58e9303d53aba8bdc37abe5904aa40e91f80e247eb51cb1192387b0d661c
\ No newline at end of file
+0bab4ece6e81916d0f7255a8e553b8ca040cb8a96ab21e294212e232119f8ddc
\ No newline at end of file

diff --git a/tool/symbols.sh b/tool/symbols.sh
index 5e80078fa3302fc23adb123dadfe8e578822fbef..67d578e1f110bcfdb23f7efb36f436842a28440e 100644 (file)
--- a/tool/symbols.sh
+++ b/tool/symbols.sh
@@ -5,17 +5,19 @@
 #
 make sqlite3.c
 
-echo '****** Exported symbols from a build including RTREE, FTS4 & ICU ******'
+echo '****** Exported symbols from a build including RTREE, FTS4 & FTS5 ******'
 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 \
-  -DSQLITE_ENABLE_ICU -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_SESSION \
+  -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_SESSION \
+  -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY \
   sqlite3.c
 nm sqlite3.o | grep ' [TD] ' | sort -k 3
 
-echo '****** Surplus symbols from a build including RTREE, FTS4 & ICU ******'
-nm sqlite3.o | grep ' [TD] ' | grep -v ' .*sqlite3_'
+echo '****** Surplus symbols from a build including RTREE, FTS4 & FTS5 ******'
+nm sqlite3.o | grep ' [TD] ' |
+   egrep -v ' .*sqlite3(session|rebaser|changeset|changegroup)?_'
 
 echo '****** Dependencies of the core. No extensions. No OS interface *******'
 gcc -c -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_STAT3 \