Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Disable the cursors. "make install" now builds and installs a TCL package for SQLite if TCL is installed on the system. (CVS 2153) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
d75014c299496a02f6850545beb0ab66 |
User & Date: | drh 2004-11-27 15:52:16.000 |
Context
2004-12-02
| ||
20:17 | Get the build of sqlite3_analyzer working with Makefile.in. (CVS 2154) (check-in: f7415a0d64 user: drh tags: trunk) | |
2004-11-27
| ||
15:52 | Disable the cursors. "make install" now builds and installs a TCL package for SQLite if TCL is installed on the system. (CVS 2153) (check-in: d75014c299 user: drh tags: trunk) | |
2004-11-25
| ||
13:50 | The configure script now automatically detects tclConfig.sh and builds the Tcl extension only if tclConfig.sh is present. The Tcl extension can be disabled using --disable-tcl. (CVS 2152) (check-in: 12424bef77 user: drh tags: trunk) | |
Changes
Changes to Makefile.in.
︙ | ︙ | |||
24 25 26 27 28 29 30 | # C Compile and options for use in building executables that # will run on the target platform. (BCC and TCC are usually the # same unless your are cross-compiling.) # TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src -DNDEBUG | < < < < < < < < < < < < < < | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | # C Compile and options for use in building executables that # will run on the target platform. (BCC and TCC are usually the # same unless your are cross-compiling.) # TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src -DNDEBUG # Compiler options needed for programs that use the TCL library. # TCC += @TCL_INCLUDE_SPEC@ # The library that programs using TCL must link against. # LIBTCL = @TCL_LIB_SPEC@ @TCL_LIBS@ |
︙ | ︙ | |||
69 70 71 72 73 74 75 76 77 78 79 80 81 | # Flags controlling use of the in memory btree implementation # # TEMP_STORE is 0 to force temporary tables to be in a file, 1 to # default to file, 2 to default to memory, and 3 to force temporary # tables to always be in memory. # TEMP_STORE = -DTEMP_STORE=@TEMP_STORE@ # Filename extensions # BEXE = @BUILD_EXEEXT@ TEXE = @TARGET_EXEEXT@ | > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | # Flags controlling use of the in memory btree implementation # # TEMP_STORE is 0 to force temporary tables to be in a file, 1 to # default to file, 2 to default to memory, and 3 to force temporary # tables to always be in memory. # TEMP_STORE = -DTEMP_STORE=@TEMP_STORE@ # Version numbers and release number for the SQLite being compiled. # VERSION = @VERSION@ RELEASE = @RELEASE@ # Filename extensions # BEXE = @BUILD_EXEEXT@ TEXE = @TARGET_EXEEXT@ # The following variable is "1" if the configure script was able to locate # the tclConfig.sh file. It is an empty string otherwise. When this # variable is "1", the TCL extension library (libtclsqlite3.so) is built # and installed. # HAVE_TCL = @HAVE_TCL@ # The suffix used on shared libraries. Ex: ".dll", ".so", ".dylib" # SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@ # The directory into which to store package information for # Some standard variables and programs # prefix = @prefix@ exec_prefix = @exec_prefix@ libdir = @libdir@ INSTALL = @INSTALL@ LIBTOOL = ./libtool ALLOWRELEASE = @ALLOWRELEASE@ # libtool compile/link/install LTCOMPILE = $(LIBTOOL) --mode=compile $(TCC) LTLINK = $(LIBTOOL) --mode=link $(TCC) LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) # You should not have to change anything below this line ############################################################################### OPTS += -DSQLITE_OMIT_CURSOR # Cursors do not work at this time TCC += -DSQLITE_OMIT_CURSOR # Object files for the SQLite library. # LIBOBJ = attach.lo auth.lo btree.lo build.lo cursor.lo date.lo \ delete.lo expr.lo func.lo hash.lo insert.lo \ main.lo opcodes.lo os_mac.lo os_unix.lo os_win.lo \ pager.lo parse.lo pragma.lo printf.lo random.lo \ |
︙ | ︙ | |||
202 203 204 205 206 207 208 | # last_change: $(SRC) cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \ | awk '{print $$5,$$6}' >last_change libsqlite3.la: $(LIBOBJ) $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ | | | | 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | # last_change: $(SRC) cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \ | awk '{print $$5,$$6}' >last_change libsqlite3.la: $(LIBOBJ) $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8" libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \ -rpath $(libdir)/sqlite \ -version-info "8:6:8" sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \ -o sqlite3 $(TOP)/src/shell.c libsqlite3.la $(LIBREADLINE) |
︙ | ︙ | |||
335 336 337 338 339 340 341 | random.lo: $(TOP)/src/random.c $(HDR) $(LTCOMPILE) -c $(TOP)/src/random.c select.lo: $(TOP)/src/select.c $(HDR) $(LTCOMPILE) -c $(TOP)/src/select.c sqlite3.h: $(TOP)/src/sqlite.h.in | < | | 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 | random.lo: $(TOP)/src/random.c $(HDR) $(LTCOMPILE) -c $(TOP)/src/random.c select.lo: $(TOP)/src/select.c $(HDR) $(LTCOMPILE) -c $(TOP)/src/select.c sqlite3.h: $(TOP)/src/sqlite.h.in sed -e s/--VERS--/$(RELEASE)/ $(TOP)/src/sqlite.h.in >sqlite3.h table.lo: $(TOP)/src/table.c $(HDR) $(LTCOMPILE) -c $(TOP)/src/table.c tclsqlite.lo: $(TOP)/src/tclsqlite.c $(HDR) $(LTCOMPILE) -c $(TOP)/src/tclsqlite.c |
︙ | ︙ | |||
568 569 570 571 572 573 574 | vdbe.html \ version3.html doc: common.tcl $(DOC) mkdir -p doc mv $(DOC) doc | | > > > | 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 | vdbe.html \ version3.html doc: common.tcl $(DOC) mkdir -p doc mv $(DOC) doc install: sqlite3 libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install} $(INSTALL) -d $(DESTDIR)$(libdir) $(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir) $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin $(LTINSTALL) sqlite3 $(DESTDIR)$(exec_prefix)/bin $(INSTALL) -d $(DESTDIR)$(prefix)/include $(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig; tcl_install: libtclsqlite3.la tclsh $(TOP)/tclinstaller.tcl $(VERSION) clean: rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la rm -f sqlite3.h opcodes.* rm -rf .libs .deps rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz rm -f mkkeywordhash$(BEXE) keywordhash.c rm -f $(PUBLISH) |
︙ | ︙ |
Changes to configure.
︙ | ︙ | |||
459 460 461 462 463 464 465 | # include <stdint.h> # endif #endif #if HAVE_UNISTD_H # include <unistd.h> #endif" | | | 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 | # include <stdint.h> # endif #endif #if HAVE_UNISTD_H # include <unistd.h> #endif" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA program_prefix VERSION RELEASE BUILD_CC BUILD_CFLAGS BUILD_LIBS TARGET_CC TARGET_CFLAGS TARGET_LINK TARGET_LFLAGS TARGET_RANLIB TARGET_AR THREADSAFE TARGET_THREAD_LIB ALLOWRELEASE TEMP_STORE BUILD_EXEEXT OS_UNIX OS_WIN TARGET_EXEEXT TARGET_LIBS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIBS TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC HAVE_TCL TARGET_READLINE_LIBS TARGET_READLINE_INC TARGET_HAVE_READLINE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. ac_init_help= ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. |
︙ | ︙ | |||
1491 1492 1493 1494 1495 1496 1497 | # The following RCS revision string applies to configure.in | | | 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 | # The following RCS revision string applies to configure.in # $Revision: 1.27 $ ######### # Programs needed # # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" |
︙ | ︙ | |||
18418 18419 18420 18421 18422 18423 18424 | # Set up an appropriate program prefix # if test "$program_prefix" = "NONE"; then program_prefix="" fi | < | | | > > | 18418 18419 18420 18421 18422 18423 18424 18425 18426 18427 18428 18429 18430 18431 18432 18433 18434 18435 18436 | # Set up an appropriate program prefix # if test "$program_prefix" = "NONE"; then program_prefix="" fi VERSION=`cat $srcdir/VERSION | sed 's/^\([0-9]*\.*[0-9]*\).*/\1/'` echo "Version set to $VERSION" RELEASE=`cat $srcdir/VERSION` echo "Release set to $RELEASE" ######### # Check to see if the --with-hints=FILE option is used. If there is none, # then check for a files named "$host.hints" and ../$hosts.hints where # $host is the hostname of the build system. If still no hints are # found, try looking in $system.hints and ../$system.hints where |
︙ | ︙ | |||
20991 20992 20993 20994 20995 20996 20997 20998 20999 21000 21001 21002 21003 21004 | s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@program_prefix@,$program_prefix,;t t s,@VERSION@,$VERSION,;t t s,@BUILD_CC@,$BUILD_CC,;t t s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t s,@BUILD_LIBS@,$BUILD_LIBS,;t t s,@TARGET_CC@,$TARGET_CC,;t t s,@TARGET_CFLAGS@,$TARGET_CFLAGS,;t t s,@TARGET_LINK@,$TARGET_LINK,;t t s,@TARGET_LFLAGS@,$TARGET_LFLAGS,;t t | > | 20992 20993 20994 20995 20996 20997 20998 20999 21000 21001 21002 21003 21004 21005 21006 | s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@program_prefix@,$program_prefix,;t t s,@VERSION@,$VERSION,;t t s,@RELEASE@,$RELEASE,;t t s,@BUILD_CC@,$BUILD_CC,;t t s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t s,@BUILD_LIBS@,$BUILD_LIBS,;t t s,@TARGET_CC@,$TARGET_CC,;t t s,@TARGET_CFLAGS@,$TARGET_CFLAGS,;t t s,@TARGET_LINK@,$TARGET_LINK,;t t s,@TARGET_LFLAGS@,$TARGET_LFLAGS,;t t |
︙ | ︙ |
Changes to configure.ac.
1 | # | < < < < < | 1 2 3 4 5 6 7 8 | # # The build process allows for using a cross-compiler. But the default # action is to target the same platform that we are running on. The # configure script needs to discover the following properties of the # build and target systems: # # srcdir # |
︙ | ︙ | |||
61 62 63 64 65 66 67 | # Switches that the target compiler needs to turn C source files # into *.o files. Do not include TARGET_TCL_INC in this list. # Makefiles might add additional switches such as "-I.". # # TCL_* # # Lots of values are read in from the tclConfig.sh script, | | > | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | # Switches that the target compiler needs to turn C source files # into *.o files. Do not include TARGET_TCL_INC in this list. # Makefiles might add additional switches such as "-I.". # # TCL_* # # Lots of values are read in from the tclConfig.sh script, # if that script is available. This values are used for # constructing and installing the TCL extension. # # TARGET_READLINE_LIBS # # This is the library directives passed to the target linker # that cause the executable to link against the readline library. # This might be a switch like "-lreadline" or pathnames of library # file like "../../src/libreadline.a". |
︙ | ︙ | |||
116 117 118 119 120 121 122 | # the corresponding code. # AC_INIT(src/sqlite.h.in) dnl Put the RCS revision string after AC_INIT so that it will also dnl show in in configure. # The following RCS revision string applies to configure.in | | < | | < > > > | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | # the corresponding code. # AC_INIT(src/sqlite.h.in) dnl Put the RCS revision string after AC_INIT so that it will also dnl show in in configure. # The following RCS revision string applies to configure.in # $Revision: 1.13 $ ######### # Programs needed # AC_PROG_LIBTOOL AC_PROG_INSTALL ######### # Set up an appropriate program prefix # if test "$program_prefix" = "NONE"; then program_prefix="" fi AC_SUBST(program_prefix) VERSION=[`cat $srcdir/VERSION | sed 's/^\([0-9]*\.*[0-9]*\).*/\1/'`] echo "Version set to $VERSION" AC_SUBST(VERSION) RELEASE=`cat $srcdir/VERSION` echo "Release set to $RELEASE" AC_SUBST(RELEASE) ######### # Check to see if the --with-hints=FILE option is used. If there is none, # then check for a files named "$host.hints" and ../$hosts.hints where # $host is the hostname of the build system. If still no hints are # found, try looking in $system.hints and ../$system.hints where # $system is the result of uname -s. |
︙ | ︙ |
Added tclinstaller.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | # This script attempts to install SQLite3 so that it can be used # by TCL. Invoke this script with single argument which is the # version number of SQLite. Example: # # tclsh tclinstaller.tcl 3.0 # set VERSION [lindex $argv 0] set LIBFILE .libs/libtclsqlite3[info sharedlibextension] set LIBDIR [lindex $auto_path 0] set LIBNAME [file tail $LIBFILE] set LIB $LIBDIR/sqlite3/$LIBNAME file delete -force $LIBDIR/sqlite3 file mkdir $LIBDIR/sqlite3 set fd [open $LIBDIR/sqlite3/pkgIndex.tcl w] puts $fd "package ifneeded sqlite3 $VERSION \[list load $LIB sqlite3\]" close $fd # We cannot use [file copy] because that will just make a copy of # a symbolic link. We have to open and copy the file for ourselves. # set in [open $LIBFILE] fconfigure $in -translation binary set out [open $LIB w] fconfigure $out -translation binary puts -nonewline $out [read $in] close $in close $out |