tdbc::mysql

Check-in [d65774b5d5]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to [email protected]
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: d65774b5d542daa74efecb91abe89404903532141a1effc67ed31d011f3cebc3
User & Date: stu 2018-01-04 05:40:58
Context
2018-01-05
06:50
Merge stu-pkgIndex. Companion to https://core.tcl.tk/tdbc/info/2386d26cfb8a34c3. check-in: e1cffb24c6 user: stu tags: trunk
06:49
Merge trunk. Closed-Leaf check-in: 730fd5422e user: stu tags: stu-pkgIndex
2018-01-04
05:40
Use INSTALL_* and new DIST_INSTALL_* macros to make dist. Align with latest TEA. check-in: d65774b5d5 user: stu tags: trunk
2017-12-22
13:35
Convert all win/*.vc files to crlf line-endings check-in: a654caeed7 user: jan.nijtmans tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.in.

    71     71   pkgdatadir	= $(datadir)/$(PKG_DIR)
    72     72   pkglibdir	= $(libdir)/$(PKG_DIR)
    73     73   pkgincludedir	= $(includedir)/$(PKG_DIR)
    74     74   
    75     75   top_builddir	= .
    76     76   
    77     77   INSTALL_OPTIONS	=
    78         -INSTALL		= @[email protected] ${INSTALL_OPTIONS}
           78  +INSTALL		= @[email protected] $(INSTALL_OPTIONS)
    79     79   INSTALL_DATA_DIR = @[email protected]
    80     80   INSTALL_DATA	= @[email protected]
    81     81   INSTALL_PROGRAM	= @[email protected]
    82     82   INSTALL_SCRIPT	= @[email protected]
    83     83   INSTALL_LIBRARY	= @[email protected]
    84     84   
    85     85   PACKAGE_NAME	= @[email protected]
................................................................................
   228    228   	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
   229    229   	done
   230    230   
   231    231   test: binaries libraries
   232    232   	@$(TCLSH) `@[email protected] $(srcdir)/tests/all.tcl` $(TESTFLAGS) \
   233    233   		-load "package ifneeded tdbc::mysql $(PACKAGE_VERSION) \
   234    234   			[list source `@[email protected] $(srcdir)/library/tdbcmysql.tcl`]\;[list load `@[email protected] $(PKG_LIB_FILE)` $(PACKAGE_NAME)];\
   235         -		package ifneeded tdbc ${TDBC_VERSION} \
          235  +		package ifneeded tdbc $(TDBC_VERSION) \
   236    236   			[list source `@[email protected] $(TDBC_BIN_DIR)/tdbc.tcl`]\;[list load `@[email protected] $(TDBC_BIN_DIR)/$(TDBC_LIB_FILE)` tdbc]"
   237    237   
   238    238   shell: binaries libraries
   239    239   	@$(TCLSH) $(SCRIPT)
   240    240   
   241    241   gdb:
   242    242   	$(TCLSH_ENV) $(PKG_ENV) gdb $(TCLSH_PROG) $(SCRIPT)
................................................................................
   294    294   #========================================================================
   295    295   
   296    296   #COMPRESS	= tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
   297    297   COMPRESS	= tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
   298    298   DIST_ROOT	= /tmp/dist
   299    299   DIST_DIR	= $(DIST_ROOT)/$(PKG_DIR)
   300    300   
          301  +DIST_INSTALL_DATA	= CPPROG='cp -p' $(INSTALL) -m 644
          302  +DIST_INSTALL_SCRIPT	= CPPROG='cp -p' $(INSTALL) -m 755
          303  +
   301    304   dist-clean:
   302    305   	rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*
   303    306   
   304    307   dist: dist-clean
   305    308   	$(INSTALL_DATA_DIR) $(DIST_DIR)
   306         -	cp -p $(srcdir)/ChangeLog $(srcdir)/README* $(srcdir)/license* \
   307         -		$(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/*.in \
   308         -		$(srcdir)/configure.ac $(DIST_DIR)/
   309         -	chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4
   310         -	chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.ac
          309  +	$(DIST_INSTALL_DATA) $(srcdir)/license.terms \
          310  +		$(srcdir)/ChangeLog $(srcdir)/README \
          311  +		$(srcdir)/aclocal.m4 $(srcdir)/configure.ac \
          312  +		$(srcdir)/Makefile.in $(srcdir)/pkgIndex.tcl.in \
          313  +		$(DIST_DIR)/
          314  +	$(DIST_INSTALL_SCRIPT) $(srcdir)/configure $(DIST_DIR)/
   311    315   
   312    316   	for i in $(srcdir)/*.[ch]; do \
   313    317   	    if [ -f $$i ]; then \
   314         -		cp -p $$i $(DIST_DIR)/ ; \
          318  +		$(DIST_INSTALL_DATA) $$i $(DIST_DIR)/ ; \
   315    319   	    fi; \
   316    320   	done;
   317    321   
   318    322   	$(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig
   319         -	cp -p $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \
          323  +	$(DIST_INSTALL_DATA) $(srcdir)/tclconfig/README.txt \
          324  +		$(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \
   320    325   		$(DIST_DIR)/tclconfig/
   321         -	chmod 664 $(DIST_DIR)/tclconfig/tcl.m4
   322         -	chmod +x $(DIST_DIR)/tclconfig/install-sh
   323    326   
   324         -	mkdir $(DIST_DIR)/doc
   325         -	cp -p $(srcdir)/doc/tdbc_mysql.n $(DIST_DIR)/doc/
          327  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/doc
          328  +	$(DIST_INSTALL_DATA) $(srcdir)/doc/tdbc_mysql.n $(DIST_DIR)/doc/
   326    329   
   327         -	mkdir $(DIST_DIR)/generic
   328         -	cp -p $(srcdir)/generic/fakemysql.h \
          330  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/generic
          331  +	$(DIST_INSTALL_DATA) \
          332  +		$(srcdir)/generic/fakemysql.h \
   329    333   		$(srcdir)/generic/mysqlStubDefs.txt \
   330    334   		$(srcdir)/generic/mysqlStubInit.c \
   331    335   		$(srcdir)/generic/mysqlStubs.h \
   332    336   		$(srcdir)/generic/tdbcmysql.c \
   333    337   		$(srcdir)/generic/int2ptr_ptr2int.h \
   334    338   		$(DIST_DIR)/generic/
   335    339   
   336         -	mkdir $(DIST_DIR)/library
   337         -	cp -p $(srcdir)/library/tdbcmysql.tcl $(DIST_DIR)/library/
          340  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/library
          341  +	$(DIST_INSTALL_DATA) $(srcdir)/library/tdbcmysql.tcl $(DIST_DIR)/library/
   338    342   
   339         -	mkdir $(DIST_DIR)/tests
   340         -	cp -p $(srcdir)/tests/all.tcl $(srcdir)/tests/tdbcmysql.test \
          343  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/tests
          344  +	$(DIST_INSTALL_DATA) $(srcdir)/tests/all.tcl $(srcdir)/tests/tdbcmysql.test \
   341    345   		$(DIST_DIR)/tests/
   342    346   
   343         -	mkdir $(DIST_DIR)/win
   344         -	cp -p $(srcdir)/win/makefile.vc $(srcdir)/win/nmakehlp.c \
          347  +	$(INSTALL_DATA_DIR) $(DIST_DIR)/win
          348  +	$(DIST_INSTALL_DATA) $(srcdir)/win/makefile.vc $(srcdir)/win/nmakehlp.c \
   345    349   		$(srcdir)/win/targets.vc $(srcdir)/win/rules-ext.vc \
   346    350   		$(srcdir)/win/rules.vc $(DIST_DIR)/win/
   347    351   
   348    352   	(cd $(DIST_ROOT); $(COMPRESS);)
   349    353   
   350    354   #========================================================================
   351    355   # How to rebuild the package's stub table.

Changes to configure.

  2426   2426   #--------------------------------------------------------------------
  2427   2427   # Call TEA_INIT as the first TEA_ macro to set up initial vars.
  2428   2428   # This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
  2429   2429   # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
  2430   2430   #--------------------------------------------------------------------
  2431   2431   
  2432   2432   
  2433         -    # TEA extensions pass this us the version of TEA they think they
  2434         -    # are compatible with.
  2435         -    TEA_VERSION="3.10"
         2433  +    TEA_VERSION="3.12"
  2436   2434   
  2437         -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct TEA configuration" >&5
  2438         -$as_echo_n "checking for correct TEA configuration... " >&6; }
         2435  +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking TEA configuration" >&5
         2436  +$as_echo_n "checking TEA configuration... " >&6; }
  2439   2437       if test x"${PACKAGE_NAME}" = x ; then
  2440   2438   	as_fn_error $? "
  2441   2439   The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5
  2442   2440       fi
  2443         -    if test x"3.10" = x ; then
  2444         -	as_fn_error $? "
  2445         -TEA version not specified." "$LINENO" 5
  2446         -    elif test "3.10" != "${TEA_VERSION}" ; then
  2447         -	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&5
  2448         -$as_echo "warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&6; }
  2449         -    else
  2450         -	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
         2441  +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
  2451   2442   $as_echo "ok (TEA ${TEA_VERSION})" >&6; }
  2452         -    fi
  2453   2443   
  2454   2444       # If the user did not set CFLAGS, set it now to keep macros
  2455   2445       # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2".
  2456   2446       if test "${CFLAGS+set}" != "set" ; then
  2457   2447   	CFLAGS=""
  2458   2448       fi
  2459   2449   
................................................................................
  4691   4681   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  4692   4682   ac_compiler_gnu=$ac_cv_c_compiler_gnu
  4693   4683   
  4694   4684   
  4695   4685       INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
  4696   4686       INSTALL_DATA_DIR='${INSTALL} -d -m 755'
  4697   4687       INSTALL_DATA='${INSTALL} -m 644'
  4698         -    INSTALL_PROGRAM='${INSTALL}'
  4699         -    INSTALL_SCRIPT='${INSTALL}'
  4700         -    INSTALL_LIBRARY='${INSTALL_DATA}'
         4688  +    INSTALL_PROGRAM='${INSTALL} -m 755'
         4689  +    INSTALL_SCRIPT='${INSTALL} -m 755'
         4690  +    INSTALL_LIBRARY='${INSTALL} -m 644'
  4701   4691   
  4702   4692   
  4703   4693   
  4704   4694   
  4705   4695   
  4706   4696   
  4707   4697   

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