tdbc::sqlite3

Check-in [58de4fac9c]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to tclconference@googlegroups.com
or submit via the online form by Sep 9.

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

Overview
Comment:Use INSTALL_* and new DIST_INSTALL_* macros to make dist. Align with latest TEA.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:58de4fac9c95a8f783b1be580c0508564eff69b31d3f2483e5c9c85c28a2def4
User & Date: stu 2018-01-04 07:23:50
Context
2018-01-05
06:43
Merge stu-pkgIndex. Companion to https://core.tcl.tk/tdbc/info/2386d26cfb8a34c3. check-in: e095b00bdd user: stu tags: trunk
06:42
Merge trunk. Closed-Leaf check-in: d2ab795efa user: stu tags: stu-pkgIndex
2018-01-04
07:23
Use INSTALL_* and new DIST_INSTALL_* macros to make dist. Align with latest TEA. check-in: 58de4fac9c user: stu tags: trunk
2017-12-22
13:42
Convert all win/*.vc files to crlf style check-in: 24cec214c3 user: jan.nijtmans tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.in.

     7      7   #	replaced in the actual Makefile.
     8      8   #
     9      9   # Copyright (c) 1999 Scriptics Corporation.
    10     10   # Copyright (c) 2002-2005 ActiveState Corporation.
    11     11   #
    12     12   # See the file "license.terms" for information on usage and redistribution
    13     13   # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    14         -#
    15         -# RCS: @(#) $Id: Makefile.in,v 1.64 2007/10/23 22:08:06 hobbs Exp $
    16     14   
    17     15   #========================================================================
    18     16   # Nothing of the variables below this line should need to be changed.
    19     17   # Please check the TARGETS section below to make sure the make targets
    20     18   # are correct.
    21     19   #========================================================================
    22     20   
................................................................................
    51     49   srcdir		= @srcdir@
    52     50   prefix		= @prefix@
    53     51   exec_prefix	= @exec_prefix@
    54     52   
    55     53   bindir		= @bindir@
    56     54   libdir		= @libdir@
    57     55   includedir	= @includedir@
    58         -datarootdir     = @datarootdir@
           56  +datarootdir	= @datarootdir@
    59     57   datadir		= @datadir@
    60     58   mandir		= @mandir@
    61     59   
    62     60   DESTDIR		=
    63     61   
    64     62   PKG_DIR		= $(PACKAGE_NAME)-$(PACKAGE_VERSION)
    65     63   pkgdatadir	= $(datadir)/$(PKG_DIR)
................................................................................
    68     66   tmdir		= $(libdir)/tcl$(TCL_MAJOR_VERSION)/$(TCL_VERSION)
    69     67   pkgslash	= `echo $(PACKAGE_NAME) | sed s=tdbc=tdbc/=`
    70     68   pkgtmdir	= $(tmdir)/tdbc
    71     69   pkgtmfile	= $(tmdir)/$(pkgslash)-$(PACKAGE_VERSION).tm
    72     70   
    73     71   top_builddir	= .
    74     72   
    75         -INSTALL_OPTIONS =
    76         -INSTALL         = $(SHELL) $(srcdir)/tclconfig/install-sh -c ${INSTALL_OPTIONS}
    77         -INSTALL_DATA_DIR = ${INSTALL} -d -m 755
    78         -INSTALL_PROGRAM = ${INSTALL} -m 555
    79         -INSTALL_DATA    = ${INSTALL} -m 444
    80         -INSTALL_SCRIPT  = ${INSTALL_PROGRAM}
    81         -INSTALL_LIBRARY = ${INSTALL_DATA}
           73  +INSTALL_OPTIONS	=
           74  +INSTALL		= @INSTALL@ $(INSTALL_OPTIONS)
           75  +INSTALL_DATA_DIR = @INSTALL_DATA_DIR@
           76  +INSTALL_DATA	= @INSTALL_DATA@
           77  +INSTALL_PROGRAM	= @INSTALL_PROGRAM@
           78  +INSTALL_SCRIPT	= @INSTALL_SCRIPT@
           79  +INSTALL_LIBRARY	= @INSTALL_LIBRARY@
    82     80   
    83     81   TCL_VERSION	= @TCL_VERSION@
    84     82   TCL_MAJOR_VERSION = @TCL_MAJOR_VERSION@
    85     83   
    86     84   PACKAGE_NAME	= @PACKAGE_NAME@
    87     85   PACKAGE_VERSION	= @PACKAGE_VERSION@
    88     86   #TCL_DEFS	= @TCL_DEFS@
................................................................................
   110    108   TCLLIBPATH	= $(top_builddir)
   111    109   TCLSH_ENV	= TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \
   112    110   		  TDBC_LIBRARY=`@CYGPATH@ @tdbc_LIBRARY_PATH@`
   113    111   PKG_ENV		= PATH="$(EXTRA_PATH):$(PATH)" \
   114    112   		  TCLLIBPATH="$(TCLLIBPATH)"
   115    113   
   116    114   TCLSH_PROG	= @TCLSH_PROG@
   117         -TCLSH   	= $(PKG_ENV) $(TCLSH_ENV) $(TCLSH_PROG)
          115  +TCLSH		= $(PKG_ENV) $(TCLSH_ENV) $(TCLSH_PROG)
   118    116   
   119    117   #WISH_ENV	= TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library`
   120    118   #WISH_PROG	= @WISH_PROG@
   121         -#WISH   	= $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG)
          119  +#WISH		= $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG)
   122    120   
   123    121   SHARED_BUILD	= @SHARED_BUILD@
   124    122   
   125    123   INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@
   126    124   
   127    125   # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
   128    126   CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
................................................................................
   130    128   
   131    129   #========================================================================
   132    130   # Start of user-definable TARGETS section
   133    131   #========================================================================
   134    132   
   135    133   #========================================================================
   136    134   # TEA TARGETS.  Please note that the "libraries:" target refers to platform
   137         -# independent files, and the "binaries:" target inclues executable programs and
          135  +# independent files, and the "binaries:" target includes executable programs and
   138    136   # platform-dependent libraries.  Modify these targets so that they install
   139    137   # the various pieces of your package.  The make and install rules
   140    138   # for the BINARIES that you specified above have already been done.
   141    139   #========================================================================
   142    140   
   143    141   all: libraries doc
   144    142   
................................................................................
   202    200   #========================================================================
   203    201   
   204    202   #COMPRESS	= tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
   205    203   COMPRESS	= tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
   206    204   DIST_ROOT	= /tmp/dist
   207    205   DIST_DIR	= $(DIST_ROOT)/$(PKG_DIR)
   208    206   
          207  +DIST_INSTALL_DATA	= CPPROG='cp -p' $(INSTALL) -m 644
          208  +DIST_INSTALL_SCRIPT	= CPPROG='cp -p' $(INSTALL) -m 755
          209  +
   209    210   dist-clean:
   210    211   	rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*
   211    212   
   212    213   dist: dist-clean
   213         -	mkdir -p $(DIST_DIR)
   214         -	cp -p $(srcdir)/ChangeLog $(srcdir)/README* $(srcdir)/license* \
   215         -		$(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/*.in \
   216         -		$(srcdir)/configure.ac $(DIST_DIR)/
   217         -	chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4
   218         -	chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.ac
          214  +	$(INSTALL_DATA_DIR) $(DIST_DIR)
          215  +	$(DIST_INSTALL_DATA) $(srcdir)/license.terms \
          216  +		$(srcdir)/ChangeLog $(srcdir)/README \
          217  +		$(srcdir)/aclocal.m4 $(srcdir)/configure.ac \
          218  +		$(srcdir)/Makefile.in $(srcdir)/pkgIndex.tcl.in \
          219  +		$(DIST_DIR)/
          220  +	$(DIST_INSTALL_SCRIPT) $(srcdir)/configure $(DIST_DIR)/
   219    221   
   220    222   	for i in $(srcdir)/*.[ch]; do \
   221    223   	    if [ -f $$i ]; then \
   222         -		cp -p $$i $(DIST_DIR)/ ; \
          224  +		$(DIST_INSTALL_DATA) $$i $(DIST_DIR)/ ; \
   223    225   	    fi; \
   224    226   	done;
   225    227   
   226         -	mkdir $(DIST_DIR)/tclconfig
   227         -	cp $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \
          228  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig
          229  +	$(DIST_INSTALL_DATA) $(srcdir)/tclconfig/README.txt \
          230  +		$(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \
   228    231   		$(DIST_DIR)/tclconfig/
   229         -	chmod 664 $(DIST_DIR)/tclconfig/tcl.m4
   230         -	chmod +x $(DIST_DIR)/tclconfig/install-sh
   231    232   
   232         -	mkdir $(DIST_DIR)/doc
   233         -	cp -p $(srcdir)/doc/tdbc_sqlite3.n $(DIST_DIR)/doc/
          233  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/doc
          234  +	$(DIST_INSTALL_DATA) $(srcdir)/doc/tdbc_sqlite3.n $(DIST_DIR)/doc/
   234    235   
   235         -	mkdir $(DIST_DIR)/library
   236         -	cp -p $(srcdir)/library/tdbcsqlite3.tcl $(DIST_DIR)/library/
          236  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/library
          237  +	$(DIST_INSTALL_DATA) $(srcdir)/library/tdbcsqlite3.tcl $(DIST_DIR)/library/
   237    238   
   238         -	mkdir $(DIST_DIR)/tests
   239         -	cp -p $(srcdir)/tests/all.tcl $(srcdir)/tests/tdbcsqlite3.test \
          239  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/tests
          240  +	$(DIST_INSTALL_DATA) $(srcdir)/tests/all.tcl $(srcdir)/tests/tdbcsqlite3.test \
   240    241   		$(DIST_DIR)/tests/
   241    242   
   242         -	mkdir $(DIST_DIR)/win
   243         -	cp -p $(srcdir)/win/makefile.vc $(srcdir)/win/nmakehlp.c \
          243  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/win
          244  +	$(DIST_INSTALL_DATA) $(srcdir)/win/makefile.vc $(srcdir)/win/nmakehlp.c \
   244    245   		$(srcdir)/win/targets.vc $(srcdir)/win/rules-ext.vc \
   245    246   		$(srcdir)/win/rules.vc $(DIST_DIR)/win/
   246    247   
   247    248   	(cd $(DIST_ROOT); $(COMPRESS);)
   248    249   
   249    250   #========================================================================
   250    251   # End of user-definable section
   251    252   #========================================================================
   252    253   
   253    254   #========================================================================
   254    255   # Don't modify the file to clean here.  Instead, set the "CLEANFILES"
   255         -# variable in configure.in
          256  +# variable in configure.ac
   256    257   #========================================================================
   257    258   
   258    259   clean:
   259    260   	-rm -f *.core *.core
   260    261   	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
   261    262   
   262    263   distclean: clean

Changes to configure.

   629    629   PKG_HEADERS
   630    630   PKG_TCL_SOURCES
   631    631   PKG_STUB_OBJECTS
   632    632   PKG_STUB_SOURCES
   633    633   PKG_STUB_LIB_FILE
   634    634   PKG_LIB_FILE
   635    635   EXEEXT
          636  +INSTALL_LIBRARY
          637  +INSTALL_SCRIPT
          638  +INSTALL_PROGRAM
          639  +INSTALL_DATA
          640  +INSTALL_DATA_DIR
          641  +INSTALL
   636    642   CYGPATH
   637    643   target_alias
   638    644   host_alias
   639    645   build_alias
   640    646   LIBS
   641    647   ECHO_T
   642    648   ECHO_N
................................................................................
  1840   1846   #--------------------------------------------------------------------
  1841   1847   # Call TEA_INIT as the first TEA_ macro to set up initial vars.
  1842   1848   # This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
  1843   1849   # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
  1844   1850   #--------------------------------------------------------------------
  1845   1851   
  1846   1852   
  1847         -    # TEA extensions pass this us the version of TEA they think they
  1848         -    # are compatible with.
  1849         -    TEA_VERSION="3.10"
         1853  +    TEA_VERSION="3.13"
  1850   1854   
  1851         -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct TEA configuration" >&5
  1852         -$as_echo_n "checking for correct TEA configuration... " >&6; }
         1855  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking TEA configuration" >&5
         1856  +$as_echo_n "checking TEA configuration... " >&6; }
  1853   1857       if test x"${PACKAGE_NAME}" = x ; then
  1854   1858   	as_fn_error $? "
  1855   1859   The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5
  1856   1860       fi
  1857         -    if test x"3.10" = x ; then
  1858         -	as_fn_error $? "
  1859         -TEA version not specified." "$LINENO" 5
  1860         -    elif test "3.10" != "${TEA_VERSION}" ; then
  1861         -	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&5
  1862         -$as_echo "warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&6; }
  1863         -    else
  1864         -	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
         1861  +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
  1865   1862   $as_echo "ok (TEA ${TEA_VERSION})" >&6; }
  1866         -    fi
  1867   1863   
  1868   1864       # If the user did not set CFLAGS, set it now to keep macros
  1869   1865       # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2".
  1870   1866       if test "${CFLAGS+set}" != "set" ; then
  1871   1867   	CFLAGS=""
  1872   1868       fi
  1873   1869   
................................................................................
  1938   1934       # Note when adjusted, so that TEA_PREFIX can correct for this.
  1939   1935       # This is needed for recursive configures, since autoconf propagates
  1940   1936       # $prefix, but not $exec_prefix (doh!).
  1941   1937       if test x$exec_prefix = xNONE ; then
  1942   1938   	exec_prefix_default=yes
  1943   1939   	exec_prefix=$prefix
  1944   1940       fi
         1941  +
         1942  +    INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
         1943  +    INSTALL_DATA_DIR='${INSTALL} -d -m 755'
         1944  +    INSTALL_DATA='${INSTALL} -m 644'
         1945  +    INSTALL_PROGRAM='${INSTALL} -m 755'
         1946  +    INSTALL_SCRIPT='${INSTALL} -m 755'
         1947  +    INSTALL_LIBRARY='${INSTALL} -m 644'
  1945   1948   
  1946   1949       { $as_echo "$as_me:${as_lineno-$LINENO}: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&5
  1947   1950   $as_echo "$as_me: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&6;}
         1951  +
         1952  +
         1953  +
         1954  +
         1955  +
         1956  +
         1957  +
  1948   1958   
  1949   1959   
  1950   1960   
  1951   1961   
  1952   1962       # This package name must be replaced statically for AC_SUBST to work
  1953   1963   
  1954   1964       # Substitute STUB_LIB_FILE in case package creates a stub library too.

Changes to configure.ac.

     9      9   
    10     10   #--------------------------------------------------------------------
    11     11   # Call TEA_INIT as the first TEA_ macro to set up initial vars.
    12     12   # This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
    13     13   # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
    14     14   #--------------------------------------------------------------------
    15     15   
    16         -TEA_INIT([3.10])
           16  +TEA_INIT()
    17     17   AC_CONFIG_AUX_DIR(tclconfig)
    18     18   
    19     19   #--------------------------------------------------------------------
    20     20   # Load the tclConfig.sh file
    21     21   #--------------------------------------------------------------------
    22     22   
    23     23   TEA_PATH_TCLCONFIG