Construct the .def files before calling dllwrap to build the .dll files.

Ticket #1951. (CVS 3383)

FossilOrigin-Name: e6e49a3811d4b26518026cc1692c654e8edbf741

diff --git a/manifest b/manifest
index 5dc4e78d4754518ff3f4fed57d8fc6d88bdcb975..7cd9d439f447ab2935318609364da539f3bb14c5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Miscellaneous\srestructuring\sand\scleanup\sbased\son\ssuggestions\sfrom\sshess.\s(CVS\s3382)
-D 2006-09-02T00:23:02
+C Construct\sthe\s.def\sfiles\sbefore\scalling\sdllwrap\sto\sbuild\sthe\s.dll\sfiles.\nTicket\s#1951.\s(CVS\s3383)
+D 2006-09-02T13:22:29
 F Makefile.in 659b63368cfbb95a224c9d2f2a9897802d96a4ea
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -34,7 +34,7 @@ F ext/fts1/tokenizer.h 0c53421b832366d20d720d21ea3e1f6e66a36ef9
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
 F main.mk d37d13489426c7a5277cd5944e7487120f9b4ece
-F mkdll.sh 7e2324f53504fa89121f10da79cbc709fdd7c596
+F mkdll.sh cbc7d92d02f9317a3d24ab55bb727275417260ca
 F mkopcodec.awk bd46ad001c98dfbab07b1713cb8e692fa0e5415d
 F mkopcodeh.awk cde995d269aa06c94adbf6455bea0acedb913fa5
 F mkso.sh 125868def279650a07d3f0f5e8476fecf99613fd
@@ -395,7 +395,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 1f6d79266a7f8d0e909e47d9858557e3f95407db
-R 9f47934fbcba4f9a0e1f8df18feb2204
-U adamd
-Z fba5a153a6d748159bc7d61ee5016242
+P e98b0cf292f6dc9deb6ae9b773c52b16867f7556
+R d30765d3536c7164bd9433463202374c
+U drh
+Z 9802cd201774000537322344bd2335b3

diff --git a/manifest.uuid b/manifest.uuid
index 55ec8643b0ca128fab41e85df7b092881f584014..909e9fd8a9b007254de71ccf446b62147500d8e3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e98b0cf292f6dc9deb6ae9b773c52b16867f7556
\ No newline at end of file
+e6e49a3811d4b26518026cc1692c654e8edbf741
\ No newline at end of file

diff --git a/mkdll.sh b/mkdll.sh
index 16299c2b72dedc33f49fccff9b72e3fd2bdfe3d0..56ecb7ce31567a37bc02b454a76216d7d8b26670 100644 (file)
--- a/mkdll.sh
+++ b/mkdll.sh
@@ -21,6 +21,12 @@ for i in *.c; do
   $CMD
 done
 echo 'EXPORTS' >tclsqlite3.def
+$NM *.o | grep ' T ' >temp1
+grep '_Init$' temp1 >temp2
+grep '_SafeInit$' temp1 >>temp2
+grep ' T _sqlite3_' temp1 >>temp2
+echo 'EXPORTS' >tclsqlite3.def
+sed 's/^.* T _//' temp2 | sort | uniq >>tclsqlite3.def
 i386-mingw32msvc-dllwrap \
      --def tclsqlite3.def -v --export-all \
      --driver-name i386-mingw32msvc-gcc \
@@ -29,13 +35,10 @@ i386-mingw32msvc-dllwrap \
      --target i386-mingw32 \
      -dllname tclsqlite3.dll -lmsvcrt *.o $TCLSTUBLIB
 #i386-mingw32msvc-strip tclsqlite3.dll
-$NM tclsqlite3.dll | grep ' T ' >temp1
-grep '_Init$' temp1 >temp2
-grep '_SafeInit$' temp1 >>temp2
-grep ' T _sqlite3_' temp1 >>temp2
-echo 'EXPORTS' >tclsqlite3.def
-sed 's/^.* T _//' temp2 | sort | uniq >>tclsqlite3.def
 rm tclsqlite.o
+$NM *.o | grep ' T ' >temp1
+echo 'EXPORTS' >sqlite3.def
+grep ' _sqlite3_' temp1 | sed 's/^.* _//' >>sqlite3.def
 i386-mingw32msvc-dllwrap \
      --def sqlite3.def -v --export-all \
      --driver-name i386-mingw32msvc-gcc \
@@ -44,7 +47,4 @@ i386-mingw32msvc-dllwrap \
      --target i386-mingw32 \
      -dllname sqlite3.dll -lmsvcrt *.o
 #i386-mingw32msvc-strip sqlite3.dll
-$NM sqlite3.dll | grep ' T ' >temp1
-echo 'EXPORTS' >sqlite3.def
-grep ' _sqlite3_' temp1 | sed 's/^.* _//' >>sqlite3.def
 cd ..