TDBC

Check-in [8d7e50c2f8]
Login

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

Overview
Comment:Merge trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | stu-pkgIndex2
Files: files | file ages | folders
SHA3-256:8d7e50c2f8d44a44f474bd333fce3bf6211602171d5328720447ab9c77be38c9
User & Date: stu 2018-01-05 05:38:04
Context
2018-01-05
05:52
Merge stu-pkgIndex2. Implements a solution for when the shared object and the pkgIndex.tcl reside in different dirs during build/test. Fixes [625f0ee464]. check-in: 2386d26cfb user: stu tags: trunk
05:38
Merge trunk. Closed-Leaf check-in: 8d7e50c2f8 user: stu tags: stu-pkgIndex2
2018-01-04
08:39
Use INSTALL_* and new DIST_INSTALL_* macros to make dist. Align with latest TEA. check-in: 8886c1d546 user: stu tags: trunk
2017-12-17
16:13
Another way:

Have pkgIndex.tcl make use of TDBC_LIBRARY.

This is better than mangling the pkgIndex.tcl on install. check-in: daa7ace8b7 user: stu tags: stu-pkgIndex2

Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Added .fossil-settings/crlf-glob.

            1  +win/*.vc

Changes to Makefile.in.

   304    304   #========================================================================
   305    305   
   306    306   #COMPRESS	= tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
   307    307   COMPRESS	= tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
   308    308   DIST_ROOT	= /tmp/dist
   309    309   DIST_DIR	= $(DIST_ROOT)/$(PKG_DIR)
   310    310   
          311  +DIST_INSTALL_DATA	= CPPROG='cp -p' $(INSTALL) -m 644
          312  +DIST_INSTALL_SCRIPT	= CPPROG='cp -p' $(INSTALL) -m 755
          313  +
   311    314   dist-clean:
   312    315   	rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*
   313    316   
   314    317   dist: dist-clean
   315    318   	$(INSTALL_DATA_DIR) $(DIST_DIR)
   316         -	cp -p $(srcdir)/ChangeLog $(srcdir)/README* $(srcdir)/license* \
   317         -		$(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/*.in \
   318         -		$(srcdir)/configure.ac $(DIST_DIR)/
   319         -	chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4
   320         -	chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.ac
          319  +	$(DIST_INSTALL_DATA) $(srcdir)/license.terms \
          320  +		$(srcdir)/ChangeLog $(srcdir)/README \
          321  +		$(srcdir)/aclocal.m4 $(srcdir)/configure.ac \
          322  +		$(srcdir)/Makefile.in $(srcdir)/pkgIndex.tcl.in \
          323  +		$(srcdir)/tdbcConfig.sh.in \
          324  +		$(DIST_DIR)/
          325  +	$(DIST_INSTALL_SCRIPT) $(srcdir)/configure $(DIST_DIR)/
   321    326   
   322    327   	for i in $(srcdir)/*.[ch]; do \
   323    328   	    if [ -f $$i ]; then \
   324         -		cp -p $$i $(DIST_DIR)/ ; \
          329  +		$(DIST_INSTALL_DATA) $$i $(DIST_DIR)/ ; \
   325    330   	    fi; \
   326    331   	done;
   327    332   
   328    333   	$(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig
   329         -	cp -p $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \
   330         -		$(srcdir)/tclconfig/ChangeLog $(srcdir)/tclconfig/README.txt \
          334  +	$(DIST_INSTALL_DATA) $(srcdir)/tclconfig/README.txt \
          335  +		$(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \
   331    336   		$(DIST_DIR)/tclconfig/
   332         -	chmod 664 $(DIST_DIR)/tclconfig/tcl.m4
   333         -	chmod +x $(DIST_DIR)/tclconfig/install-sh
   334    337   
   335         -	mkdir $(DIST_DIR)/doc
   336         -	cp -p $(srcdir)/doc/tdbc.n $(srcdir)/doc/tdbc_connection.n \
          338  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/doc
          339  +	$(DIST_INSTALL_DATA) $(srcdir)/doc/tdbc.n \
          340  +		$(srcdir)/doc/tdbc_connection.n \
   337    341   		$(srcdir)/doc/tdbc_resultset.n \
   338    342   		$(srcdir)/doc/tdbc_statement.n \
   339    343   		$(srcdir)/doc/tdbc_mapSqlState.n \
   340    344   		$(srcdir)/doc/tdbc_tokenize.n \
   341    345   		$(srcdir)/doc/Tdbc_Init.3 \
   342    346   		$(DIST_DIR)/doc/
   343    347   
   344         -	mkdir $(DIST_DIR)/generic
   345         -	cp -p $(srcdir)/generic/tdbc.c $(srcdir)/generic/tdbc.decls \
          348  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/generic
          349  +	$(DIST_INSTALL_DATA) $(srcdir)/generic/tdbc.c $(srcdir)/generic/tdbc.decls \
   346    350   		$(srcdir)/generic/tdbc.h $(srcdir)/generic/tdbcDecls.h \
   347    351   		$(srcdir)/generic/tdbcInt.h $(srcdir)/generic/tdbcStubInit.c \
   348    352   		$(srcdir)/generic/tdbcStubLib.c \
   349    353   		$(srcdir)/generic/tdbcTokenize.c $(DIST_DIR)/generic/
   350    354   
   351         -	mkdir $(DIST_DIR)/library
   352         -	cp -p $(srcdir)/library/tdbc.tcl $(DIST_DIR)/library/
          355  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/library
          356  +	$(DIST_INSTALL_DATA) $(srcdir)/library/tdbc.tcl $(DIST_DIR)/library/
   353    357   
   354         -	mkdir $(DIST_DIR)/tests
   355         -	cp -p $(srcdir)/tests/all.tcl \
          358  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/tests
          359  +	$(DIST_INSTALL_DATA) $(srcdir)/tests/all.tcl \
   356    360   		$(srcdir)/tests/tdbc.test \
   357    361   		$(srcdir)/tests/tokenize.test \
   358    362   		$(DIST_DIR)/tests/
   359    363   
   360         -	mkdir $(DIST_DIR)/tools
   361         -	cp -p $(srcdir)/tools/genExtStubs.tcl \
          364  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/tools
          365  +	$(DIST_INSTALL_DATA) $(srcdir)/tools/genExtStubs.tcl \
   362    366   		$(srcdir)/tools/genStubs.tcl \
   363    367   		$(srcdir)/tools/tdbc-man2html.tcl \
   364    368   		$(DIST_DIR)/tools/
   365    369   
   366         -	mkdir $(DIST_DIR)/win
   367         -	cp -p $(srcdir)/win/makefile.vc $(srcdir)/win/nmakehlp.c \
          370  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/win
          371  +	$(DIST_INSTALL_DATA) $(srcdir)/win/makefile.vc $(srcdir)/win/nmakehlp.c \
          372  +		$(srcdir)/win/targets.vc $(srcdir)/win/rules-ext.vc \
   368    373   		$(srcdir)/win/rules.vc $(srcdir)/win/tdbc.rc \
   369    374   		$(DIST_DIR)/win/
   370    375   
   371    376   	(cd $(DIST_ROOT); $(COMPRESS);)
   372    377   
   373    378   #========================================================================
   374    379   # How to rebuild the package's stub table.

Changes to configure.

   662    662   PKG_OBJECTS
   663    663   PKG_SOURCES
   664    664   MATH_LIBS
   665    665   EGREP
   666    666   GREP
   667    667   RANLIB
   668    668   SET_MAKE
   669         -INSTALL_LIBRARY
   670         -INSTALL_SCRIPT
   671         -INSTALL_PROGRAM
   672         -INSTALL_DATA
   673         -INSTALL_DATA_DIR
   674         -INSTALL
   675    669   CPP
   676    670   TCLOO_VERSION_REQ
   677    671   TCL_VERSION_DESIRED
   678    672   TCL_VERSION_REQ
   679    673   tcloo_STUB_LIB_PATH
   680    674   tcloo_STUB_LIB_SPEC
   681    675   tcloo_STUB_LIB_FILE
................................................................................
   712    706   PKG_HEADERS
   713    707   PKG_TCL_SOURCES
   714    708   PKG_STUB_OBJECTS
   715    709   PKG_STUB_SOURCES
   716    710   PKG_STUB_LIB_FILE
   717    711   PKG_LIB_FILE
   718    712   EXEEXT
          713  +INSTALL_LIBRARY
          714  +INSTALL_SCRIPT
          715  +INSTALL_PROGRAM
          716  +INSTALL_DATA
          717  +INSTALL_DATA_DIR
          718  +INSTALL
   719    719   CYGPATH
   720    720   target_alias
   721    721   host_alias
   722    722   build_alias
   723    723   LIBS
   724    724   ECHO_T
   725    725   ECHO_N
................................................................................
  2201   2201   #--------------------------------------------------------------------
  2202   2202   # Call TEA_INIT as the first TEA_ macro to set up initial vars.
  2203   2203   # This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
  2204   2204   # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
  2205   2205   #--------------------------------------------------------------------
  2206   2206   
  2207   2207   
  2208         -    # TEA extensions pass this us the version of TEA they think they
  2209         -    # are compatible with.
  2210         -    TEA_VERSION="3.10"
         2208  +    TEA_VERSION="3.13"
  2211   2209   
  2212         -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct TEA configuration" >&5
  2213         -$as_echo_n "checking for correct TEA configuration... " >&6; }
         2210  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking TEA configuration" >&5
         2211  +$as_echo_n "checking TEA configuration... " >&6; }
  2214   2212       if test x"${PACKAGE_NAME}" = x ; then
  2215   2213   	as_fn_error $? "
  2216   2214   The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5
  2217   2215       fi
  2218         -    if test x"3.10" = x ; then
  2219         -	as_fn_error $? "
  2220         -TEA version not specified." "$LINENO" 5
  2221         -    elif test "3.10" != "${TEA_VERSION}" ; then
  2222         -	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&5
  2223         -$as_echo "warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&6; }
  2224         -    else
  2225         -	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
         2216  +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
  2226   2217   $as_echo "ok (TEA ${TEA_VERSION})" >&6; }
  2227         -    fi
  2228   2218   
  2229   2219       # If the user did not set CFLAGS, set it now to keep macros
  2230   2220       # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2".
  2231   2221       if test "${CFLAGS+set}" != "set" ; then
  2232   2222   	CFLAGS=""
  2233   2223       fi
  2234   2224   
................................................................................
  2299   2289       # Note when adjusted, so that TEA_PREFIX can correct for this.
  2300   2290       # This is needed for recursive configures, since autoconf propagates
  2301   2291       # $prefix, but not $exec_prefix (doh!).
  2302   2292       if test x$exec_prefix = xNONE ; then
  2303   2293   	exec_prefix_default=yes
  2304   2294   	exec_prefix=$prefix
  2305   2295       fi
         2296  +
         2297  +    INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
         2298  +    INSTALL_DATA_DIR='${INSTALL} -d -m 755'
         2299  +    INSTALL_DATA='${INSTALL} -m 644'
         2300  +    INSTALL_PROGRAM='${INSTALL} -m 755'
         2301  +    INSTALL_SCRIPT='${INSTALL} -m 755'
         2302  +    INSTALL_LIBRARY='${INSTALL} -m 644'
  2306   2303   
  2307   2304       { $as_echo "$as_me:${as_lineno-$LINENO}: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&5
  2308   2305   $as_echo "$as_me: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&6;}
         2306  +
         2307  +
         2308  +
         2309  +
         2310  +
         2311  +
         2312  +
  2309   2313   
  2310   2314   
  2311   2315   
  2312   2316   
  2313   2317       # This package name must be replaced statically for AC_SUBST to work
  2314   2318   
  2315   2319       # Substitute STUB_LIB_FILE in case package creates a stub library too.
................................................................................
  4452   4456   fi
  4453   4457   
  4454   4458   ac_ext=c
  4455   4459   ac_cpp='$CPP $CPPFLAGS'
  4456   4460   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  4457   4461   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  4458   4462   ac_compiler_gnu=$ac_cv_c_compiler_gnu
  4459         -
  4460         -
  4461         -    INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
  4462         -    INSTALL_DATA_DIR='${INSTALL} -d -m 755'
  4463         -    INSTALL_DATA='${INSTALL} -m 644'
  4464         -    INSTALL_PROGRAM='${INSTALL}'
  4465         -    INSTALL_SCRIPT='${INSTALL}'
  4466         -    INSTALL_LIBRARY='${INSTALL_DATA}'
  4467         -
  4468         -
  4469         -
  4470         -
  4471         -
  4472         -
  4473   4463   
  4474   4464   
  4475   4465       #--------------------------------------------------------------------
  4476   4466       # Checks to see if the make program sets the $MAKE variable.
  4477   4467       #--------------------------------------------------------------------
  4478   4468   
  4479   4469       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5

Changes to configure.ac.

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

Changes to win/makefile.vc.


Changes to win/rules-ext.vc.


Changes to win/rules.vc.


Changes to win/targets.vc.