Another attempt to fix the build process for TCL windows bindings. (CVS 4088)

FossilOrigin-Name: 1fd2a358d6361768981d0c7efbcf30b47c52a732

diff --git a/manifest b/manifest
index 66c23d272e76d5346aeb82cccdc72097f1a451cd..bf94ddbab0cd11be5595c9736d46e0cf0ceb7128 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bring\sthe\spager_datahash()\smacro\sinto\ssync\swith\sits\sfunction\sdefinition.\nTicket\s#2422.\s(CVS\s4087)
-D 2007-06-18T17:25:18
+C Another\sattempt\sto\sfix\sthe\sbuild\sprocess\sfor\sTCL\swindows\sbindings.\s(CVS\s4088)
+D 2007-06-18T17:44:16
 F Makefile.in b9971ab07868cf2b3209fe3bf8c52e7e25af4193
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -49,7 +49,7 @@ F ext/icu/icu.c daab19e2c5221685688ecff2bb75bf9e0eea361d
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 56abb507100ed2d4261f6dd1653dec3cf4066387
 F main.mk 02007ce4a5de0d4d6561207dcf839db9a3166935
-F mkdll.sh 7f07436d2966844757d1c20d69e81953741297af
+F mkdll.sh 37fa8a7412e51b5ab2bc6d4276135f022a0feffb
 F mkopcodec.awk bd46ad001c98dfbab07b1713cb8e692fa0e5415d
 F mkopcodeh.awk cde995d269aa06c94adbf6455bea0acedb913fa5
 F mkso.sh 24bde4c09e6fe80f718db3c31c068f45e13a2f2c
@@ -506,7 +506,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P c7be8b419fdfe6561331485f5f866610457e44ad
-R 860860c6c948060af4aca75438b38d78
+P ba967bbb62ccf29438db352c573773ae741d0daf
+R 422e5bb63646ce40accf856edaa2aad7
 U drh
-Z dc54e29e414be75fc5bd44a0f2d023fe
+Z 4920e177e4eb93acb0f85e3d895bd3c6

diff --git a/manifest.uuid b/manifest.uuid
index 9ced892a5f9c730496162db1b20f3bc04515498b..c8e74cffccae426f8f8994b6075b559516299666 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ba967bbb62ccf29438db352c573773ae741d0daf
\ No newline at end of file
+1fd2a358d6361768981d0c7efbcf30b47c52a732
\ No newline at end of file

diff --git a/mkdll.sh b/mkdll.sh
index ba8dd5532fbbd0f3c319d3943f3c586dcf9f5ad3..e1e6d988188ff2dcaeb5d76690dcf1962140c16d 100644 (file)
--- a/mkdll.sh
+++ b/mkdll.sh
@@ -16,11 +16,11 @@ NM="i386-mingw32msvc-nm"
 CMD="$CC -c sqlite3.c"
 echo $CMD
 $CMD
-CMD="$CC -c tsrc/tclsqlite.c -o tclsqlite.o"
+CMD="$CC -c tclsqlite3.c"
 echo $CMD
 $CMD
 echo 'EXPORTS' >tclsqlite3.def
-$NM sqlite3.o tclsqlite.o | grep ' T ' >temp1
+$NM tclsqlite3.o | grep ' T ' >temp1
 grep '_Init$' temp1 >temp2
 grep '_SafeInit$' temp1 >>temp2
 grep ' T _sqlite3_' temp1 >>temp2
@@ -32,7 +32,7 @@ i386-mingw32msvc-dllwrap \
      --dlltool-name i386-mingw32msvc-dlltool \
      --as i386-mingw32msvc-as \
      --target i386-mingw32 \
-     -dllname tclsqlite3.dll -lmsvcrt tclsqlite.o sqlite3.o $TCLSTUBLIB
+     -dllname tclsqlite3.dll -lmsvcrt tclsqlite3.o $TCLSTUBLIB
 $NM sqlite3.o | grep ' T ' >temp1
 echo 'EXPORTS' >sqlite3.def
 grep ' _sqlite3_' temp1 | sed 's/^.* _//' >>sqlite3.def
@@ -42,4 +42,4 @@ i386-mingw32msvc-dllwrap \
      --dlltool-name i386-mingw32msvc-dlltool \
      --as i386-mingw32msvc-as \
      --target i386-mingw32 \
-     -dllname tclsqlite3.dll -lmsvcrt sqlite3.o
+     -dllname sqlite3.dll -lmsvcrt sqlite3.o