Check-in [f547179798]
Overview
Comment:Fixed KitDLL Build script to correctly create VFS directory before calling make

Added KitDLL cleaning to main kitcreator top-level build script

Updated to allow KitDLL to ship

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:f5471797989ba3b54b092f42a7dd1290f11776bb
User & Date: rkeene on 2010-09-30 06:24:04
Other Links: manifest | tags
Context
2010-09-30
06:25
Fixed KitDLL cleanup check-in: 581ba55290 user: rkeene tags: trunk
06:24
Fixed KitDLL Build script to correctly create VFS directory before calling make

Added KitDLL cleaning to main kitcreator top-level build script

Updated to allow KitDLL to ship check-in: f547179798 user: rkeene tags: trunk

05:54
Added kitdll top-level build script check-in: f05f6abdf1 user: rkeene tags: trunk
Changes

Modified build/pre.sh from [801a4c1f97] to [af3b94cbc4].

    17     17   	make zipvfs.tcl.h
    18     18   
    19     19   	make distclean
    20     20   ) || exit 1
    21     21   
    22     22   rm -rf tcl/patchscripts/
    23     23   
    24         -rm -rf kitdll
    25         -
    26     24   find . -name '.*.sw?' -type f | xargs rm -f

Modified kitcreator from [f500eec8e3] to [10513cf856].

    18     18   if [ "$1" = "distclean" ]; then
    19     19   	shift
    20     20   
    21     21   	mode="distclean"
    22     22   fi
    23     23   
    24     24   # Define the list of all packages, for cleaning purposes
    25         -KITCREATOR_ALLPKGS="kitsh tcl tclvfs zlib tk itcl mk4tcl thread"
           25  +KITCREATOR_ALLPKGS="kitsh tcl tclvfs zlib tk itcl mk4tcl thread kitdll"
    26     26   for pkg in ${KITCREATOR_ALLPKGS}; do
    27     27   	rm -f "${pkg}/build.log"
    28     28   	rm -rf "${pkg}/out" "${pkg}/inst" "${pkg}/build"
    29     29   
    30     30   	if [ "${mode}" = "distclean" ]; then
    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 libtcl.*
    38     39   
    39     40   	exit 0
    40     41   fi
    41     42   
    42     43   # Add packages implied by the additional arguments
    43     44   if [ -z "${KITCREATOR_PKGS}" ]; then
    44     45   	KITCREATOR_PKGS="tk itcl mk4tcl"
................................................................................
    86     87   	echo "Failed to build:${failedpkgs}"
    87     88   fi
    88     89   
    89     90   if [ "${buildfailed}" != "0" ]; then
    90     91   	echo 'WARNING: Build is likely incomplete or failed.' >&2
    91     92   fi
    92     93   
           94  +cp 'kitdll/build'/kitdll-*/libtcl.* "$(basename 'kitdll/build'/kitdll-*/libtcl.* | sed "s@\..*\$@-${TCLVERS}&@")" >/dev/null 2>/dev/null
    93     95   cp 'kitsh/build'/kitsh-*/kit "tclkit-${TCLVERS}"
    94     96   
    95     97   exit "${buildfailed}"

Modified kitdll/build.sh from [a2f7dfd11c] to [d547391b05].

    32     32   
    33     33   			break
    34     34   		fi
    35     35   	done
    36     36   
    37     37   	# Cleanup, just incase the incoming directory was not pre-cleaned
    38     38   	${MAKE:-make} distclean >/dev/null 2>/dev/null
    39         -
    40         -	echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    41         -	./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    42         -
    43         -	echo "Running: ${MAKE:-make}"
    44         -	${MAKE:-make} TCLSH_NATIVE="${TCLSH_NATIVE}" || exit 1
    45         -
    46         -	# Strip the KitDLL of debugging symbols, if possible
    47         -	"${STRIP:-strip}" -g libtcl.* >/dev/null 2>/dev/null
           39  +	rm -rf "starpack.vfs"
    48     40   
    49     41   	# Create VFS directory
    50     42   	mkdir "starpack.vfs"
    51     43   	mkdir "starpack.vfs/lib"
    52     44   
    53     45   	## Copy in required built directories
    54     46   	cp -r "${OTHERPKGSDIR}"/tcl/out/* 'starpack.vfs/'
................................................................................
    57     49   
    58     50   	## Rename the "vfs" package directory to what "boot.tcl" expects
    59     51   	mv 'starpack.vfs/lib'/vfs* 'starpack.vfs/lib/vfs'
    60     52   
    61     53   	## Install "boot.tcl"
    62     54   	cp 'boot.tcl' 'starpack.vfs/'
    63     55   
           56  +	# Build KitDLL
           57  +	echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
           58  +	./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           59  +
           60  +	echo "Running: ${MAKE:-make}"
           61  +	${MAKE:-make} TCLSH_NATIVE="${TCLSH_NATIVE}" || exit 1
           62  +
           63  +	# Strip the KitDLL of debugging symbols, if possible
           64  +	"${STRIP:-strip}" -g libtcl.* >/dev/null 2>/dev/null
           65  +
    64     66   	exit 0
    65     67   ) || exit 1
    66     68   
    67     69   exit 0