From 8f9cbbe32d122f17493cfb62eaa99ca1a1066857 Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 21 Apr 2017 16:53:56 -0400 Subject: Squashed 'tclxml/' changes from d5e1189d..c298716d c298716d minor config change e8a4b706 minor config change git-subtree-dir: tclxml git-subtree-split: c298716ded52d09397891f9a18b4dc4d47a069ef --- Makefile.in | 2 +- Makefile.in.old | 530 ------------------------------------------------- Makefile.macosx.in.old | 21 -- TclxmlConfig.sh.in.old | 56 ------ configure | 1 + configure.ac | 1 + configure.in.old | 331 ------------------------------ 7 files changed, 3 insertions(+), 939 deletions(-) delete mode 100755 Makefile.in.old delete mode 100644 Makefile.macosx.in.old delete mode 100644 TclxmlConfig.sh.in.old delete mode 100755 configure.in.old diff --git a/Makefile.in b/Makefile.in index a214cac..d004e32 100644 --- a/Makefile.in +++ b/Makefile.in @@ -159,7 +159,7 @@ PKG_CFLAGS = @PKG_CFLAGS@ @XML2_CFLAGS@ @XSLT_CFLAGS@ DEFS = @DEFS@ $(PKG_CFLAGS) # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile -CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl include/tclxml/tclxml.h tclxmlConfig.sh +CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl CLEANFILES = @CLEANFILES@ CPPFLAGS = @CPPFLAGS@ diff --git a/Makefile.in.old b/Makefile.in.old deleted file mode 100755 index d45d0fa..0000000 --- a/Makefile.in.old +++ /dev/null @@ -1,530 +0,0 @@ -# Makefile.in -- -# -# This file is a Makefile for Tclxml TEA Extension. If it has the name -# "Makefile.in" then it is a template for a Makefile; to generate the -# actual Makefile, run "./configure", which is a configuration script -# generated by the "autoconf" program (constructs like "@foo@" will get -# replaced in the actual Makefile. -# -# Copyright (c) 2007-2008 Explain/Packaged Press. -# Copyright (c) 2004 Zveno Pty Ltd. -# Copyright (c) 2002 ActiveState SRL. -# Copyright (c) 1999 Scriptics Corporation. -# -# See the file "license.terms" for information on usage and redistribution -# of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: Makefile.in.old,v 1.1.1.1 2009/01/16 22:11:49 joye Exp $ - -#======================================================================== -# The names of the source files is defined in the configure script. -# The object files are used for linking into the final library. -# This will be used when a dist target is added to the Makefile. -# It is not important to specify the directory, as long as it is the -# $(srcdir) or in the generic, win or unix subdirectory. -#======================================================================== - -PKG_SOURCES = @PKG_SOURCES@ -PKG_OBJECTS = @PKG_OBJECTS@ @PKG_STUB_OBJECTS@ - -PKG_STUB_SOURCES = @PKG_STUB_SOURCES@ -PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@ - -#======================================================================== -# PKG_TCL_SOURCES identifies Tcl runtime files that are associated with -# this package that need to be installed, if any. -#======================================================================== - -PKG_TCL_SOURCES = @PKG_TCL_SOURCES@ - -#======================================================================== -# This is a list of public header files to be installed, if any. -#======================================================================== - -PKG_HEADERS = @PKG_HEADERS@ - -#======================================================================== -# "PKG_LIB_FILE" refers to the library (dynamic or static as per -# configuration options) composed of the named objects. -#======================================================================== - -PKG_LIB_FILE = @PKG_LIB_FILE@ -PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@ - -XML2_VERSION = @XML2_VERSION@ -XML2_PREFIX = @XML2_PREFIX@ -XML2_CFLAGS = @XML2_CFLAGS@ -XML2_LIBS = @XML2_LIBS@ - -XSLT_VERSION = @XSLT_VERSION@ -XSLT_PREFIX = @XSLT_PREFIX@ -XSLT_LIBS = @XSLT_LIBS@ -XSLT_CFLAGS = @XSLT_CFLAGS@ - -XML_STATIC = @XML_STATIC@ -FIX_LIB = @FIX_LIB@ - -#======================================================================== -# "PKG_LIB_FILE" refers to the library (dynamic or static as per -# configuration options) composed of the named objects. -#======================================================================== - -lib_BINARIES = $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE) -BINARIES = $(lib_BINARIES) - -SHELL = @SHELL@ - -srcdir = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -libdir = @libdir@ -datadir = @datadir@ -mandir = @mandir@ -includedir = @includedir@ -datarootdir = @datarootdir@ - -DESTDIR = - -PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) -pkgdatadir = $(datadir)/$(PKG_DIR) -pkglibdir = $(libdir)/$(PKG_DIR) -pkgincludedir = $(includedir)/$(PKG_DIR) - -top_builddir = . - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ - -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -CC = @CC@ -CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ -CFLAGS_WARNING = @CFLAGS_WARNING@ -EXEEXT = @EXEEXT@ -LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ -MAKE_LIB = @MAKE_LIB@ -MAKE_SHARED_LIB = @MAKE_SHARED_LIB@ -MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ -MAKE_STUB_LIB = @MAKE_STUB_LIB@ -OBJEXT = @OBJEXT@ -RANLIB = @RANLIB@ -RANLIB_STUB = @RANLIB_STUB@ -SHLIB_CFLAGS = @SHLIB_CFLAGS@ -SHLIB_LD = @SHLIB_LD@ -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -STLIB_LD = @STLIB_LD@ -#TCL_DEFS = @TCL_DEFS@ -TCL_BIN_DIR = @TCL_BIN_DIR@ -TCL_SRC_DIR = @TCL_SRC_DIR@ -#TK_BIN_DIR = @TK_BIN_DIR@ -#TK_SRC_DIR = @TK_SRC_DIR@ - -# Not used, but retained for reference of what libs Tcl required -#TCL_LIBS = @TCL_LIBS@ - -#======================================================================== -# TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our -# package without installing. The other environment variables allow us -# to test against an uninstalled Tcl. Add special env vars that you -# require for testing here (like TCLX_LIBRARY). -#======================================================================== - -EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) -#EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) -TCLLIBPATH = $(top_builddir) -TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ - @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ - PATH="$(EXTRA_PATH):$(PATH)" \ - TCLLIBPATH="$(TCLLIBPATH)" -# TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` - -TCLSH_PROG = @TCLSH_PROG@ -TCLSH = $(TCLSH_ENV) $(TCLSH_PROG) - -SHARED_BUILD = @SHARED_BUILD@ - -INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@ - -PKG_CFLAGS = @PKG_CFLAGS@ $(XML2_CFLAGS) $(XSLT_CFLAGS) - -# TCL_DEFS is not strictly need here, but if you remove it, then you -# must make sure that configure.in checks for the necessary components -# that your library may use. TCL_DEFS can actually be a problem if -# you do not compile with a similar machine setup as the Tcl core was -# compiled with. -#DEFS = $(TCL_DEFS) @DEFS@ $(PKG_CFLAGS) -DEFS = @DEFS@ $(PKG_CFLAGS) - -# Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile -CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl include/tclxml/tclxml.h -CLEANFILES = @CLEANFILES@ - -CPPFLAGS = @CPPFLAGS@ -LIBS = @PKG_LIBS@ @LIBS@ @XML2_LIBS@ @XSLT_LIBS@ -AR = @AR@ -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - -#======================================================================== -# Start of user-definable TARGETS section -#======================================================================== - -#======================================================================== -# TEA TARGETS. Please note that the "libraries:" target refers to platform -# independent files, and the "binaries:" target inclues executable programs and -# platform-dependent libraries. Modify these targets so that they install -# the various pieces of your package. The make and install rules -# for the BINARIES that you specified above have already been done. -#======================================================================== - -# Do not build the documentation by default, since it requires -# additional dependencies that may not be installed. - -all: binaries libraries - -#======================================================================== -# The binaries target builds executable programs, Windows .dll's, unix -# shared/static libraries, and any other platform-dependent files. -# The list of targets to build for "binaries:" is specified at the top -# of the Makefile, in the "BINARIES" variable. -#======================================================================== - -binaries: $(BINARIES) - -libraries: - -#======================================================================== -# Your doc target should differentiate from doc builds (by the developer) -# and doc installs (see install-doc), which just install the docs on the -# end user machine when building from source. -#======================================================================== - -doc: - -$(TCLSH) doc/transform.tcl doc/tclxml.xml doc/html.xsl doc/tclxml.html - -$(TCLSH) doc/transform.tcl doc/tclxml.xml doc/nroff.xsl doc/tclxml.n - -$(TCLSH) doc/transform.tcl doc/tcldom.xml doc/html.xsl doc/tcldom.html - -$(TCLSH) doc/transform.tcl doc/tcldom.xml doc/nroff.xsl doc/tcldom.n - -$(TCLSH) doc/transform.tcl doc/tclxslt.xml doc/html.xsl doc/tclxslt.html - -$(TCLSH) doc/transform.tcl doc/tclxslt.xml doc/nroff.xsl doc/tclxslt.n - -$(TCLSH) doc/transform.tcl doc/README.xml doc/html.xsl README.html - -$(TCLSH) doc/transform.tcl doc/README.xml doc/txt.xsl -o README - -# Do not install the documentation by default, -# since it may not have been built (see above). - -install: all install-binaries install-libraries - -install-binaries: binaries install-lib-binaries install-bin-binaries - if test "x$(SHARED_BUILD)" = "x1"; then \ - $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ - fi - -#======================================================================== -# This rule installs platform-independent files, such as header files. -# The list=...; for p in $$list handles the empty list case x-platform. -#======================================================================== - -install-libraries: libraries - @mkdir -p $(DESTDIR)$(includedir)/tclxml - @echo "Installing header files in $(DESTDIR)$(includedir)/tclxml" - @list='$(PKG_HEADERS)'; for i in $$list; do \ - echo "Installing $(srcdir)/$$i" ; \ - $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/tclxml ; \ - done; - @echo "libraries done" - -#======================================================================== -# Install documentation. Unix manpages should go in the $(mandir) -# directory. -#======================================================================== - -install-doc: doc - @mkdir -p $(DESTDIR)$(mandir)/mann - @echo "Installing documentation in $(DESTDIR)$(mandir)" - @list='$(srcdir)/doc/*.n'; for i in $$list; do \ - echo "Installing $$i"; \ - rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \ - done - -testshell = $(TCLSH_PROG) $(srcdir)/testshell - -#test: binaries libraries -# $(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) -# $(testshell) \ -# -load 'load ./$(Tclxml_LIB_FILE)' \ -# -testdir $(srcdir)/tea.tests - -test: test-tclxml test-tcldom test-tclxslt - -test-tclxml: - (cd $(srcdir)/tests/tclxml; $(TCLSH) all.tcl) - -test-tcldom: - (cd $(srcdir)/tests/tcldom; $(TCLSH) all.tcl) - -test-tclxslt: - (cd $(srcdir)/tests/tclxslt; $(TCLSH) all.tcl) - -shell: binaries libraries - @$(TCLSH) $(SCRIPT) - -gdb: - $(TCLSH_ENV) gdb $(TCLSH_PROG) $(SCRIPT) - -depend: - -#======================================================================== -# $(PKG_LIB_FILE) should be listed as part of the BINARIES variable -# mentioned above. That will ensure that this target is built when you -# run "make binaries". -# -# The $(PKG_OBJECTS) objects are created and linked into the final -# library. In most cases these object files will correspond to the -# source files above. -#======================================================================== - -$(PKG_LIB_FILE): $(PKG_OBJECTS) - -rm -f $(PKG_LIB_FILE) - ${MAKE_LIB} - $(RANLIB) $(PKG_LIB_FILE) - $(FIX_LIB) $(PKG_LIB_FILE) - -$(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS) - -rm -f $(PKG_STUB_LIB_FILE) - ${MAKE_STUB_LIB} - $(RANLIB_STUB) $(PKG_STUB_LIB_FILE) - -#======================================================================== -# We need to enumerate the list of .c to .o lines here. -# -# In the following lines, $(srcdir) refers to the toplevel directory -# containing your extension. If your sources are in a subdirectory, -# you will have to modify the paths to reflect this: -# -# Tclxml.$(OBJEXT): $(srcdir)/generic/Tclxml.c -# $(COMPILE) -c `@CYGPATH@ $(srcdir)/generic/Tclxml.c` -o $@ -# -# Setting the VPATH variable to a list of paths will cause the makefile -# to look into these paths when resolving .c to .obj dependencies. -# As necessary, add $(srcdir):$(srcdir)/compat:.... -#======================================================================== - -VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win - -.c.@OBJEXT@: - $(COMPILE) -c `@CYGPATH@ $<` -o $@ - -#======================================================================== -# Distribution creation -# You may need to tweak this target to make it work correctly. -#======================================================================== - -#COMPRESS = tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar -COMPRESS = gtar 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 doc - mkdir -p $(DIST_DIR) - cp -p $(srcdir)/ChangeLog $(srcdir)/README* $(srcdir)/doc/license* \ - $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/*.in \ - $(DIST_DIR)/ - chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4 - chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.in - - for i in $(srcdir)/*.[ch]; do \ - if [ -f $$i ]; then \ - cp -p $$i $(DIST_DIR)/ ; \ - fi; \ - done; - - mkdir $(DIST_DIR)/tclconfig - cp $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \ - $(DIST_DIR)/tclconfig/ - chmod 664 $(DIST_DIR)/tclconfig/tcl.m4 - chmod +x $(DIST_DIR)/tclconfig/install-sh - - -list='htdocs/art demos generic library mac tests unix win tea.tests tools tools/rules'; \ - for p in $$list; do \ - if test -d $(srcdir)/$$p ; then \ - mkdir -p $(DIST_DIR)/$$p; \ - cp -p $(srcdir)/$$p/*.* $(srcdir)/$$p/* $(DIST_DIR)/$$p/; \ - fi; \ - done - - -list='doc'; \ - for p in $$list; do \ - if test -d $$p ; then \ - mkdir -p $(DIST_DIR)/$$p; \ - cp -p $$p/*.* $$p/* $(DIST_DIR)/$$p/; \ - fi; \ - done - -mv $(DIST_DIR)/htdocs/art $(DIST_DIR)/doc/art - rm -rf $(DIST_DIR)/htdocs - - (cd $(DIST_ROOT); $(COMPRESS);) - -dist_orig: - rm -rf $(PKG_DIR)* - ls -d $(srcdir)/* > __FILES - mkdir $(PKG_DIR) - cp -rf `cat __FILES | grep -v __FILES` $(PKG_DIR) - rm __FILES - find $(PKG_DIR) -name CVS -prune -exec rm -rf {} \; - cd $(PKG_DIR) ; $(TCLSH_PROG) PREPARE - -tar cf - $(PKG_DIR) | gzip --best > $(PKG_DIR).tar.gz - -tar cf - $(PKG_DIR) | bzip2 > $(PKG_DIR).tar.bz2 - -zip -r $(PKG_DIR).zip $(PKG_DIR) - rm -rf $(PKG_DIR) - -release: - autoconf - -#======================================================================== -# End of user-definable section -#======================================================================== - -#======================================================================== -# Don't modify the file to clean here. Instead, set the "CLEANFILES" -# variable in configure.in -#======================================================================== - -clean: - -test -z "$(BINARIES)" || rm -f $(BINARIES) - -rm -f *.$(OBJEXT) core *.core - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean: clean - -rm -f *.tab.c - -rm -f $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log config.status - -#======================================================================== -# Install binary object libraries. On Windows this includes both .dll and -# .lib files. Because the .lib files are not explicitly listed anywhere, -# we need to deduce their existence from the .dll file of the same name. -# Library files go into the lib directory. -# In addition, this will generate the pkgIndex.tcl -# file in the install location (assuming it can find a usable tclsh shell) -# -# You should not have to modify this target. -#======================================================================== - -install-lib-binaries: - @mkdir -p $(DESTDIR)$(pkglibdir) - @list='$(lib_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ - stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ - if test "x$$stub" = "xstub"; then \ - echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ - $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ - else \ - echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ - fi; \ - ext=`echo $$p|sed -e "s/.*\.//"`; \ - if test "x$$ext" = "xdll"; then \ - lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ - if test -f $$lib; then \ - echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \ - $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \ - fi; \ - fi; \ - fi; \ - done - @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - s=`basename $$p`; \ - echo " Install $$p $(DESTDIR)$(pkglibdir)/$$s"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$s; \ - fi; \ - done - $(INSTALL_DATA) TclxmlConfig.sh $(DESTDIR)$(libdir) - $(FIX_LIB) $(DESTDIR)$(pkglibdir)/$(PKG_LIB_FILE) - -#======================================================================== -# Install binary executables (e.g. .exe files and dependent .dll files) -# This is for files that must go in the bin directory (located next to -# wish and tclsh), like dependent .dll files on Windows. -# -# You should not have to modify this target, except to define bin_BINARIES -# above if necessary. -#======================================================================== - -install-bin-binaries: - @mkdir -p $(DESTDIR)$(bindir) - @list='$(bin_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \ - fi; \ - done - -.SUFFIXES: .c .$(OBJEXT) - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - -uninstall-binaries: - list='$(lib_BINARIES)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ - p=`basenme $$p`; \ - rm -f $(DESTDIR)$(pkglibdir)/$$p; \ - done - list='$(bin_BINARIES)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/$$p; \ - done - -#======================================================================== -# -# Target to regenerate header files and stub files from the *.decls tables. -# -#======================================================================== - -genstubs: - $(TCLSH_PROG) \ - $(srcdir)/tools/genStubs.tcl $(srcdir) \ - $(srcdir)/tclxml.decls - -#======================================================================== -# -# Target to check that all exported functions have an entry in the stubs -# tables. -# -#======================================================================== - -Tclxml_DECLS = \ - $(srcdir)/tclxml.decls - -checkstubs: - -@for i in `nm -p $(Tclxml_LIB_FILE) | awk '$$2 ~ /T/ { print $$3 }' \ - | sort -n`; do \ - match=0; \ - for j in $(Tclxml_DECLS); do \ - if [ `grep -c $$i $$j` -gt 0 ]; then \ - match=1; \ - fi; \ - done; \ - if [ $$match -eq 0 ]; then echo $$i; fi \ - done - - -.PHONY: all binaries clean depend distclean doc install libraries test - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/Makefile.macosx.in.old b/Makefile.macosx.in.old deleted file mode 100644 index 240c07c..0000000 --- a/Makefile.macosx.in.old +++ /dev/null @@ -1,21 +0,0 @@ -######################## -# -# Makefile to build TclXML/libxml2 for macosx. -# -# Usage: -# cd tclxml-3.X -# make -f Makefile.macosx -# -# $Id: Makefile.macosx.in.old,v 1.1.1.1 2009/01/16 22:11:49 joye Exp $ -# -######################## - -PACKAGE_VERSION := @PACKAGE_VERSION@ - -LIBXML2_VERSION := $(shell eval echo $$(ls -dt ../libxml2* | head -1 | sed -e '1s/.*\-//')) - -all: build - -build: - cd macosx; xcodebuild -project tclxml.pbproj -target Make -buildstyle Deployment FRAMEWORK_VERSION=${PACKAGE_VERSION} LIBXML2_VERSION=${LIBXML2_VERSION} - diff --git a/TclxmlConfig.sh.in.old b/TclxmlConfig.sh.in.old deleted file mode 100644 index 2e0b09c..0000000 --- a/TclxmlConfig.sh.in.old +++ /dev/null @@ -1,56 +0,0 @@ -# tclxmlConfig.sh -- -# -# This shell script (for sh) is generated automatically by Tclxml's -# configure script. It will create shell variables for most of -# the configuration options discovered by the configure script. -# This script is intended to be included by the configure scripts -# for Tclxml extensions so that they don't have to figure this all -# out for themselves. This file does not duplicate information -# already provided by tclConfig.sh, so you may need to use that -# file in addition to this one. -# -# The information in this file is specific to a single platform. - -# Tclxml's version number. -Tclxml_VERSION='@PACKAGE_VERSION@' - -# The name of the Tclxml library (may be either a .a file or a shared library): -Tclxml_LIB_FILE='@PKG_LIB_FILE@' - -# String to pass to linker to pick up the Tclxml library from its -# build directory. -Tclxml_BUILD_LIB_SPEC='@Tclxml_BUILD_LIB_SPEC@' - -# String to pass to linker to pick up the Tclxml library from its -# installed directory. -Tclxml_LIB_SPEC='@Tclxml_LIB_SPEC@' - -# The name of the Tclxml stub library (a .a file): -Tclxml_STUB_LIB_FILE='@PKG_STUB_LIB_FILE@' - -# String to pass to linker to pick up the Tclxml stub library from its -# build directory. -Tclxml_BUILD_STUB_LIB_SPEC='@Tclxml_BUILD_STUB_LIB_SPEC@' - -# String to pass to linker to pick up the Tclxml stub library from its -# installed directory. -Tclxml_STUB_LIB_SPEC='@Tclxml_STUB_LIB_SPEC@' - -# String to pass to linker to pick up the Tclxml stub library from its -# build directory. -Tclxml_BUILD_STUB_LIB_PATH='@Tclxml_BUILD_STUB_LIB_PATH@' - -# String to pass to linker to pick up the Tclxml stub library from its -# installed directory. -Tclxml_STUB_LIB_PATH='@Tclxml_STUB_LIB_PATH@' - -# String to pass to the compiler so that an extension can find -# installed header. -Tclxml_INCLUDE_SPEC='@Tclxml_INCLUDE_SPEC@' - -# Location of the top-level source directories from which [incr Tcl] -# was built. This is the directory that contains generic, unix, etc. -# If [incr Tcl] was compiled in a different place than the directory -# containing the source files, this points to the location of the sources, -# not the location where [incr Tcl] was compiled. -Tclxml_SRC_DIR='@srcdir@' diff --git a/configure b/configure index b3adba7..bdb4b98 100755 --- a/configure +++ b/configure @@ -5484,6 +5484,7 @@ done #-------------------------------------------------------------------- #CLEANFILES="$CLEANFILES pkgIndex.tcl" +CLEANFILES="$CLEANFILES include/tclxml/tclxml.h tclxmlConfig.sh" if test "${TEA_PLATFORM}" = "windows" ; then # Ensure no empty if clauses : diff --git a/configure.ac b/configure.ac index b638e73..f1faab8 100644 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,7 @@ TEA_ADD_TCL_SOURCES([tclxml-tcl/xml__tcl.tcl tclxml-tcl/sgml-8.0.tcl tclxml-tcl/ #-------------------------------------------------------------------- #CLEANFILES="$CLEANFILES pkgIndex.tcl" +CLEANFILES="$CLEANFILES include/tclxml/tclxml.h tclxmlConfig.sh" if test "${TEA_PLATFORM}" = "windows" ; then # Ensure no empty if clauses : diff --git a/configure.in.old b/configure.in.old deleted file mode 100755 index b467ff4..0000000 --- a/configure.in.old +++ /dev/null @@ -1,331 +0,0 @@ -#!/bin/bash -norc -dnl This file is an input file used by the GNU "autoconf" program to -dnl generate the file "configure", which is run during Tcl installation -dnl to configure the system for the local environment. -# -# Copyright (c) 2007-2008 Explain/Packaged Press. -# -# $Id: configure.in.old,v 1.1.1.1 2009/01/16 22:11:49 joye Exp $ - -#-------------------------------------------------------------------- -# Configure script for package 'TclXML', -# TEA compliant. -#-------------------------------------------------------------------- - -#-------------------------------------------------------------------- -# This very first macro is used to verify that the configure script can -# find the sources. The argument to AC_INIT is a unique filename for -# this package. -#-------------------------------------------------------------------- - -AC_INIT([Tclxml], [3.2]) -PACKAGE_NAME=Tclxml -PACKAGE_VERSION=3.2 - -TEA_INIT([3.6]) -AC_CONFIG_AUX_DIR(tclconfig) - -TEA_PATH_TCLCONFIG -TEA_LOAD_TCLCONFIG - -TEA_PREFIX - -TEA_SETUP_COMPILER - -#----------------------------------------------------------------------- -# Specify the C source files to compile in TEA_ADD_SOURCES, -# public headers that need to be installed in TEA_ADD_HEADERS, -# stub library C source files to compile in TEA_ADD_STUB_SOURCES, -# and runtime Tcl library files in TEA_ADD_TCL_SOURCES. -# This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS -# and PKG_TCL_SOURCES. -#----------------------------------------------------------------------- - -TEA_ADD_SOURCES([tclxml.c docObj.c tclxml-libxml2.c nodeObj.c tcldom-libxml2.c tclxslt-libxslt.c]) -TEA_ADD_HEADERS([include/tclxml-libxml2/docObj.h include/tclxml-libxml2/tclxml-libxml2.h include/tcldom/tcldom.h include/tcldom-libxml2/tcldom-libxml2.h include/tclxslt/tclxslt.h]) -TEA_ADD_INCLUDES([-Iinclude]) -#TEA_ADD_LIBS([-lexslt]) -TEA_ADD_LIBS([]) -TEA_ADD_CFLAGS([]) -TEA_ADD_STUB_SOURCES([tclxmlStubInit.c tclxmlStubLib.c]) -TEA_ADD_TCL_SOURCES([tclxml-tcl/xml__tcl.tcl tclxml-tcl/sgml-8.0.tcl tclxml-tcl/sgml-8.1.tcl tclxml-tcl/xml-8.0.tcl tclxml-tcl/xml-8.1.tcl tclxml-tcl/sgmlparser.tcl tclxml-tcl/tclparser-8.0.tcl tclxml-tcl/tclparser-8.1.tcl tclxml-tcl/xmldep.tcl tclxml-tcl/xpath.tcl tcldom-libxml2.tcl tcldom-tcl/xmlswitch.tcl tclxslt/process.tcl tclxslt/resources.tcl tclxslt/utilities.tcl tclxslt/xsltcache.tcl tclxslt-libxslt.tcl]) - -#-------------------------------------------------------------------- -# A few miscellaneous platform-specific items: -# -# We have to define a special symbol for Windows (BUILD_Tclxml in this -# case) so that we create the export library with the dll. -# -# Windows creates a few extra files that need to be cleaned up. -# We can add more files to clean if our extension creates any extra -# files in the future. -# -# TEA_ADD_* any platform specific compiler/build info here. -#-------------------------------------------------------------------- - -CLEANFILES=pkgIndex.tcl -if test "${TEA_PLATFORM}" = "windows" ; then - AC_DEFINE(BUILD_Tclxml, 1, [Build windows export dll]) - CLEANFILES="$CLEANFILES *.lib *.dll *.exp *.ilk *.pdb vc*.pch" -else - : -fi -AC_SUBST(CLEANFILES) - -TEA_PUBLIC_TCL_HEADERS - -#-------------------------------------------------------------------- -# Check whether --enable-threads or --disable-threads was given. -# So far only Tcl responds to this one. -#-------------------------------------------------------------------- - -TEA_ENABLE_THREADS - -#-------------------------------------------------------------------- -# The statement below defines a collection of symbols related to -# building as a shared library instead of a static library. -#-------------------------------------------------------------------- - -TEA_ENABLE_SHARED - -#-------------------------------------------------------------------- -# This macro figures out what flags to use with the compiler/linker -# when building shared/static debug/optimized objects. This information -# can be taken from the tclConfig.sh file, but this figures it all out. -#-------------------------------------------------------------------- - -TEA_CONFIG_CFLAGS - -#-------------------------------------------------------------------- -# Set the default compiler switches based on the --enable-symbols option. -#-------------------------------------------------------------------- - -TEA_ENABLE_SYMBOLS - -#-------------------------------------------------------------------- -# Everyone should be linking against the Tcl stub library. If you -# can't for some reason, remove this definition. If you aren't using -# stubs, you also need to modify the SHLIB_LD_LIBS setting below to -# link against the non-stubbed Tcl library. -#-------------------------------------------------------------------- - -AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs]) - -#-------------------------------------------------------------------- -# This macro generates a line to use when building a library. It -# depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS, -# and TEA_LOAD_TCLCONFIG macros above. -#-------------------------------------------------------------------- - -TEA_MAKE_LIB - -#-------------------------------------------------------------------- -# On Mac OS X we may want to build as a framework. -# This affects the location and naming of headers and libaries. -#-------------------------------------------------------------------- - -AC_ARG_ENABLE(framework, [ --enable-framework build as a Mac OS X framework], - [tcl_ok=$enableval], [tcl_ok=$1]) - -#-------------------------------------------------------------------- -# Load libxml2 configuration -#-------------------------------------------------------------------- - -AC_MSG_CHECKING([for xml2-config script]) - -AC_ARG_WITH(xml2-config, - [ --with-xml2-config the xml2-config configuration script], - with_xml2_config=${withval}) - -LIBXML2_CONFIG= -if test "x${with_xml2_config}" = "x" ; then - for c in \ - /Library/Frameworks/libxml.framework/Resources/Scripts/xml2-config \ - ${prefix}/bin/xml2-config \ - /usr/bin/xml2-config \ - /usr/local/bin/xml2-config - do - if test -x "$c" ; then - LIBXML2_CONFIG="$c" - break - fi - done -else - LIBXML2_CONFIG="${with_xml2_config}" -fi -if test "x$LIBXML2_CONFIG" = "x" ; then - AC_MSG_ERROR([unable to find xml2-config]) -else - AC_MSG_RESULT([${LIBXML2_CONFIG}]) - XML2_VERSION=`${LIBXML2_CONFIG} --version` - XML2_PREFIX=`${LIBXML2_CONFIG} --prefix` - XML2_LIBS="`${LIBXML2_CONFIG} --libs`" - XML2_CFLAGS=`${LIBXML2_CONFIG} --cflags` -fi - -AC_SUBST(XML2_PREFIX) -AC_SUBST(XML2_CFLAGS) -AC_SUBST(XML2_VERSION) - -#-------------------------------------------------------------------- -# Load libxslt configuration -#-------------------------------------------------------------------- - -AC_MSG_CHECKING([for xslt-config script]) - -AC_ARG_WITH(xslt-config, - [ --with-xslt-config the xslt-config configuration script], - with_xslt_config=${withval}) - -LIBXSLT_CONFIG= -if test "x${with_xslt_config}" = "x" ; then - if test "x${with_xml2_config}" = "x" ; then - : - else - if test -x "`dirname ${with_xml2_config}`/xslt-config" ; then - LIBXSLT_CONFIG="`dirname ${with_xml2_config}`/xslt-config" - fi - fi -else - LIBXSLT_CONFIG="${with_xslt_config}" -fi -if test "x${LIBXSLT_CONFIG}" = "x" ; then - for c in \ - /Library/Frameworks/libxslt.framework/Resources/Scripts/xslt-config \ - ${prefix}/bin/xslt-config \ - /usr/bin/xslt-config \ - /usr/local/bin/xslt-config - do - if test -x "$c" ; then - LIBXSLT_CONFIG="$c" - break - fi - done -fi -if test "x$LIBXSLT_CONFIG" = "x" ; then - AC_MSG_ERROR([unable to find xslt-config script]) -else - AC_MSG_RESULT([${LIBXSLT_CONFIG}]) - XSLT_VERSION=`${LIBXSLT_CONFIG} --version` - XSLT_PREFIX=`${LIBXSLT_CONFIG} --prefix` - XSLT_CFLAGS=`${LIBXSLT_CONFIG} --cflags` - XSLT_LIBS="`${LIBXSLT_CONFIG} --libs` -lexslt" -fi - -AC_SUBST(XSLT_VERSION) -AC_SUBST(XSLT_PREFIX) -AC_SUBST(XSLT_CFLAGS) - -#-------------------------------------------------------------------- -# See if we want to statically link the libxml2 and libxslt -# libraries. This is desirable for Tclkit. -#-------------------------------------------------------------------- - -AC_MSG_CHECKING([for static linking of XML/XSLT libraries]) - -AC_ARG_WITH(xml-static, - [ --with-xml-static statically link the XML libraries], - with_xml_static=${withval}) - -XML_STATIC="0" -if test "${with_xml_static}" = "1" ; then - XML_STATIC="1" - AC_MSG_RESULT([use static linking]) -else - AC_MSG_RESULT([use dynamic linking]) -fi - -AC_SUBST(XML_STATIC) - -#-------------------------------------------------------------------- -# __CHANGE__ -# Add platform libs to LIBS or SHLIB_LD_LIBS as necessary. -#-------------------------------------------------------------------- - -FIX_LIB=":" -if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${LIBXSLT_LIBDIR}/libxslt.lib`\"" - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${LIBXSLT_LIBDIR}/libexslt.lib`\"" - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${LIBXML2_LIBDIR}/libxml2.lib`\"" -else -if test "${XML_STATIC}" = "0" ; then - echo "setting up dynamic linking" - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${XSLT_LIBS}" -else - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${XSLT_PREFIX}/lib/libexslt.a" - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${XSLT_PREFIX}/lib/libxslt.a" - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${XML2_PREFIX}/lib/libxml2.a" - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -L/usr/lib -lgcrypt -lgpg-error -lz -lm" - XML2_LIBS= - XSLT_LIBS= - FIX_LIB="chcon -t texrel_shlib_t" -fi -fi - -# Enabling static linking modifies the setting of the libraries, -# so delay substitution until this point. -AC_SUBST(XML2_LIBS) -AC_SUBST(XSLT_LIBS) -AC_SUBST(FIX_LIB) - -#-------------------------------------------------------------------- -# Find tclsh so that we can run pkg_mkIndex to generate the pkgIndex.tcl -# file during the install process. Don't run the TCLSH_PROG through -# ${CYGPATH} because it's being used directly by make. -# Require that we use a tclsh shell version 8.2 or later since earlier -# versions have bugs in the pkg_mkIndex routine. -# Add WISH as well if this is a Tk extension. -#-------------------------------------------------------------------- - -TEA_PROG_TCLSH - -#-------------------------------------------------------------------- -# These are for tclxmlConfig.sh -#-------------------------------------------------------------------- - -# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib) -eval pkglibdir="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}" -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - eval Tclxml_LIB_FLAG="-l${PACKAGE_NAME}${PACKAGE_VERSION}${DBGX}" -else - eval Tclxml_LIB_FLAG="-l${PACKAGE_NAME}`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" -fi -Tclxml_BUILD_LIB_SPEC="-L`pwd` ${Tclxml_LIB_FLAG}" -Tclxml_LIB_SPEC="-L${pkglibdir} ${Tclxml_LIB_FLAG}" - -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - eval Tclxml_STUB_LIB_FLAG="-l${PACKAGE_NAME}stub${PACKAGE_VERSION}${DBGX}" -else - eval Tclxml_STUB_LIB_FLAG="-l${PACKAGE_NAME}stub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" -fi -Tclxml_BUILD_STUB_LIB_SPEC="-L`pwd` ${Tclxml_STUB_LIB_FLAG}" -Tclxml_STUB_LIB_SPEC="-L${pkglibdir} ${Tclxml_STUB_LIB_FLAG}" -Tclxml_BUILD_STUB_LIB_PATH="`pwd`/${Tclxmlstub_LIB_FILE}" -Tclxml_STUB_LIB_PATH="${pkglibdir}/${Tclxmlstub_LIB_FILE}" -eval pkgincludedir="${includedir}" -Tclxml_INCLUDE_SPEC="-I${pkgincludedir}" - -AC_SUBST(Tclxml_BUILD_LIB_SPEC) -AC_SUBST(Tclxml_LIB_SPEC) -AC_SUBST(Tclxml_BUILD_STUB_LIB_SPEC) -AC_SUBST(Tclxml_STUB_LIB_SPEC) -AC_SUBST(Tclxml_BUILD_STUB_LIB_PATH) -AC_SUBST(Tclxml_STUB_LIB_PATH) -AC_SUBST(Tclxml_INCLUDE_SPEC) - -#-------------------------------------------------------------------- -# TODO: search for an appropriate xsltproc to use -#-------------------------------------------------------------------- - -XSLTPROC=xsltproc -AC_SUBST(XSLTPROC) - -#-------------------------------------------------------------------- -# Finally, substitute all of the various values into the Makefile. -# You may alternatively have a special pkgIndex.tcl.in or other files -# which require substituting th AC variables in. Include these here. -#-------------------------------------------------------------------- - -AC_OUTPUT([Makefile Makefile.macosx pkgIndex.tcl TclxmlConfig.sh include/tclxml/tclxml.h doc/tclxml.xml doc/tcldom.xml doc/tclxslt.xml doc/README.xml]) - -#-------------------------------------------------------------------- -- cgit v0.12