Check-in [fe17341989]
Overview
Comment:Renamed library built by KitDLL to include version number by default
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:fe17341989e425f65455994f02e47c97d2245a4d
User & Date: rkeene on 2010-10-01 23:46:58
Other Links: manifest | tags
Context
2010-10-02
03:02
Updated to support a limit on how much seeking is done looking for a zip header check-in: acdc36a7e0 user: rkeene tags: trunk
2010-10-01
23:46
Renamed library built by KitDLL to include version number by default check-in: fe17341989 user: rkeene tags: trunk
20:49
Updated to not provide pkgIndex.tcl for Tk if building statically check-in: 5970f1de2e user: rkeene tags: trunk
Changes

Modified kitcreator from [1b7030d641] to [2a70843ef3].

    31     31   		rm -rf "${pkg}/src"
    32     32   	fi
    33     33   done
    34     34   
    35     35   # We're all done if we're in clean or distclean mode
    36     36   if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
    37     37   	rm -f tclkit-*
    38         -	rm -f libtclkit-*.*
           38  +	rm -f libtclkit*.*
    39     39   
    40     40   	exit 0
    41     41   fi
    42     42   
    43     43   # Add packages implied by the additional arguments
    44     44   if [ -z "${KITCREATOR_PKGS}" ]; then
    45     45   	KITCREATOR_PKGS="tk itcl mk4tcl"
................................................................................
   112    112   	echo "Failed to build:${failedpkgs}"
   113    113   fi
   114    114   
   115    115   if [ "${buildfailed}" != "0" ]; then
   116    116   	echo 'WARNING: Build is likely incomplete or failed.' >&2
   117    117   fi
   118    118   
   119         -for kitdllfile in 'kitdll/build'/kitdll-*/libtclkit.*; do
   120         -	cp "${kitdllfile}" "$(echo "${kitdllfile}" | sed "s@^.*/@@;s@\..*\$@-${TCLVERS}&@")" >/dev/null 2>/dev/null
   121         -done
          119  +cp 'kitdll/build'/kitdll-*/libtclkit* . >/dev/null 2>/dev/null
   122    120   cp 'kitsh/build'/kitsh-*/kit "tclkit-${TCLVERS}" >/dev/null 2>/dev/null
   123    121   
   124    122   exit "${buildfailed}"

Modified kitdll/build.sh from [e1e2ad264c] to [4f055580a0].

   100    100   	echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
   101    101   	./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
   102    102   
   103    103   	echo "Running: ${MAKE:-make}"
   104    104   	${MAKE:-make} TCLSH_NATIVE="${TCLSH_NATIVE}" || exit 1
   105    105   
   106    106   	# Strip the KitDLL of debugging symbols, if possible
   107         -	"${STRIP:-strip}" -g libtclkit.* >/dev/null 2>/dev/null
          107  +	"${STRIP:-strip}" -g libtclkit* >/dev/null 2>/dev/null
   108    108   
   109    109   	exit 0
   110    110   ) || exit 1
   111    111   
   112    112   exit 0

Modified kitdll/buildsrc/kitdll-0.0/Makefile.in from [1e7d1c5fcd] to [1305499925].

     7      7   LIBS = @LIBS@
     8      8   STATICLIBS = @ARCHS@
     9      9   OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o
    10     10   EXTRA_OBJS = @EXTRA_OBJS@
    11     11   TCLSH_NATIVE = tclsh
    12     12   
    13     13   # Default target
    14         -all: libtclkit.@SHOBJEXT@
           14  +all: libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
    15     15   
    16     16   # Build targets
    17     17   ## VFS Build
    18     18   vfs_kitdll_data_tcl.o: vfs_kitdll_data_tcl.c
    19     19   vfs_kitdll_data_tcl.c: dir2c.tcl starpack.vfs vfs_kitdll_data.c
    20     20   	"$(TCLSH_NATIVE)" dir2c.tcl tcl starpack.vfs > vfs_kitdll_data_tcl.c
    21     21   
................................................................................
    25     25   	"$(TCLSH_NATIVE)" ./stringify.tcl vfs_kitdll.tcl > vfs_kitdll.tcl.h
    26     26   
    27     27   ## Extensions
    28     28   rechan.o: rechan.c
    29     29   pwb.o: pwb.c
    30     30   
    31     31   ## DLL Build
    32         -libtclkit.@SHOBJEXT@: $(OBJS) $(EXTRA_OBJS)
    33         -	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS)
           32  +libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@: $(OBJS) $(EXTRA_OBJS)
           33  +	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS)
    34     34   
    35     35   # Test driver
    36     36   tclsh.o: tclsh.c
    37         -tclsh: tclsh.o $(EXTRA_OBJS) libtclkit.@SHOBJEXT@
    38         -	$(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o $(EXTRA_OBJS) -L. -ltclkit -Wl,-R,`pwd`
           37  +tclsh: tclsh.o $(EXTRA_OBJS) libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
           38  +	$(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o $(EXTRA_OBJS) -L. -ltclkit@KITDLL_LIB_VERSION@ -Wl,-R,`pwd`
    39     39   
    40     40   wish.o: wish.c
    41         -wish: wish.o $(EXTRA_OBJS) libtclkit.@SHOBJEXT@
    42         -	$(CC) $(CPPFLAGS) $(CFLAGS) $(WISH_CFLAGS) -o wish wish.o $(EXTRA_OBJS) -L. -ltclkit -Wl,-R,`pwd`
           41  +wish: wish.o $(EXTRA_OBJS) libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
           42  +	$(CC) $(CPPFLAGS) $(CFLAGS) $(WISH_CFLAGS) -o wish wish.o $(EXTRA_OBJS) -L. -ltclkit@KITDLL_LIB_VERSION@ -Wl,-R,`pwd`
    43     43   
    44     44   # Cleanup routeines
    45     45   clean:
    46         -	rm -f libtclkit.@SHOBJEXT@
           46  +	rm -f libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
    47     47   	rm -f $(OBJS)
    48     48   	rm -f vfs_kitdll_data_tcl.c
    49     49   	rm -f vfs_kitdll.tcl.h
    50     50   	rm -f tclsh.o tclsh tclsh.exe
    51     51   	rm -f wish.o wish wish.exe
    52     52   
    53     53   distclean: clean

Modified kitdll/buildsrc/kitdll-0.0/aclocal.m4 from [5c684392af] to [0eda8eddf5].

   118    118   
   119    119   	if test -f "${tclconfigsh}"; then
   120    120   		. "${tclconfigsh}"
   121    121   
   122    122   		CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
   123    123   		CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
   124    124   		LIBS="${LIBS} ${TCL_LIBS}"
          125  +
          126  +		KITDLL_LIB_VERSION=`echo "${TCL_VERSION}${TCL_PATCH_LEVEL}" | sed 's@\.@@g'`
   125    127   	fi
   126    128   
   127    129   	AC_SUBST(CFLAGS)
   128    130   	AC_SUBST(CPPFLAGS)
   129    131   	AC_SUBST(LIBS)
   130    132   
   131         -	AC_SUBST(TCL_LIB_SPEC)
          133  +	AC_SUBST(KITDLL_LIB_VERSION)
   132    134   
   133    135   	AC_MSG_RESULT([$tclconfigsh])
   134    136   ])
   135    137   
   136    138   AC_DEFUN(DC_DO_TK, [
   137    139   	AC_MSG_CHECKING([path to tk])
   138    140   	AC_ARG_WITH(tk, AC_HELP_STRING([--with-tk], [directory containing tk configuration (tkConfig.sh)]), [], [