Check-in [5970f1de2e]
Overview
Comment:Updated to not provide pkgIndex.tcl for Tk if building statically
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:5970f1de2e808ea45e6b87b31e319c156da6cd26
User & Date: rkeene on 2010-10-01 20:49:01
Other Links: manifest | tags
Context
2010-10-01
23:46
Renamed library built by KitDLL to include version number by default check-in: fe17341989 user: rkeene tags: trunk
20:49
Updated to not provide pkgIndex.tcl for Tk if building statically check-in: 5970f1de2e user: rkeene tags: trunk
20:45
Updated to include a "package ifneeded" script for Tk on Win32 in addition to other platforms, if Tk built statically. check-in: d3373882b3 user: rkeene tags: trunk
Changes

Modified tk/build.sh from [c666adbf49] to [f6d4d528ed].

   138    138   			"${RC:-windres}" -o tkbase.res.o  --define STATIC_BUILD --include "./../generic" --include "${TCLCONFIGDIR}/../generic" --include "${TCLCONFIGDIR}" --include "./rc" "./rc/tk_base.rc"
   139    139   
   140    140   			if [ -f "tkbase.res.o" ]; then
   141    141   				cp "tkbase.res.o" "${INSTDIR}/lib/"
   142    142   			fi
   143    143   		fi
   144    144   
          145  +		if [ "${STATICTK}" = "1" ]; then
          146  +			# If we are building statically, don't create a
          147  +			# pkgIndex.tcl
          148  +			rm -f "${INSTDIR}"/lib/tk*/pkgIndex.tcl
          149  +		else
   145    150   		# Update pkgIndex to load libtk from the local directory rather
   146    151   		# than the parent directory
   147    152   		for pkgIndex in "${INSTDIR}"/lib/tk*/pkgIndex.tcl; do
   148    153   			sed 's@ \.\. @ @g' "${pkgIndex}" > "${pkgIndex}.new"
   149    154   			mv "${pkgIndex}.new" "${pkgIndex}"
   150    155   		done
          156  +		fi
   151    157   
   152    158   		mkdir "${OUTDIR}/lib" || exit 1
   153    159   		cp -r "${INSTDIR}/lib"/tk* "${OUTDIR}/lib/"
   154    160   		cp -r "${INSTDIR}/lib"/libtk* "${OUTDIR}/lib"/tk*/
   155    161   		rm -rf "${OUTDIR}/lib"/tk*/demos
   156    162   
   157    163   		"${STRIP:-strip}" -g "${OUTDIR}"/lib/tk*/*.so >/dev/null 2>/dev/null