Check-in [4f4058fd40]
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:4f4058fd40430200f673a554f50c29103ac54a67
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      1   #! /bin/bash
     2      2   
     3      3   ./kitcreator distclean
     4      4   
     5      5   KITSHROOTDIR="$(ls -1d kitsh/buildsrc/kitsh-*/)"
     6      6   export KITSHROOTDIR
     7         -
     8      7   (
     9      8   	cd "${KITSHROOTDIR}" || exit 1
    10      9   
    11     10   	autoconf; autoheader
    12     11   	rm -rf autom4te.cache
    13     12   	rm -f *~
    14     13   
    15     14   	./configure || exit 1
    16     15   	make boot.tcl.h
    17     16   	make zipvfs.tcl.h
    18     17   
           18  +	make distclean
           19  +) || exit 1
           20  +
           21  +KITDLLROOTDIR="$(ls -1d kitdll/buildsrc/kitdll-*/)"
           22  +export KITDLLROOTDIR
           23  +(
           24  +	cd "${KITDLLROOTDIR}" || exit 1
           25  +
           26  +	autoconf; autoheader
           27  +	rm -rf autom4te.cache
           28  +	rm -f *~
           29  +
           30  +	./configure || exit 1
           31  +	make vfs_kitdll.tcl.h || exit 1
           32  +
    19     33   	make distclean
    20     34   ) || exit 1
    21     35   
    22     36   rm -rf tcl/patchscripts/
    23     37   
    24     38   find . -name '.*.sw?' -type f | xargs rm -f

Modified kitdll/buildsrc/kitdll-0.0/Makefile.in from [a774052095] to [8e72ba30c3].

     1      1   CC = @CC@
     2      2   CFLAGS = @CFLAGS@ @SHOBJFLAGS@ -Wall
     3      3   CPPFLAGS = @CPPFLAGS@ @DEFS@ -DKITDLL_MAKE_LOADABLE=1
     4      4   LDFLAGS = @LDFLAGS@
     5      5   SHOBJLDFLAGS = @SHOBJLDFLAGS@
     6      6   LIBS = @LIBS@
     7         -STATICLIBS = @TCL_LIB_SPEC@ ../../../tclvfs/inst/lib/vfs1.3/libvfs1.3.a
            7  +STATICLIBS = @TCL_LIB_SPEC@ @ARCHS@
     8      8   OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o
     9      9   TCLSH_NATIVE = tclsh
    10     10   
    11     11   # Default target
    12     12   all: libtcl.@SHOBJEXT@
    13     13   
    14     14   # Build targets
................................................................................
    43     43   	rm -f vfs_kitdll.tcl.h
    44     44   	rm -f tclsh.o tclsh
    45     45   
    46     46   distclean: clean
    47     47   	rm -f config.status config.log
    48     48   	rm -f *~
    49     49   	rm -f Makefile
           50  +
           51  +mrproper: distclean
    50     52   
    51     53   .PHONY: all clean distclean

Modified kitdll/buildsrc/kitdll-0.0/aclocal.m4 from [11cdd07597] to [d62a4ca24d].

   211    211   			AC_DEFINE(BUILD_tk, [1], [Define if you need to pretend to be building Tk (Windows)])
   212    212   			;;
   213    213   		cygwin*)
   214    214   			CFLAGS="${CFLAGS} -mms-bitfields"
   215    215   			;;
   216    216   	esac
   217    217   ])
          218  +
          219  +AC_DEFUN(DC_FIND_TCLKIT_LIBS, [
          220  +	DC_SETUP_TCL_PLAT_DEFS
          221  +
          222  +	for proj in tclvfs; do
          223  +		AC_MSG_CHECKING([for libraries required for ${proj}])
          224  +
          225  +		libdir="../../../${proj}/inst"
          226  +		libfiles="`find "${libdir}" -name '*.a' 2>/dev/null | tr "\n" ' '`"
          227  +		libfilesnostub="`find "${libdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`"
          228  +
          229  +		ARCHS="${ARCHS} ${libfiles}"
          230  +
          231  +		AC_MSG_RESULT([${libfiles}])
          232  +	done
          233  +
          234  +	AC_SUBST(ARCHS)
          235  +])

Modified kitdll/buildsrc/kitdll-0.0/configure.ac from [7bffd4dfcb] to [2b5889687d].

     6      6   AC_PROG_MAKE_SET
     7      7   AC_PROG_INSTALL
     8      8   AC_AIX
     9      9   AC_GNU_SOURCE
    10     10   
    11     11   dnl Determine system information
    12     12   DC_CHK_OS_INFO
    13         -DC_SETUP_TCL_PLAT_DEFS
    14     13   
    15     14   dnl Find the appropriate libraries to link to
    16     15   AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
    17     16   AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])
    18     17   
    19     18   dnl Determine how to create a shared object
    20     19   DC_GET_SHOBJFLAGS
................................................................................
    24     23   
    25     24   dnl Check for Tcl features
    26     25   SAVE_LIBS="${LIBS}"
    27     26   LIBS="${ARCHS} ${LIBS}"
    28     27   dnl Check for the ability to get the current system encoding
    29     28   AC_CHECK_FUNCS(Tcl_GetEncodingNameFromEnvironment Tcl_SetSystemEncoding)
    30     29   LIBS="${SAVE_LIBS}"
           30  +
           31  +dnl Find required libs
           32  +DC_FIND_TCLKIT_LIBS
    31     33   
    32     34   dnl Check for optional headers
    33     35   AC_HEADER_STDC
    34     36   AC_CHECK_HEADERS(unistd.h string.h strings.h)
    35     37   
    36     38   dnl Produce output
    37     39   AC_OUTPUT(Makefile)