Check-in [977dc16709]
Overview
Comment:Updated KitCreator to only build KitDLL or Tclkit, not both in a single invocation. If KitDLL is requested, no Tclkit will be built.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:977dc167097b7006a4a676c0234cf4d88ce05f0c
User & Date: rkeene on 2010-10-01 20:16:06
Other Links: manifest | tags
Context
2010-10-01
20:18
Updated Tcl build to export DLL functionality when building KitDLL check-in: 07648651bc user: rkeene tags: trunk
20:16
Updated KitCreator to only build KitDLL or Tclkit, not both in a single invocation. If KitDLL is requested, no Tclkit will be built. check-in: 977dc16709 user: rkeene tags: trunk
04:41
Updated to link DLL and wish/tclsh against tkbase.res.o from Wish if building Tk check-in: 83003c57a9 user: rkeene tags: trunk
Changes

Modified kitcreator from [4831102fe2] to [1b7030d641].

    47     47   
    48     48   CONFIGUREEXTRA="$@"
    49     49   export CONFIGUREEXTRA
    50     50   
    51     51   if echo " ${CONFIGUREEXTRA} " | grep ' --enable-threads' >/dev/null 2>/dev/null; then
    52     52   	KITCREATOR_PKGS="${KITCREATOR_PKGS} thread"
    53     53   fi
           54  +
           55  +# Set default target
           56  +KITTARGET="kitsh"
           57  +export KITTARGET
    54     58   
    55     59   # Fix up package list
    56         -## If building KitDLL, it must come last
           60  +## If building KitDLL, define it as our target
    57     61   if echo " ${KITCREATOR_PKGS} " | grep ' kitdll ' >/dev/null 2>/dev/null; then
    58         -	KITCREATOR_PKGS="$(echo " ${KITCREATOR_PKGS} " | sed 's@ kitdll @ @g;s@^  *@@;s@  *$@@;s@   *@ @g') kitdll"
           62  +	KITCREATOR_PKGS="$(echo " ${KITCREATOR_PKGS} " | sed 's@ kitdll @ @g;s@^  *@@;s@  *$@@;s@   *@ @g')"
           63  +	KITTARGET="kitdll"
    59     64   fi
    60     65   
    61     66   ## If building KitDLL and Tk, must do Tk statically
    62     67   ### (Well, we don't HAVE to, but it would defeat much of the purpose)
    63         -if echo " ${KITCREATOR_PKGS} " | grep ' kitdll ' >/dev/null 2>/dev/null; then
           68  +if [ "${KITTARGET}" = "kitdll" ]; then
    64     69   	if echo " ${KITCREATOR_PKGS} " | grep ' tk ' >/dev/null 2>/dev/null; then
    65     70   		if [ "${STATICTK}" != "1" -a "${STATICTK}" != "-1" ]; then
    66     71   			echo 'Warning: Linking Tk statically because you are building KitDLL' 2>&1
    67     72   			echo '         Set STATICTK to -1 if you really want to link Tk dynamically.' >&2
    68     73   
    69     74   			STATICTK="1"
    70     75   			export STATICTK
    71     76   		fi
    72     77   	fi
    73     78   fi
    74     79   
    75     80   failedpkgs=""
    76     81   buildfailed="0"
    77         -for pkg in tcl tclvfs zlib ${KITCREATOR_PKGS} kitsh; do
           82  +for pkg in tcl tclvfs zlib ${KITCREATOR_PKGS} "${KITTARGET}"; do
    78     83   	echo -n "Building ${pkg} ..."
    79     84   
    80     85   	failed="0"
    81     86   	(
    82     87   		cd "${pkg}" >/dev/null 2>/dev/null || exit 1
    83     88   
    84     89   		./build.sh > build.log 2>&1 || exit 1
................................................................................
   110    115   if [ "${buildfailed}" != "0" ]; then
   111    116   	echo 'WARNING: Build is likely incomplete or failed.' >&2
   112    117   fi
   113    118   
   114    119   for kitdllfile in 'kitdll/build'/kitdll-*/libtclkit.*; do
   115    120   	cp "${kitdllfile}" "$(echo "${kitdllfile}" | sed "s@^.*/@@;s@\..*\$@-${TCLVERS}&@")" >/dev/null 2>/dev/null
   116    121   done
   117         -cp 'kitsh/build'/kitsh-*/kit "tclkit-${TCLVERS}"
          122  +cp 'kitsh/build'/kitsh-*/kit "tclkit-${TCLVERS}" >/dev/null 2>/dev/null
   118    123   
   119    124   exit "${buildfailed}"