TDBC

Check-in [8886c1d546]
Login
Core Home Timeline Branches Tags Tickets Wiki
Bounty program for improvements to Tcl and certain Tcl packages.

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: 8886c1d546d93cdc7145afa0881882af16e109539cff274dd41c27e77cfc05ab
User & Date: stu 2018-01-04 08:39:03
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-22
13:34
Convert all win/*.vc files to crlf line-ending check-in: 70c2c13363 user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.in. 

82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
...
313
314
315
316
317
318
319



320
321
322
323
324

325
326


327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344

345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384

pkgdatadir	= $(datadir)/$(PKG_DIR)
pkglibdir	= $(libdir)/$(PKG_DIR)
pkgincludedir	= $(includedir)/$(PKG_DIR)

top_builddir	= .

INSTALL_OPTIONS	=
INSTALL		= @[email protected] ${INSTALL_OPTIONS}
INSTALL_DATA_DIR = @[email protected]
INSTALL_DATA	= @[email protected]
INSTALL_PROGRAM	= @[email protected]
INSTALL_SCRIPT	= @[email protected]
INSTALL_LIBRARY	= @[email protected]

PACKAGE_NAME	= @[email protected]
................................................................................
#========================================================================

#COMPRESS	= tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
COMPRESS	= tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
DIST_ROOT	= /tmp/dist
DIST_DIR	= $(DIST_ROOT)/$(PKG_DIR)




dist-clean:
	rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*

dist: dist-clean
	$(INSTALL_DATA_DIR) $(DIST_DIR)

	cp -p $(srcdir)/ChangeLog $(srcdir)/README* $(srcdir)/license* \
		$(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/*.in \


		$(srcdir)/configure.ac $(DIST_DIR)/
	chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4
	chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.ac

	for i in $(srcdir)/*.[ch]; do \
	    if [ -f $$i ]; then \
		cp -p $$i $(DIST_DIR)/ ; \
	    fi; \
	done;

	$(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig
	cp -p $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \
		$(srcdir)/tclconfig/ChangeLog $(srcdir)/tclconfig/README.txt \
		$(DIST_DIR)/tclconfig/
	chmod 664 $(DIST_DIR)/tclconfig/tcl.m4
	chmod +x $(DIST_DIR)/tclconfig/install-sh

	mkdir $(DIST_DIR)/doc

	cp -p $(srcdir)/doc/tdbc.n $(srcdir)/doc/tdbc_connection.n \
		$(srcdir)/doc/tdbc_resultset.n \
		$(srcdir)/doc/tdbc_statement.n \
		$(srcdir)/doc/tdbc_mapSqlState.n \
		$(srcdir)/doc/tdbc_tokenize.n \
		$(srcdir)/doc/Tdbc_Init.3 \
		$(DIST_DIR)/doc/

	mkdir $(DIST_DIR)/generic
	cp -p $(srcdir)/generic/tdbc.c $(srcdir)/generic/tdbc.decls \
		$(srcdir)/generic/tdbc.h $(srcdir)/generic/tdbcDecls.h \
		$(srcdir)/generic/tdbcInt.h $(srcdir)/generic/tdbcStubInit.c \
		$(srcdir)/generic/tdbcStubLib.c \
		$(srcdir)/generic/tdbcTokenize.c $(DIST_DIR)/generic/

	mkdir $(DIST_DIR)/library
	cp -p $(srcdir)/library/tdbc.tcl $(DIST_DIR)/library/

	mkdir $(DIST_DIR)/tests
	cp -p $(srcdir)/tests/all.tcl \
		$(srcdir)/tests/tdbc.test \
		$(srcdir)/tests/tokenize.test \
		$(DIST_DIR)/tests/

	mkdir $(DIST_DIR)/tools
	cp -p $(srcdir)/tools/genExtStubs.tcl \
		$(srcdir)/tools/genStubs.tcl \
		$(srcdir)/tools/tdbc-man2html.tcl \
		$(DIST_DIR)/tools/

	mkdir $(DIST_DIR)/win
	cp -p $(srcdir)/win/makefile.vc $(srcdir)/win/nmakehlp.c \
		$(srcdir)/win/rules-ext.vc $(srcdir)/win/targets.vc \
		$(srcdir)/win/rules.vc $(srcdir)/win/tdbc.rc \
		$(DIST_DIR)/win/

	(cd $(DIST_ROOT); $(COMPRESS);)

#========================================================================
# How to rebuild the package's stub table.







|







 







>
>
>





>
|
|
>
>
|
<
|



|




|
|

<
<

|
>
|







|
|





|
|

|
|




|
|




|
|
|








82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
...
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333

334
335
336
337
338
339
340
341
342
343
344
345


346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388

pkgdatadir	= $(datadir)/$(PKG_DIR)
pkglibdir	= $(libdir)/$(PKG_DIR)
pkgincludedir	= $(includedir)/$(PKG_DIR)

top_builddir	= .

INSTALL_OPTIONS	=
INSTALL		= @[email protected] $(INSTALL_OPTIONS)
INSTALL_DATA_DIR = @[email protected]
INSTALL_DATA	= @[email protected]
INSTALL_PROGRAM	= @[email protected]
INSTALL_SCRIPT	= @[email protected]
INSTALL_LIBRARY	= @[email protected]

PACKAGE_NAME	= @[email protected]
................................................................................
#========================================================================

#COMPRESS	= tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
COMPRESS	= tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
DIST_ROOT	= /tmp/dist
DIST_DIR	= $(DIST_ROOT)/$(PKG_DIR)

DIST_INSTALL_DATA	= CPPROG='cp -p' $(INSTALL) -m 644
DIST_INSTALL_SCRIPT	= CPPROG='cp -p' $(INSTALL) -m 755

dist-clean:
	rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*

dist: dist-clean
	$(INSTALL_DATA_DIR) $(DIST_DIR)
	$(DIST_INSTALL_DATA) $(srcdir)/license.terms \
		$(srcdir)/ChangeLog $(srcdir)/README \
		$(srcdir)/aclocal.m4 $(srcdir)/configure.ac \
		$(srcdir)/Makefile.in $(srcdir)/pkgIndex.tcl.in \
		$(srcdir)/tdbcConfig.sh.in \
		$(DIST_DIR)/

	$(DIST_INSTALL_SCRIPT) $(srcdir)/configure $(DIST_DIR)/

	for i in $(srcdir)/*.[ch]; do \
	    if [ -f $$i ]; then \
		$(DIST_INSTALL_DATA) $$i $(DIST_DIR)/ ; \
	    fi; \
	done;

	$(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig
	$(DIST_INSTALL_DATA) $(srcdir)/tclconfig/README.txt \
		$(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \
		$(DIST_DIR)/tclconfig/



	$(INSTALL_DATA_DIR) $(DIST_DIR)/doc
	$(DIST_INSTALL_DATA) $(srcdir)/doc/tdbc.n \
		$(srcdir)/doc/tdbc_connection.n \
		$(srcdir)/doc/tdbc_resultset.n \
		$(srcdir)/doc/tdbc_statement.n \
		$(srcdir)/doc/tdbc_mapSqlState.n \
		$(srcdir)/doc/tdbc_tokenize.n \
		$(srcdir)/doc/Tdbc_Init.3 \
		$(DIST_DIR)/doc/

	$(INSTALL_DATA_DIR) $(DIST_DIR)/generic
	$(DIST_INSTALL_DATA) $(srcdir)/generic/tdbc.c $(srcdir)/generic/tdbc.decls \
		$(srcdir)/generic/tdbc.h $(srcdir)/generic/tdbcDecls.h \
		$(srcdir)/generic/tdbcInt.h $(srcdir)/generic/tdbcStubInit.c \
		$(srcdir)/generic/tdbcStubLib.c \
		$(srcdir)/generic/tdbcTokenize.c $(DIST_DIR)/generic/

	$(INSTALL_DATA_DIR) $(DIST_DIR)/library
	$(DIST_INSTALL_DATA) $(srcdir)/library/tdbc.tcl $(DIST_DIR)/library/

	$(INSTALL_DATA_DIR) $(DIST_DIR)/tests
	$(DIST_INSTALL_DATA) $(srcdir)/tests/all.tcl \
		$(srcdir)/tests/tdbc.test \
		$(srcdir)/tests/tokenize.test \
		$(DIST_DIR)/tests/

	$(INSTALL_DATA_DIR) $(DIST_DIR)/tools
	$(DIST_INSTALL_DATA) $(srcdir)/tools/genExtStubs.tcl \
		$(srcdir)/tools/genStubs.tcl \
		$(srcdir)/tools/tdbc-man2html.tcl \
		$(DIST_DIR)/tools/

	$(INSTALL_DATA_DIR) $(DIST_DIR)/win
	$(DIST_INSTALL_DATA) $(srcdir)/win/makefile.vc $(srcdir)/win/nmakehlp.c \
		$(srcdir)/win/targets.vc $(srcdir)/win/rules-ext.vc \
		$(srcdir)/win/rules.vc $(srcdir)/win/tdbc.rc \
		$(DIST_DIR)/win/

	(cd $(DIST_ROOT); $(COMPRESS);)

#========================================================================
# How to rebuild the package's stub table.

Changes to configure. 

662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
...
712
713
714
715
716
717
718






719
720
721
722
723
724
725
....
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
....
2299
2300
2301
2302
2303
2304
2305







2306
2307
2308







2309
2310
2311
2312
2313
2314
2315
....
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479

PKG_OBJECTS
PKG_SOURCES
MATH_LIBS
EGREP
GREP
RANLIB
SET_MAKE
INSTALL_LIBRARY
INSTALL_SCRIPT
INSTALL_PROGRAM
INSTALL_DATA
INSTALL_DATA_DIR
INSTALL
CPP
TCLOO_VERSION_REQ
TCL_VERSION_DESIRED
TCL_VERSION_REQ
tcloo_STUB_LIB_PATH
tcloo_STUB_LIB_SPEC
tcloo_STUB_LIB_FILE
................................................................................
PKG_HEADERS
PKG_TCL_SOURCES
PKG_STUB_OBJECTS
PKG_STUB_SOURCES
PKG_STUB_LIB_FILE
PKG_LIB_FILE
EXEEXT






CYGPATH
target_alias
host_alias
build_alias
LIBS
ECHO_T
ECHO_N
................................................................................
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
#--------------------------------------------------------------------


    # TEA extensions pass this us the version of TEA they think they
    # are compatible with.
    TEA_VERSION="3.10"

    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct TEA configuration" >&5
$as_echo_n "checking for correct TEA configuration... " >&6; }
    if test x"${PACKAGE_NAME}" = x ; then
	as_fn_error $? "
The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5
    fi
    if test x"3.10" = x ; then
	as_fn_error $? "
TEA version not specified." "$LINENO" 5
    elif test "3.10" != "${TEA_VERSION}" ; then
	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&5
$as_echo "warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&6; }
    else
	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
$as_echo "ok (TEA ${TEA_VERSION})" >&6; }
    fi

    # If the user did not set CFLAGS, set it now to keep macros
    # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2".
    if test "${CFLAGS+set}" != "set" ; then
	CFLAGS=""
    fi

................................................................................
    # Note when adjusted, so that TEA_PREFIX can correct for this.
    # This is needed for recursive configures, since autoconf propagates
    # $prefix, but not $exec_prefix (doh!).
    if test x$exec_prefix = xNONE ; then
	exec_prefix_default=yes
	exec_prefix=$prefix
    fi








    { $as_echo "$as_me:${as_lineno-$LINENO}: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&5
$as_echo "$as_me: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&6;}











    # This package name must be replaced statically for AC_SUBST to work

    # Substitute STUB_LIB_FILE in case package creates a stub library too.
................................................................................
fi

ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu


    INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
    INSTALL_DATA_DIR='${INSTALL} -d -m 755'
    INSTALL_DATA='${INSTALL} -m 644'
    INSTALL_PROGRAM='${INSTALL}'
    INSTALL_SCRIPT='${INSTALL}'
    INSTALL_LIBRARY='${INSTALL_DATA}'








    #--------------------------------------------------------------------
    # Checks to see if the make program sets the $MAKE variable.
    #--------------------------------------------------------------------

    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5







<
<
<
<
<
<







 







>
>
>
>
>
>







 







<
<
|

|
|




<
<
<
<
<
<
<
|

<







 







>
>
>
>
>
>
>



>
>
>
>
>
>
>







 







<
<
<
<
<
<
<
<
<
<
<
<
<
<








662
663
664
665
666
667
668






669
670
671
672
673
674
675
...
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
....
2201
2202
2203
2204
2205
2206
2207


2208
2209
2210
2211
2212
2213
2214
2215







2216
2217

2218
2219
2220
2221
2222
2223
2224
....
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
....
4456
4457
4458
4459
4460
4461
4462














4463
4464
4465
4466
4467
4468
4469

PKG_OBJECTS
PKG_SOURCES
MATH_LIBS
EGREP
GREP
RANLIB
SET_MAKE






CPP
TCLOO_VERSION_REQ
TCL_VERSION_DESIRED
TCL_VERSION_REQ
tcloo_STUB_LIB_PATH
tcloo_STUB_LIB_SPEC
tcloo_STUB_LIB_FILE
................................................................................
PKG_HEADERS
PKG_TCL_SOURCES
PKG_STUB_OBJECTS
PKG_STUB_SOURCES
PKG_STUB_LIB_FILE
PKG_LIB_FILE
EXEEXT
INSTALL_LIBRARY
INSTALL_SCRIPT
INSTALL_PROGRAM
INSTALL_DATA
INSTALL_DATA_DIR
INSTALL
CYGPATH
target_alias
host_alias
build_alias
LIBS
ECHO_T
ECHO_N
................................................................................
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
#--------------------------------------------------------------------




    TEA_VERSION="3.13"

    { $as_echo "$as_me:${as_lineno-$LINENO}: checking TEA configuration" >&5
$as_echo_n "checking TEA configuration... " >&6; }
    if test x"${PACKAGE_NAME}" = x ; then
	as_fn_error $? "
The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5
    fi







    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5
$as_echo "ok (TEA ${TEA_VERSION})" >&6; }


    # If the user did not set CFLAGS, set it now to keep macros
    # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2".
    if test "${CFLAGS+set}" != "set" ; then
	CFLAGS=""
    fi

................................................................................
    # Note when adjusted, so that TEA_PREFIX can correct for this.
    # This is needed for recursive configures, since autoconf propagates
    # $prefix, but not $exec_prefix (doh!).
    if test x$exec_prefix = xNONE ; then
	exec_prefix_default=yes
	exec_prefix=$prefix
    fi

    INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c'
    INSTALL_DATA_DIR='${INSTALL} -d -m 755'
    INSTALL_DATA='${INSTALL} -m 644'
    INSTALL_PROGRAM='${INSTALL} -m 755'
    INSTALL_SCRIPT='${INSTALL} -m 755'
    INSTALL_LIBRARY='${INSTALL} -m 644'

    { $as_echo "$as_me:${as_lineno-$LINENO}: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&5
$as_echo "$as_me: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&6;}











    # This package name must be replaced statically for AC_SUBST to work

    # Substitute STUB_LIB_FILE in case package creates a stub library too.
................................................................................
fi

ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
















    #--------------------------------------------------------------------
    # Checks to see if the make program sets the $MAKE variable.
    #--------------------------------------------------------------------

    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5

Changes to configure.ac. 

15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
#--------------------------------------------------------------------

TEA_INIT([3.10])

AC_CONFIG_AUX_DIR(tclconfig)

#--------------------------------------------------------------------
# Load the tclConfig.sh file
#--------------------------------------------------------------------








|








15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
#--------------------------------------------------------------------

TEA_INIT()

AC_CONFIG_AUX_DIR(tclconfig)

#--------------------------------------------------------------------
# Load the tclConfig.sh file
#--------------------------------------------------------------------

This page was generated in about 0.03s by Fossil 2.10 [eb804dc674] 2019-09-19 14:14:14