Adjust the amalgamation-tarball build process so that it includes the

MSVC makefile and the sqlite3.rc resource file.

FossilOrigin-Name: e420f3dc93a0e3364f0773950b7a125f5221a109
This commit is contained in:
drh 2016-01-23 20:09:30 +00:00
parent 06cee48728
commit ac779bcbe9
5 changed files with 23 additions and 19 deletions

View File

@ -14,7 +14,7 @@ sqlite3_CFLAGS = $(AM_CFLAGS)
include_HEADERS = sqlite3.h sqlite3ext.h
EXTRA_DIST = sqlite3.1 tea
EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc

View File

@ -1,4 +1,3 @@
This package contains:
* the SQLite library amalgamation (single file) source code distribution,
@ -6,6 +5,7 @@ This package contains:
* the sqlite3.h and sqlite3ext.h header files required to link programs
and sqlite extensions against the installed libary.
* autoconf/automake installation infrastucture.
* a Makefile.msc and sqlite3.rc for Microsoft Visual C++
The generic installation instructions for autoconf/automake are found
in the INSTALL file.
@ -30,3 +30,6 @@ example:
$ CFLAGS="-Os -DSQLITE_OMIT_TRIGGERS" ./configure
To compile for Windows using Microsoft Visual C++:
$ nmake /f Makefile.msc FOR_WIN10=1

View File

@ -1,5 +1,5 @@
C Improved\scomments\son\sthe\stransformation\sscript\sand\son\sthe\sgenerated\sMakefile.
D 2016-01-23T19:47:00.459
C Adjust\sthe\samalgamation-tarball\sbuild\sprocess\sso\sthat\sit\sincludes\sthe\nMSVC\smakefile\sand\sthe\ssqlite3.rc\sresource\sfile.
D 2016-01-23T20:09:30.205
F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.min.msc cbbc5e37bfe74583cce7c2585319620b7516e6ed
@ -11,9 +11,9 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
F autoconf/Makefile.am 089e5ecdb5761e64ea1013ded02feb4d8b29927d
F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38
F autoconf/Makefile.am 1c1657650775960804945dc392e14d9e43c5ed84
F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
F autoconf/README.txt c9265657b6ca8c4de1e148e8c0c4c29d60ec860c w autoconf/README
F autoconf/configure.ac 7b1ea0dcaf49fafba262ce4b0ee8cb3281b555d1
F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd
F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
@ -1377,7 +1377,7 @@ F tool/lemon.c 799e73e19a33b8dd7767a7fa34618ed2a9c2397d
F tool/lempar.c 3ec1463a034b37d87d782be5f6b8b10a3b1ecbe7
F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6
F tool/mkautoconfamal.sh 5a5441280b509d2bb3bdc71bfb63781b0d570373
F tool/mkautoconfamal.sh add1d703074e7edb2d8423441c7e245271c5c8cb
F tool/mkkeywordhash.c 06ec0b78bd4fa68c12d90ef2bdfe76b039133ff8
F tool/mkmsvcmin.tcl a62d398d1304b36dd41b69e655d875728fd9d509
F tool/mkopcodec.tcl edde8adc42621b5e598127f8cdc6d52cfe21f52b
@ -1421,7 +1421,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 949aa614e1401f6ab61cbb2e0469c60d764e6880
R 52e20c37d886e0ca572199fede1eb984
P c6e633ab73812fe38f3e969f1652f1b5759096e4
R d5543de9eede26dd90664aa004eef406
U drh
Z 5f79d302a18d7c201b23ed73e75ff6ef
Z 98c1051b769380596fbf89ccef90cc39

View File

@ -1 +1 @@
c6e633ab73812fe38f3e969f1652f1b5759096e4
e420f3dc93a0e3364f0773950b7a125f5221a109

View File

@ -34,14 +34,15 @@ set -e
ARTIFACT=`printf "3%.2d%.2d%.2d" $xx $yy $zz`
rm -rf $TMPSPACE
cp -R $TOP/autoconf $TMPSPACE
cp sqlite3.c $TMPSPACE
cp sqlite3.h $TMPSPACE
cp sqlite3ext.h $TMPSPACE
cp $TOP/sqlite3.1 $TMPSPACE
cp $TOP/sqlite3.pc.in $TMPSPACE
cp $TOP/src/shell.c $TMPSPACE
cp -R $TOP/autoconf $TMPSPACE
cp sqlite3.c $TMPSPACE
cp sqlite3.h $TMPSPACE
cp sqlite3ext.h $TMPSPACE
cp $TOP/sqlite3.1 $TMPSPACE
cp $TOP/sqlite3.pc.in $TMPSPACE
cp $TOP/src/shell.c $TMPSPACE
cp $TOP/Makefile.min.msc $TMPSPACE/Makefile.msc
cp $TOP/src/sqlite3.rc $TMPSPACE
cat $TMPSPACE/configure.ac |
sed "s/--SQLITE-VERSION--/$VERSION/" > $TMPSPACE/tmp