Check-in [a8386e13ed]
Overview
Comment:Added support for specifying a list of optional packages
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:a8386e13edf2a4f6d39bd5da8f5188fb43fc78b7
User & Date: rkeene on 2010-09-26 04:41:36
Other Links: manifest | tags
Context
2010-09-26
04:41
Fixed issue with kitcreator including excluded packages after building with them and then building without them

Fixed issue with Tcl pure-Tcl Metakit and Tcl 8.4 check-in: 32589cdef2 user: rkeene tags: trunk

04:41
Added support for specifying a list of optional packages check-in: a8386e13ed user: rkeene tags: trunk
04:41
Clarified licensing terms

Updated "clean"/"distclean" options to clean optional packages check-in: e251d16623 user: rkeene tags: trunk

Changes

Modified README from [f879dbf338] to [92c264cba0].

    72     72   		Specify this as "1" to statically link to Tk.  The default
    73     73   		action on most platforms is to dynamically link to Tk.
    74     74   
    75     75   	5. STRIP
    76     76   		Specifies the tool you wish to be called to strip object files,
    77     77   		archives, and shared objects.  The default is "strip".  You
    78     78   		should probably set this if you are cross-compiling.
           79  +
           80  +	6. KITCREATOR_PKGS
           81  +		Specify which non-required packages to build.  The default list
           82  +		is:
           83  +			tk itcl mk4tcl
           84  +		If mk4tcl is not present a pure-Tcl implementation will be used
           85  +		instead.
    79     86   
    80     87   
    81     88   -------------------
    82     89   Method of Operation
    83     90   -------------------
    84     91   Summary:
    85     92   	1. "kitcreator" calls */build.sh

Modified kitcreator from [2e7fd89fb9] to [fd4b02e79e].

     3      3   TCLVERS="8.4.19"
     4      4   if echo "$1" | grep '^[0-9][0-9]*\.' >/dev/null || echo "$1" | grep '^cvs_' >/dev/null; then
     5      5   	TCLVERS="$1"
     6      6   
     7      7   	shift
     8      8   fi
     9      9   export TCLVERS
           10  +
           11  +# Add packages implied by the additional arguments
           12  +if [ -z "${KITCREATOR_PKGS}" ]; then
           13  +	KITCREATOR_PKGS="tk itcl mk4tcl"
           14  +fi
    10     15   
    11     16   mode="build"
    12     17   if [ "$1" = "clean" ]; then
    13     18   	shift
    14     19   
    15     20   	mode="clean"
    16     21   fi
................................................................................
    18     23   	shift
    19     24   
    20     25   	mode="distclean"
    21     26   fi
    22     27   
    23     28   if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
    24     29   	# List all additional packages here so that they get cleaned up
    25         -	ADDPKGS="${ADDPKGS} thread"
           30  +	KITCREATOR_PKGS="${KITCREATOR_PKGS} thread"
    26     31   fi
    27     32   
    28     33   CONFIGUREEXTRA="$@"
    29     34   export CONFIGUREEXTRA
    30     35   
    31         -# Add packages implied by the additional arguments
    32     36   if echo " ${CONFIGUREEXTRA} " | grep ' --enable-threads' >/dev/null 2>/dev/null; then
    33         -	ADDPKGS="${ADDPKGS} thread"
           37  +	KITCREATOR_PKGS="${KITCREATOR_PKGS} thread"
    34     38   fi
    35     39   
    36     40   failedpkgs=""
    37     41   buildfailed="0"
    38         -for pkg in tcl tk itcl mk4tcl tclvfs zlib ${ADDPKGS} kitsh; do
           42  +for pkg in tcl tclvfs zlib ${KITCREATOR_PKGS} kitsh; do
    39     43   	if [ "${mode}" = "distclean" ]; then
    40     44   		rm -rf "${pkg}/src"
    41     45   	fi
    42     46   
    43     47   	if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
    44     48   		rm -f "${pkg}/build.log"
    45     49   		rm -rf "${pkg}/out" "${pkg}/inst" "${pkg}/build"