Check-in [12600639d9]
Overview
Comment:Added echo lines for every "configure", and "make"
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:12600639d935a0f45ecec82880f11b348539d663
User & Date: rkeene on 2010-09-26 04:48:40
Other Links: manifest | tags
Context
2010-09-26
04:48
Updated nightly test and publish script to fix bug in cross-compiles check-in: 82a097a2a1 user: rkeene tags: trunk
04:48
Added echo lines for every "configure", and "make" check-in: 12600639d9 user: rkeene tags: trunk
04:48
Updated to produce Tclkits that lack Mk4 check-in: 266a96d1d3 user: rkeene tags: trunk
Changes

Modified itcl/build.sh from [d5535b0fe9] to [db8c325ed3].

    78     78   			export TEA_PLATFORM
    79     79   			;;
    80     80   	esac
    81     81   	sed 's@TEA_PLATFORM=@test -z "$TEA_PLATFORM" \&\& &@' configure > configure.new && cat configure.new > configure
    82     82   	rm -f configure.new
    83     83   
    84     84   	# Build
           85  +	echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    85     86   	./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    86     87   
           88  +	echo "Running: ${MAKE:-make}"
    87     89   	${MAKE:-make} || exit 1
    88     90   
           91  +	echo "Running: ${MAKE:-make} install"
    89     92   	${MAKE:-make} install
    90     93   
    91     94   	mkdir "${OUTDIR}/lib" || exit 1
    92     95   	cp -r "${INSTDIR}/lib"/itcl*/ "${OUTDIR}/lib/"
    93     96   
    94     97   	"${STRIP:-strip}" -g "${OUTDIR}"/lib/itcl*/*.so >/dev/null 2>/dev/null
    95     98   
    96     99   	exit 0
    97    100   ) || exit 1
    98    101   
    99    102   exit 0

Modified kitsh/build.sh from [0c09a58b49] to [b70457f0fd].

    62     62   	fi
    63     63   
    64     64   	## Export to the environment, to be picked up by the "configure" script
    65     65   	export EXTRA_OBJS
    66     66   
    67     67   	# Compile Kitsh
    68     68   	if [ -z "${ZLIBDIR}" ]; then
    69         -		echo "./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
           69  +		echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    70     70   
    71     71   		./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    72     72   	else
    73         -		echo "./configure --with-tcl=\"${TCLCONFIGDIR}\" --with-zlib=\"${ZLIBDIR}\" ${CONFIGUREEXTRA}"
           73  +		echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" --with-zlib=\"${ZLIBDIR}\" ${CONFIGUREEXTRA}"
    74     74   
    75     75   		./configure --with-tcl="${TCLCONFIGDIR}" --with-zlib="${ZLIBDIR}" ${CONFIGUREEXTRA}
    76     76   	fi
           77  +
           78  +	echo "Running: ${MAKE:-make}"
    77     79   	${MAKE:-make} || exit 1
    78     80   
    79     81   	# Strip the kit of all symbols, if possible
    80     82   	"${STRIP:-strip}" kit >/dev/null 2>/dev/null
    81     83   
    82     84   	# Create VFS directory
    83     85   	mkdir "starpack.vfs"

Modified mk4tcl/build.sh from [d269657dc4] to [f48b86fade].

    65     65   	BUILDTYPE="$(basename "${TCLCONFIGDIR}")"
    66     66   	if [ "${BUILDTYPE}" = "win" ]; then
    67     67   		CPPFLAGS="${CPPFLAGS} -DBUILD_tcl=1"
    68     68   		export CPPFLAGS
    69     69   	fi
    70     70   
    71     71   	# Build static libraries for linking against Tclkit
           72  +	echo "Running: ./configure --disable-shared --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}/../generic\" ${CONFIGUREEXTRA}"
    72     73   	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA}
           74  +
           75  +	echo "Running: ${MAKE:-make} tcllibdir=\"${INSTDIR}/lib\" AR=\"${AR:-ar}\" RANLIB=\"${RANLIB:-ranlib}\""
    73     76   	${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" && \
    74     77   	${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" install || (
    75     78   		rm -rf "${INSTDIR}"
    76     79   		mkdir "${INSTDIR}"
    77     80   
    78     81   		exit 1
    79     82   	) || exit 1
    80     83   
    81     84   	exit 0
    82     85   ) || exit 1
    83     86   
    84     87   exit 0

Modified tcl/build.sh from [d7025f1b94] to [1bf5b7b587].

    72     72   		fi
    73     73   
    74     74   		# Remove previous directory's "tclConfig.sh" if found
    75     75   		rm -f 'tclConfig.sh'
    76     76   
    77     77   		cd "${BUILDDIR}/${dir}" || exit 1
    78     78   
           79  +		echo "Running: ./configure --disable-shared --with-encoding=utf-8 --prefix=\"${INSTDIR}\" ${CONFIGUREEXTRA}"
    79     80   		./configure --disable-shared --with-encoding=utf-8 --prefix="${INSTDIR}" ${CONFIGUREEXTRA}
    80     81   
           82  +		echo "Running: ${MAKE:-make}"
    81     83   		${MAKE:-make} || continue
    82     84   
           85  +		echo "Running: ${MAKE:-make} install"
    83     86   		${MAKE:-make} install || (
    84     87   			# Work with Tcl 8.6.x's TCLSH_NATIVE solution for
    85     88   			# cross-compile installs
    86     89   
           90  +			echo "Running: ${MAKE:-make} install TCLSH_NATIVE=\"${TCLKIT:-tclkit}\""
    87     91   			${MAKE:-make} install TCLSH_NATIVE="${TCLKIT:-tclkit}"
    88     92   		) || (
    89     93   			# Make install can fail if cross-compiling using Tcl 8.5.x
    90     94   			# because the Makefile calls "$(TCLSH)".  We can't simply
    91     95   			# redefine TCLSH because it also uses TCLSH as a build target
    92     96   			sed 's@^$(TCLSH)@blah@' Makefile > Makefile.new
    93     97   			cat Makefile.new > Makefile
    94     98   			rm -f Makefile.new
    95     99   
          100  +			echo "Running: ${MAKE:-make} install TCLSH=\"../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")\""
    96    101   			${MAKE:-make} install TCLSH="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")"
    97    102   		) || (
    98    103   			# Make install can fail if cross-compiling using Tcl 8.5.9
    99    104   			# because the Makefile calls "${TCL_EXE}".  We can't simply
   100    105   			# redefine TCL_EXE because it also uses TCL_EXE as a build target
   101    106   			sed 's@^${TCL_EXE}@blah@' Makefile > Makefile.new
   102    107   			cat Makefile.new > Makefile
   103    108   			rm -f Makefile.new
   104    109   
          110  +			echo "Running: ${MAKE:-make} install TCL_EXE=\"../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")\""
   105    111   			${MAKE:-make} install TCL_EXE="../../../../../../../../../../../../../../../../../$(which "${TCLKIT:-tclkit}")"
   106    112   		) || exit 1
   107    113   
   108    114   		mkdir "${OUTDIR}/lib" || exit 1
   109    115   		cp -r "${INSTDIR}/lib"/* "${OUTDIR}/lib/"
   110    116   		rm -rf "${OUTDIR}/lib/pkgconfig"
   111    117   		rm -f "${OUTDIR}"/lib/* >/dev/null 2>/dev/null

Modified tclvfs/build.sh from [b2a99c5623] to [f2da0a5a15].

    68     68   		export TEA_PLATFORM
    69     69   
    70     70   		CFLAGS="${CFLAGS} -I${TCLCONFIGDIR}"
    71     71   		export CFLAGS
    72     72   	fi
    73     73   
    74     74   	# Build static version
           75  +	echo "Running: ./configure --disable-shared --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    75     76   	./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
           77  +
           78  +	echo "Running: ${MAKE:-make}"
    76     79   	${MAKE:-make} || exit 1
           80  +
           81  +	echo "Running: ${MAKE:-make} install"
    77     82   	${MAKE:-make} install
    78     83   
    79     84   	mkdir "${OUTDIR}/lib" || exit 1
    80     85   	cp -r "${INSTDIR}/lib"/vfs*/ "${OUTDIR}/lib/"
    81     86   	rm -f "${OUTDIR}/lib"/vfs*/*.a "${OUTDIR}/lib"/vfs*/*.so
    82     87   
    83     88   	exit 0
    84     89   ) || exit 1
    85     90   
    86     91   exit 0

Modified thread/build.sh from [d1e307e2c4] to [8baee02522].

    61     61   	if [ ! -d '../buildsrc' ]; then
    62     62   		gzip -dc "../${SRC}" | tar -xf -
    63     63   	else
    64     64   		cp -rp ../buildsrc/* './'
    65     65   	fi
    66     66   
    67     67   	cd "${BUILDDIR}" || exit 1
           68  +	echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    68     69   	./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    69     70   
           71  +	echo "Running: ${MAKE:-make}"
    70     72   	${MAKE:-make} || exit 1
    71     73   
           74  +	echo "Running: ${MAKE:-make} install"
    72     75   	${MAKE:-make} install
    73     76   
    74     77   	mkdir "${OUTDIR}/lib" || exit 1
    75     78   	cp -r "${INSTDIR}/lib"/thread*/ "${OUTDIR}/lib/"
    76     79   
    77     80   	"${STRIP:-strip}" -g "${OUTDIR}"/lib/thread*/*.so >/dev/null 2>/dev/null
    78     81   
    79     82   	exit 0
    80     83   ) || exit 1
    81     84   
    82     85   exit 0

Modified tk/build.sh from [e8f807ace8] to [74d986fc51].

    88     88   			echo "Running: ./configure --disable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    89     89   			./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    90     90   		else
    91     91   			echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    92     92   			./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    93     93   		fi
    94     94   
           95  +		echo "Running: ${MAKE:-make}"
    95     96   		${MAKE:-make} || continue
    96     97   
           98  +		echo "Running: ${MAKE:-make} install"
    97     99   		${MAKE:-make} install || continue
    98    100   
    99    101   		# Update to include resources, if found
   100    102   		if [ "${dir}" = "win" ]; then
   101    103   			echo ' *** Creating tkbase.res.o to support Windows build'
   102    104   			echo "\"${RC:-windres}\" -o tkbase.res.o  --define STATIC_BUILD --include \"./../generic\" --include \"${TCLCONFIGDIR}/../generic\" --include \"${TCLCONFIGDIR}\" --include \"./rc\" \"./rc/tk_base.rc\""
   103    105   			"${RC:-windres}" -o tkbase.res.o  --define STATIC_BUILD --include "./../generic" --include "${TCLCONFIGDIR}/../generic" --include "${TCLCONFIGDIR}" --include "./rc" "./rc/tk_base.rc"

Modified zlib/build.sh from [8abe54013f] to [2bc46025a6].

    42     42   	cd "${BUILDDIR}" || exit 1
    43     43   	# ZLIB Expects AR to contain options
    44     44   	AR="${AR:-ar} rcu"
    45     45   	export AR
    46     46   
    47     47   	# We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf
    48     48   	# script and will puke
           49  +	echo "Running: ./configure --prefix=\"${INSTDIR}\""
    49     50   	./configure --prefix="${INSTDIR}"
    50     51   
           52  +	echo "Running: ${MAKE:-make} AR=\"${AR}\""
    51     53   	${MAKE:-make} AR="${AR}" || exit 1
    52     54   
           55  +	echo "Running: ${MAKE:-make} install AR=\"${AR}\""
    53     56   	${MAKE:-make} install AR="${AR}"
    54     57   
    55     58   	# We don't really care too much about failure in zlib
    56     59   	exit 0
    57     60   ) || exit 1
    58     61   
    59     62   exit 0