Overview
Comment: | Updated KitDLL to search for libraries to link to from other projects
Added KitDLL prepartion and checking to pre-release initialization script |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
4f4058fd40430200f673a554f50c2910 |
User & Date: | rkeene on 2010-09-30 06:39:29 |
Other Links: | manifest | tags |
Context
2010-09-30
| ||
08:16 | Updated to copy all KitDLL related files to build directory check-in: 256ca73ea3 user: rkeene tags: trunk | |
06:39 |
Updated KitDLL to search for libraries to link to from other projects
Added KitDLL prepartion and checking to pre-release initialization script check-in: 4f4058fd40 user: rkeene tags: trunk | |
06:25 | Fixed KitDLL cleanup check-in: 581ba55290 user: rkeene tags: trunk | |
Changes
Modified build/pre.sh from [af3b94cbc4] to [0906205539].
1 2 3 4 5 6 | #! /bin/bash ./kitcreator distclean KITSHROOTDIR="$(ls -1d kitsh/buildsrc/kitsh-*/)" export KITSHROOTDIR | < > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #! /bin/bash ./kitcreator distclean KITSHROOTDIR="$(ls -1d kitsh/buildsrc/kitsh-*/)" export KITSHROOTDIR ( cd "${KITSHROOTDIR}" || exit 1 autoconf; autoheader rm -rf autom4te.cache rm -f *~ ./configure || exit 1 make boot.tcl.h make zipvfs.tcl.h make distclean ) || exit 1 KITDLLROOTDIR="$(ls -1d kitdll/buildsrc/kitdll-*/)" export KITDLLROOTDIR ( cd "${KITDLLROOTDIR}" || exit 1 autoconf; autoheader rm -rf autom4te.cache rm -f *~ ./configure || exit 1 make vfs_kitdll.tcl.h || exit 1 make distclean ) || exit 1 rm -rf tcl/patchscripts/ find . -name '.*.sw?' -type f | xargs rm -f |
Modified kitdll/buildsrc/kitdll-0.0/Makefile.in from [a774052095] to [8e72ba30c3].
1 2 3 4 5 6 | CC = @CC@ CFLAGS = @CFLAGS@ @SHOBJFLAGS@ -Wall CPPFLAGS = @CPPFLAGS@ @DEFS@ -DKITDLL_MAKE_LOADABLE=1 LDFLAGS = @LDFLAGS@ SHOBJLDFLAGS = @SHOBJLDFLAGS@ LIBS = @LIBS@ | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | CC = @CC@ CFLAGS = @CFLAGS@ @SHOBJFLAGS@ -Wall CPPFLAGS = @CPPFLAGS@ @DEFS@ -DKITDLL_MAKE_LOADABLE=1 LDFLAGS = @LDFLAGS@ SHOBJLDFLAGS = @SHOBJLDFLAGS@ LIBS = @LIBS@ STATICLIBS = @TCL_LIB_SPEC@ @ARCHS@ OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o TCLSH_NATIVE = tclsh # Default target all: libtcl.@SHOBJEXT@ # Build targets |
︙ | ︙ | |||
43 44 45 46 47 48 49 50 51 | rm -f vfs_kitdll.tcl.h rm -f tclsh.o tclsh distclean: clean rm -f config.status config.log rm -f *~ rm -f Makefile .PHONY: all clean distclean | > > | 43 44 45 46 47 48 49 50 51 52 53 | rm -f vfs_kitdll.tcl.h rm -f tclsh.o tclsh distclean: clean rm -f config.status config.log rm -f *~ rm -f Makefile mrproper: distclean .PHONY: all clean distclean |
Modified kitdll/buildsrc/kitdll-0.0/aclocal.m4 from [11cdd07597] to [d62a4ca24d].
︙ | ︙ | |||
211 212 213 214 215 216 217 | AC_DEFINE(BUILD_tk, [1], [Define if you need to pretend to be building Tk (Windows)]) ;; cygwin*) CFLAGS="${CFLAGS} -mms-bitfields" ;; esac ]) | > > > > > > > > > > > > > > > > > > | 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | AC_DEFINE(BUILD_tk, [1], [Define if you need to pretend to be building Tk (Windows)]) ;; cygwin*) CFLAGS="${CFLAGS} -mms-bitfields" ;; esac ]) AC_DEFUN(DC_FIND_TCLKIT_LIBS, [ DC_SETUP_TCL_PLAT_DEFS for proj in tclvfs; do AC_MSG_CHECKING([for libraries required for ${proj}]) libdir="../../../${proj}/inst" libfiles="`find "${libdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`" libfilesnostub="`find "${libdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`" ARCHS="${ARCHS} ${libfiles}" AC_MSG_RESULT([${libfiles}]) done AC_SUBST(ARCHS) ]) |
Modified kitdll/buildsrc/kitdll-0.0/configure.ac from [7bffd4dfcb] to [2b5889687d].
1 2 3 4 5 6 7 8 9 10 11 12 | dnl What are we running AC_INIT(kitdll, 0.0) dnl Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET AC_PROG_INSTALL AC_AIX AC_GNU_SOURCE dnl Determine system information DC_CHK_OS_INFO | < > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | dnl What are we running AC_INIT(kitdll, 0.0) dnl Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET AC_PROG_INSTALL AC_AIX AC_GNU_SOURCE dnl Determine system information DC_CHK_OS_INFO dnl Find the appropriate libraries to link to AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ]) AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ]) dnl Determine how to create a shared object DC_GET_SHOBJFLAGS dnl Find the appropriate Tcl headers and libraries DC_DO_TCL dnl Check for Tcl features SAVE_LIBS="${LIBS}" LIBS="${ARCHS} ${LIBS}" dnl Check for the ability to get the current system encoding AC_CHECK_FUNCS(Tcl_GetEncodingNameFromEnvironment Tcl_SetSystemEncoding) LIBS="${SAVE_LIBS}" dnl Find required libs DC_FIND_TCLKIT_LIBS dnl Check for optional headers AC_HEADER_STDC AC_CHECK_HEADERS(unistd.h string.h strings.h) dnl Produce output AC_OUTPUT(Makefile) |