Fix for ticket 91: Modify the "publish.sh" script to use the new mingw

cross-compiler installed on the development platform. (CVS 657)

FossilOrigin-Name: 3cac283de4939538f09cd11e2cbdc84e9a9602f2

diff --git a/manifest b/manifest
index f4fb0fada529f8a0200decceddcb79f45dd880c3..c5f929fed1817dd06d8e219e632879a04dd0aeee 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s2.5.4\s(CVS\s656)
-D 2002-07-01T12:35:51
+C Fix\sfor\sticket\s91:\sModify\sthe\s"publish.sh"\sscript\sto\suse\sthe\snew\smingw\ncross-compiler\sinstalled\son\sthe\sdevelopment\splatform.\s(CVS\s657)
+D 2002-07-02T11:55:33
 F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c
 F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -14,7 +14,7 @@ F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F libtool c56e618713c9510a103bda6b95f3ea3900dcacd6
 F ltmain.sh e9ed72eb1d690f447c13945eaf69e28af531eda1
-F publish.sh d115bd49631e3bb0d799e7dc1da51f9866d67647
+F publish.sh 1a04b9aa0d9c9661e338268343476ed0851c5778
 F spec.template 238f7db425a78dc1bb7682e56e3834c7270a3f5e
 F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
 F src/TODO af7f3cab0228e34149cf98e073aa83d45878e7e6
@@ -137,7 +137,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P f9d77140aed301775b2b8dd88d464cc38edfe192
-R 261767fcc4e66f8e3e7a27a84ebcaa52
+P f7159fde6b8692f91fa8a3c928dc219d0f3d8884
+R 3d0d0f4fa9a98d753eaa2c7acc814e2d
 U drh
-Z 1848cebc2c040461ee0a5dad10250356
+Z 549a099bb6b0ce21b34627ac400d3d9b

diff --git a/manifest.uuid b/manifest.uuid
index 9690a31e6fdb95c17c38a175ff4e332f43a632bd..575b4554937c8e200515ae0faefaf98a925a58cb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f7159fde6b8692f91fa8a3c928dc219d0f3d8884
\ No newline at end of file
+3cac283de4939538f09cd11e2cbdc84e9a9602f2
\ No newline at end of file

diff --git a/publish.sh b/publish.sh
index 545a8b2314e801181262ee9bf4524fb19d72fcee..e69288046c61e88c2f6a5ed059d62867e405f136 100644 (file)
--- a/publish.sh
+++ b/publish.sh
@@ -57,7 +57,7 @@ TCLDIR=/home/drh/tcltk/8.2win
 TCLSTUBLIB=$TCLDIR/tclstub82.a
 PATH=$PATH:/opt/mingw/bin
 OPTS='-DUSE_TCL_STUBS=1 -DNDEBUG=1 -DTHREADSAFE=1'
-CC="i386-mingw32-gcc -O2 $OPTS -I. -I$TCLDIR"
+CC="i386-mingw32msvc-gcc -O2 $OPTS -I. -I$TCLDIR"
 rm shell.c
 for i in *.c; do
   CMD="$CC -c $i"
@@ -67,14 +67,14 @@ done
 echo 'EXPORTS' >tclsqlite.def
 echo 'Tclsqlite_Init' >>tclsqlite.def
 echo 'Sqlite_Init' >>tclsqlite.def
-i386-mingw32-dllwrap \
+i386-mingw32msvc-dllwrap \
      --def tclsqlite.def -v --export-all \
-     --driver-name i386-mingw32-gcc \
-     --dlltool-name i386-mingw32-dlltool \
-     --as i386-mingw32-as \
+     --driver-name i386-mingw32msvc-gcc \
+     --dlltool-name i386-mingw32msvc-dlltool \
+     --as i386-mingw32msvc-as \
      --target i386-mingw32 \
      -dllname tclsqlite.dll -lmsvcrt *.o $TCLSTUBLIB
-i386-mingw32-strip tclsqlite.dll
+i386-mingw32msvc-strip tclsqlite.dll
 mv tclsqlite.dll ..
 rm tclsqlite.o
 cat >sqlite.def <<\END_OF_FILE
@@ -104,14 +104,14 @@ sqliteMalloc
 sqliteFree
 sqliteRealloc
 END_OF_FILE
-i386-mingw32-dllwrap \
+i386-mingw32msvc-dllwrap \
      --def sqlite.def -v --export-all \
-     --driver-name i386-mingw32-gcc \
-     --dlltool-name i386-mingw32-dlltool \
-     --as i386-mingw32-as \
+     --driver-name i386-mingw32msvc-gcc \
+     --dlltool-name i386-mingw32msvc-dlltool \
+     --as i386-mingw32msvc-as \
      --target i386-mingw32 \
      -dllname sqlite.dll -lmsvcrt *.o
-i386-mingw32-strip sqlite.dll
+i386-mingw32msvc-strip sqlite.dll
 mv sqlite.dll sqlite.def ..
 cd ..
 rm -f tclsqlite.zip sqlitedll.zip
@@ -124,7 +124,7 @@ make target_source
 cd tsrc
 rm tclsqlite.c
 OPTS='-DSTATIC_BUILD=1 -DNDEBUG=1'
-i386-mingw32-gcc -O2 $OPTS -I. -I$TCLDIR *.c -o sqlite.exe
+i386-mingw32msvc-gcc -O2 $OPTS -I. -I$TCLDIR *.c -o sqlite.exe
 mv sqlite.exe ..
 cd ..
 rm -f sqlite.zip