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
32
33
34
35
36
37
38
39
40
41
42
43
44
45
...
112
113
114
115
116
117
118
119
120
121
122
123
124
|
rm -rf "${pkg}/src"
fi
done
# We're all done if we're in clean or distclean mode
if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
rm -f tclkit-*
rm -f libtclkit-*.*
exit 0
fi
# Add packages implied by the additional arguments
if [ -z "${KITCREATOR_PKGS}" ]; then
KITCREATOR_PKGS="tk itcl mk4tcl"
................................................................................
echo "Failed to build:${failedpkgs}"
fi
if [ "${buildfailed}" != "0" ]; then
echo 'WARNING: Build is likely incomplete or failed.' >&2
fi
for kitdllfile in 'kitdll/build'/kitdll-*/libtclkit.*; do
cp "${kitdllfile}" "$(echo "${kitdllfile}" | sed "s@^.*/@@;s@\..*\$@-${TCLVERS}&@")" >/dev/null 2>/dev/null
done
cp 'kitsh/build'/kitsh-*/kit "tclkit-${TCLVERS}" >/dev/null 2>/dev/null
exit "${buildfailed}"
|
|
|
<
<
|
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
...
112
113
114
115
116
117
118
119
120
121
122
|
rm -rf "${pkg}/src"
fi
done
# We're all done if we're in clean or distclean mode
if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
rm -f tclkit-*
rm -f libtclkit*.*
exit 0
fi
# Add packages implied by the additional arguments
if [ -z "${KITCREATOR_PKGS}" ]; then
KITCREATOR_PKGS="tk itcl mk4tcl"
................................................................................
echo "Failed to build:${failedpkgs}"
fi
if [ "${buildfailed}" != "0" ]; then
echo 'WARNING: Build is likely incomplete or failed.' >&2
fi
cp 'kitdll/build'/kitdll-*/libtclkit* . >/dev/null 2>/dev/null
cp 'kitsh/build'/kitsh-*/kit "tclkit-${TCLVERS}" >/dev/null 2>/dev/null
exit "${buildfailed}"
|
Modified kitdll/build.sh from [e1e2ad264c] to [4f055580a0].
100 101 102 103 104 105 106 107 108 109 110 111 112 |
echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
echo "Running: ${MAKE:-make}"
${MAKE:-make} TCLSH_NATIVE="${TCLSH_NATIVE}" || exit 1
# Strip the KitDLL of debugging symbols, if possible
"${STRIP:-strip}" -g libtclkit.* >/dev/null 2>/dev/null
exit 0
) || exit 1
exit 0
|
| |
100 101 102 103 104 105 106 107 108 109 110 111 112 |
echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
echo "Running: ${MAKE:-make}"
${MAKE:-make} TCLSH_NATIVE="${TCLSH_NATIVE}" || exit 1
# Strip the KitDLL of debugging symbols, if possible
"${STRIP:-strip}" -g libtclkit* >/dev/null 2>/dev/null
exit 0
) || exit 1
exit 0
|
Modified kitdll/buildsrc/kitdll-0.0/Makefile.in from [1e7d1c5fcd] to [1305499925].
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
..
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
LIBS = @LIBS@
STATICLIBS = @ARCHS@
OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o
EXTRA_OBJS = @EXTRA_OBJS@
TCLSH_NATIVE = tclsh
# Default target
all: libtclkit.@SHOBJEXT@
# Build targets
## VFS Build
vfs_kitdll_data_tcl.o: vfs_kitdll_data_tcl.c
vfs_kitdll_data_tcl.c: dir2c.tcl starpack.vfs vfs_kitdll_data.c
"$(TCLSH_NATIVE)" dir2c.tcl tcl starpack.vfs > vfs_kitdll_data_tcl.c
................................................................................
"$(TCLSH_NATIVE)" ./stringify.tcl vfs_kitdll.tcl > vfs_kitdll.tcl.h
## Extensions
rechan.o: rechan.c
pwb.o: pwb.c
## DLL Build
libtclkit.@SHOBJEXT@: $(OBJS) $(EXTRA_OBJS)
$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS)
# Test driver
tclsh.o: tclsh.c
tclsh: tclsh.o $(EXTRA_OBJS) libtclkit.@SHOBJEXT@
$(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o $(EXTRA_OBJS) -L. -ltclkit -Wl,-R,`pwd`
wish.o: wish.c
wish: wish.o $(EXTRA_OBJS) libtclkit.@SHOBJEXT@
$(CC) $(CPPFLAGS) $(CFLAGS) $(WISH_CFLAGS) -o wish wish.o $(EXTRA_OBJS) -L. -ltclkit -Wl,-R,`pwd`
# Cleanup routeines
clean:
rm -f libtclkit.@SHOBJEXT@
rm -f $(OBJS)
rm -f vfs_kitdll_data_tcl.c
rm -f vfs_kitdll.tcl.h
rm -f tclsh.o tclsh tclsh.exe
rm -f wish.o wish wish.exe
distclean: clean
|
|
|
|
|
|
|
|
|
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
..
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
LIBS = @LIBS@ STATICLIBS = @ARCHS@ OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o EXTRA_OBJS = @EXTRA_OBJS@ TCLSH_NATIVE = tclsh # Default target all: libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ # Build targets ## VFS Build vfs_kitdll_data_tcl.o: vfs_kitdll_data_tcl.c vfs_kitdll_data_tcl.c: dir2c.tcl starpack.vfs vfs_kitdll_data.c "$(TCLSH_NATIVE)" dir2c.tcl tcl starpack.vfs > vfs_kitdll_data_tcl.c ................................................................................ "$(TCLSH_NATIVE)" ./stringify.tcl vfs_kitdll.tcl > vfs_kitdll.tcl.h ## Extensions rechan.o: rechan.c pwb.o: pwb.c ## DLL Build libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@: $(OBJS) $(EXTRA_OBJS) $(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS) # Test driver tclsh.o: tclsh.c tclsh: tclsh.o $(EXTRA_OBJS) libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o $(EXTRA_OBJS) -L. -ltclkit@KITDLL_LIB_VERSION@ -Wl,-R,`pwd` wish.o: wish.c wish: wish.o $(EXTRA_OBJS) libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(CC) $(CPPFLAGS) $(CFLAGS) $(WISH_CFLAGS) -o wish wish.o $(EXTRA_OBJS) -L. -ltclkit@KITDLL_LIB_VERSION@ -Wl,-R,`pwd` # Cleanup routeines clean: rm -f libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ rm -f $(OBJS) rm -f vfs_kitdll_data_tcl.c rm -f vfs_kitdll.tcl.h rm -f tclsh.o tclsh tclsh.exe rm -f wish.o wish wish.exe distclean: clean |
Modified kitdll/buildsrc/kitdll-0.0/aclocal.m4 from [5c684392af] to [0eda8eddf5].
118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 |
if test -f "${tclconfigsh}"; then
. "${tclconfigsh}"
CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
LIBS="${LIBS} ${TCL_LIBS}"
fi
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LIBS)
AC_SUBST(TCL_LIB_SPEC)
AC_MSG_RESULT([$tclconfigsh])
])
AC_DEFUN(DC_DO_TK, [
AC_MSG_CHECKING([path to tk])
AC_ARG_WITH(tk, AC_HELP_STRING([--with-tk], [directory containing tk configuration (tkConfig.sh)]), [], [
|
> > | |
118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 |
if test -f "${tclconfigsh}"; then
. "${tclconfigsh}"
CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
LIBS="${LIBS} ${TCL_LIBS}"
KITDLL_LIB_VERSION=`echo "${TCL_VERSION}${TCL_PATCH_LEVEL}" | sed 's@\.@@g'`
fi
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LIBS)
AC_SUBST(KITDLL_LIB_VERSION)
AC_MSG_RESULT([$tclconfigsh])
])
AC_DEFUN(DC_DO_TK, [
AC_MSG_CHECKING([path to tk])
AC_ARG_WITH(tk, AC_HELP_STRING([--with-tk], [directory containing tk configuration (tkConfig.sh)]), [], [
|