Check-in [ee99c0e5ae]
Overview
Comment:Updated to support building Tk statically

Updated to build Tk statically on Windows

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:ee99c0e5ae21dd4566e4cc00b51d73c64e91b2b2
User & Date: rkeene on 2010-09-26 04:40:11
Other Links: manifest | tags
Context
2010-09-26
04:40
Corrected inverted logic for static linking check-in: 69081b236e user: rkeene tags: trunk
04:40
Updated to support building Tk statically

Updated to build Tk statically on Windows check-in: ee99c0e5ae user: rkeene tags: trunk

04:40
Comment update check-in: 496446d70e user: rkeene tags: trunk
Changes

Modified tk/build.sh from [ab29a29d10] to [f20054e4a2].

    56     56   	cd "${BUILDDIR}" || exit 1
    57     57   	for dir in unix win macosx; do
    58     58   		# Remove previous directory's "tkConfig.sh" if found
    59     59   		rm -f 'tkConfig.sh'
    60     60   
    61     61   		cd "${BUILDDIR}/${dir}" || exit 1
    62     62   
    63         -		./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           63  +		if [ "${dir}" != "win" ]; then
           64  +			# Statically link Tk to Tclkit if we are compiling for
           65  +			# Windows
           66  +			STATICTK="1"
           67  +		fi
           68  +
           69  +		if [ "${STATICTK}" = "1" ]; then
           70  +			./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           71  +		else
           72  +			./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           73  +		fi
    64     74   
    65     75   		${MAKE:-make} || continue
    66     76   
    67     77   		${MAKE:-make} install
    68     78   
    69     79   		# Update pkgIndex to load libtk from the local directory rather
    70     80   		# than the parent directory
................................................................................
    75     85   
    76     86   		mkdir "${OUTDIR}/lib" || exit 1
    77     87   		cp -r "${INSTDIR}/lib"/tk*/ "${OUTDIR}/lib/"
    78     88   		cp -r "${INSTDIR}/lib"/libtk* "${OUTDIR}/lib"/tk*/
    79     89   		rm -rf "${OUTDIR}/lib"/tk*/demos
    80     90   
    81     91   		strip -g "${OUTDIR}"/lib/tk*/*.so >/dev/null 2>/dev/null
           92  +		find "${OUTDIR}" -type f -name '*.a' | xargs rm -f >/dev/null 2>/dev/null
    82     93   
    83     94   		break
    84     95   	done
    85     96   
    86     97   	exit 0
    87     98   ) || exit 1
    88     99   
    89    100   exit 0