/ Check-in [d1f41089]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Bring makefiles and build scripts into alignment with the sessions branch. No changes to code.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: d1f41089aba075eef45fd696599e5d3a74c84d0c
User & Date: drh 2013-03-19 16:12:40
Context
2013-03-20
12:04
Fix text-to-numeric type casting so that it works correctly on UTF16 strings that contain characters where the LSB is numeric but the MSB is non-zero. Ticket [689137afb6da41] check-in: 5b22053f user: drh tags: trunk
2013-03-19
16:12
Bring makefiles and build scripts into alignment with the sessions branch. No changes to code. check-in: d1f41089 user: drh tags: trunk
2013-03-18
17:18
Clarifications to the documentation for the sqlite3_aggregate_context() API. Also, shorten an over-length source line in sqlite.h.in. check-in: 4fe2db1d user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.in.

   515    515   	rm tsrc/sqlite.h.in tsrc/parse.y
   516    516   	$(TCLSH_CMD) $(TOP)/tool/vdbe-compress.tcl <tsrc/vdbe.c >vdbe.new
   517    517   	mv vdbe.new tsrc/vdbe.c
   518    518   	touch .target_source
   519    519   
   520    520   sqlite3.c:	.target_source $(TOP)/tool/mksqlite3c.tcl
   521    521   	$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl
          522  +	cp tsrc/shell.c tsrc/sqlite3ext.h .
   522    523   
   523    524   tclsqlite3.c:	sqlite3.c
   524    525   	echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
   525    526   	cat sqlite3.c >>tclsqlite3.c
   526    527   	echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c
   527    528   	cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c
   528    529   
................................................................................
   874    875   #
   875    876   TESTFIXTURE_FLAGS  = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
   876    877   TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE 
   877    878   TESTFIXTURE_FLAGS += -DBUILD_sqlite
   878    879   
   879    880   TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
   880    881   TESTFIXTURE_SRC1 = sqlite3.c
   881         -TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
          882  +TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
          883  +TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
   882    884   
   883    885   testfixture$(TEXE):	$(TESTFIXTURE_SRC)
   884    886   	$(LTLINK) -DSQLITE_NO_SYNC=1 $(TEMP_STORE) $(TESTFIXTURE_FLAGS) \
   885    887   		-o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
   886    888   
   887    889   
   888    890   fulltest:	testfixture$(TEXE) sqlite3$(TEXE)

Changes to Makefile.msc.

   826    826   	del /Q tsrc\sqlite.h.in tsrc\parse.y
   827    827   	$(TCLSH_CMD) $(TOP)\tool\vdbe-compress.tcl < tsrc\vdbe.c > vdbe.new
   828    828   	move vdbe.new tsrc\vdbe.c
   829    829   	echo > .target_source
   830    830   
   831    831   sqlite3.c:	.target_source $(TOP)\tool\mksqlite3c.tcl
   832    832   	$(TCLSH_CMD) $(TOP)\tool\mksqlite3c.tcl
          833  +	copy tsrc\shell.c .
          834  +	copy tsrc\sqlite3ext.h .
   833    835   
   834    836   sqlite3-all.c:	sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
   835    837   	$(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl
   836    838   
   837    839   # Rule to build the amalgamation
   838    840   #
   839    841   sqlite3.lo:	sqlite3.c

Changes to main.mk.

   381    381   	rm tsrc/sqlite.h.in tsrc/parse.y
   382    382   	tclsh $(TOP)/tool/vdbe-compress.tcl <tsrc/vdbe.c >vdbe.new
   383    383   	mv vdbe.new tsrc/vdbe.c
   384    384   	touch target_source
   385    385   
   386    386   sqlite3.c:	target_source $(TOP)/tool/mksqlite3c.tcl
   387    387   	tclsh $(TOP)/tool/mksqlite3c.tcl
          388  +	cp tsrc/shell.c tsrc/sqlite3ext.h .
   388    389   	echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
   389    390   	cat sqlite3.c >>tclsqlite3.c
   390    391   	echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c
   391    392   	cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c
   392    393   
   393    394   sqlite3.c-debug:	target_source $(TOP)/tool/mksqlite3c.tcl
   394    395   	tclsh $(TOP)/tool/mksqlite3c.tcl --linemacros

Changes to tool/mksqlite3c.tcl.

    19     19   #
    20     20   #      tclsh mksqlite3c.tcl
    21     21   #
    22     22   # The amalgamated SQLite code will be written into sqlite3.c
    23     23   #
    24     24   
    25     25   # Begin by reading the "sqlite3.h" header file.  Extract the version number
    26         -# from in this file.  The versioon number is needed to generate the header
           26  +# from in this file.  The version number is needed to generate the header
    27     27   # comment of the amalgamation.
    28     28   #
    29     29   if {[lsearch $argv --nostatic]>=0} {
    30     30     set addstatic 0
    31     31   } else {
    32     32     set addstatic 1
    33     33   }

Changes to tool/mksqlite3h.tcl.

    64     64   #
    65     65   set varpattern {^[a-zA-Z][a-zA-Z_0-9 *]+sqlite3_[_a-zA-Z0-9]+(\[|;| =)}
    66     66   set declpattern {^ *[a-zA-Z][a-zA-Z_0-9 ]+ \**sqlite3_[_a-zA-Z0-9]+\(}
    67     67   
    68     68   # Force the output to use unix line endings, even on Windows.
    69     69   fconfigure stdout -translation lf
    70     70   
    71         -# Process the src/sqlite.h.in ext/rtree/sqlite3rtree.h files.
           71  +set filelist [subst {
           72  +  $TOP/src/sqlite.h.in
           73  +  $TOP/ext/rtree/sqlite3rtree.h
           74  +}]
           75  +
           76  +# Process the source files.
    72     77   #
    73         -foreach file [list $TOP/src/sqlite.h.in $TOP/ext/rtree/sqlite3rtree.h] {
           78  +foreach file $filelist {
    74     79     set in [open $file]
    75     80     while {![eof $in]} {
    76     81     
    77     82       set line [gets $in]
    78     83   
    79     84       # File sqlite3rtree.h contains a line "#include <sqlite3.h>". Omit this
    80     85       # line when copying sqlite3rtree.h into sqlite3.h.