Fix the build scripts for windows binaries. ticket #2916. (CVS 4768)

FossilOrigin-Name: c336b2318a56c1deb94c41107754f5f622a9b1ee

diff --git a/manifest b/manifest
index 29d7c75ce651a41cb37c16b7ce0fa655f746f90c..be8bd3e45af10aa0c688b3ddc3426b64e4ef89ef 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sthe\sprintf\stest\sscript\sso\sthat\sit\sdoes\snot\sdepend\son\sthe\splatform\nprintf,\sso\sthat\swe\sdo\snot\sspurious\stest\sfailures\swhen\smoving\sfrom\sone\nplatform\sto\sanother.\s(CVS\s4767)
-D 2008-02-01T01:19:54
+C Fix\sthe\sbuild\sscripts\sfor\swindows\sbinaries.\s\sticket\s#2916.\s(CVS\s4768)
+D 2008-02-01T13:44:33
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in bc2b5df3e3d0d4b801b824b7ef6dec43812b049b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -65,14 +65,14 @@ F ext/icu/icu.c 12e763d288d23b5a49de37caa30737b971a2f1e2
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 56abb507100ed2d4261f6dd1653dec3cf4066387
 F main.mk ad3a30d15d88f7d7c58b3c5f6bcee6f917043887
-F mkdll.sh 5f8438dcac98e795d7df6529159a1ec566de0183
+F mkdll.sh 712e74f3efe08a6ba12b2945d018a29a89d7fe3b
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 1a866b53637dab137191341cc875575a5ca110fb
 F mkopcodec.awk 3fb9bf077053c968451f4dd03d11661ac373f9d1
 F mkopcodeh.awk 513946ce4429bf2723aef0d640eb4d2493deb68e
 F mkso.sh 24bde4c09e6fe80f718db3c31c068f45e13a2f2c
 F publish.sh 3ecffcfa9d4718b20fc8f1891ac529056636d37f
-F publish_osx.sh eca87df1e3d43d128d97d3261fd48b3d6877996e
+F publish_osx.sh 2ad2ee7d50632dff99949edc9c162dbb052f7534
 F spec.template b2f6c4e488cbc3b993a57deba22cbc36203c4da3
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
@@ -614,7 +614,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 921c7a0ac4581255ea5061980ff7991088b9b78a
-R b1327994ea4ef6104e894bbd336c0d1e
+P 514d7e474391278a121af285dc4aca6216358ad7
+R 8a651a60f5d2df2c2ab78753f4f283a4
 U drh
-Z 0522006ecf7d01deef5d03f9f2608874
+Z 6264ed1b3be033c23a63985b221c4f40

diff --git a/manifest.uuid b/manifest.uuid
index 6488a1c61c54e0f3dae5f339b96af64de3db8905..ccde0c7fbb7a9e6cc8403baf4d11982e7ecc1765 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-514d7e474391278a121af285dc4aca6216358ad7
\ No newline at end of file
+c336b2318a56c1deb94c41107754f5f622a9b1ee
\ No newline at end of file

diff --git a/mkdll.sh b/mkdll.sh
index b03fabdd8e371313bcfb9f24cbed20a67ba179b0..ed1e741ca6803494e231bd20e9d825fa22f376ab 100644 (file)
--- a/mkdll.sh
+++ b/mkdll.sh
@@ -7,9 +7,6 @@
 # library that is loaded into TCL in order to run SQLite.
 #
 make sqlite3.c
-make fts3amal.c
-cat fts3amal.c >>sqlite3.c
-cat fts3amal.c >>tclsqlite3.c
 PATH=$PATH:/opt/mingw/bin
 TCLDIR=/home/drh/tcltk/846/win/846win
 TCLSTUBLIB=$TCLDIR/libtcl84stub.a

diff --git a/publish_osx.sh b/publish_osx.sh
index 388f930dec865a1320ed93ea49541d6337d5a969..508b6239420002c16cfa4525d98e7c741bc39444 100644 (file)
--- a/publish_osx.sh
+++ b/publish_osx.sh
@@ -24,8 +24,6 @@ echo "VERSIONS: $VERS $VERSW"
 #
 make clean
 make sqlite3.c
-make fts3amal.c
-cat fts3amal.c >>sqlite3.c
 CFLAGS="-Os -DSQLITE_ENABLE_FTS3=1 -DSQLITE_THREADSAFE=0"
 NAME=sqlite3-$VERS-osx-x86.bin
 echo '***** '"COMPILING $NAME..."