Diff

Differences From Artifact [1e502acc62]:

To Artifact [92e44308bd]:


    63     63   	Xvfb :31 -screen 0 800x600x24 -nolisten tcp >/dev/null 2>/dev/null &
    64     64   	echo "$!"
    65     65   )"
    66     66   DISPLAY=:31
    67     67   export DISPLAY
    68     68   
    69     69   if [ "${BIGBUILD}" = "1" ]; then
    70         -	kits="$(echo normal{,-zip,-nomk4}{,-threaded}{,-statictk,-notk} normal{,-threaded}{,-notk}{,-nomk4}-kitdll win32-i586{,-zip,-nomk4}{,-threaded}{,-notk} win32-i586{,-threaded}{,-notk}{,-nomk4}-kitdll min{,-static} {linux-mipsel-min,linux-amd64-notk}{,-kitdll} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-zip,-nomk4}{,-threaded}{,-statictk,-notk} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-threaded}{,-notk}{,-nomk4}-kitdll netbsd-i386{,-zip,-nomk4}{,-threaded}-notk netbsd-i386{,-threaded}{,-nomk4}-notk-kitdll)"
           70  +	kits="$(echo normal{,-zip,-nomk4}{,-threaded}{,-statictk,-notk} normal{,-threaded}{,-notk}{,-nomk4}{,-debug}-kitdll win32-i586{,-zip,-nomk4}{,-threaded}{,-notk} win32-i586{,-threaded}{,-notk}{,-nomk4}-kitdll min{,-static} {linux-mipsel-min,linux-amd64-notk}{,-debug}{,-kitdll} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-zip,-nomk4}{,-threaded}{,-statictk,-notk}{,debug} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-threaded}{,-notk}{,-nomk4}{,debug}-kitdll netbsd-i386{,-zip,-nomk4}{,-threaded}{,debug}-notk netbsd-i386{,-threaded}{,-nomk4}{,debug}-notk-kitdll)"
    71     71   else
    72         -	kits="normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 min min-static normal-kitdll normal-threaded-kitdll normal-notk-kitdll normal-nomk4-kitdll normal-nomk4-notk-kitdll normal-threaded-nomk4-kitdll normal-threaded-notk-nomk4-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll linux-mipsel-min linux-mipsel-min-kitdll linux-amd64-notk linux-amd64-notk-kitdll solaris-i386 solaris-i386-kitdll solaris-amd64 solaris-amd64-kitdll solaris-sparc solaris-sparc-kitdll solaris-sparc64 solaris-sparc64-kitdll freebsd-amd64 freebsd-amd64-kitdll netbsd-i386-notk netbsd-i386-notk-kitdll netbsd-amd64 netbsd-amd64-kitdll"
           72  +	kits="normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 normal-debug min min-static normal-kitdll normal-threaded-kitdll normal-notk-kitdll normal-nomk4-kitdll normal-nomk4-notk-kitdll normal-threaded-nomk4-kitdll normal-threaded-notk-nomk4-kitdll normal-debug-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll linux-mipsel-min linux-mipsel-min-kitdll linux-amd64-notk linux-amd64-notk-debug linux-amd64-notk-kitdll linux-amd64-notk-debug-kitdll solaris-i386 solaris-i386-debug solaris-i386-kitdll solaris-i386-debug-kitdll solaris-amd64 solaris-amd64-debug solaris-amd64-kitdll solaris-amd64-debug-kitdll solaris-sparc solaris-sparc-debug solaris-sparc-kitdll solaris-sparc-debug-kitdll solaris-sparc64 solaris-sparc64-debug solaris-sparc64-kitdll solaris-sparc64-debug-kitdll freebsd-amd64 freebsd-amd64-debug freebsd-amd64-kitdlli freebsd-amd64-debug-kitdll netbsd-i386-notk netbsd-i386-notk-debug netbsd-i386-notk-kitdll netbsd-i386-notk-debug-kitdll netbsd-amd64 netbsd-amd64-debug netbsd-amd64-kitdll netbsd-amd64-debug-kitdll"
    73     73   fi
    74     74   
    75     75   failed=""
    76     76   for kit in $kits; do
    77     77   	kitcreator="./kitcreator"
    78     78   	args=""
    79     79   	runnable="1"
................................................................................
   126    126   		netbsd-amd64|netbsd-amd64-*|\
   127    127   		hpux-hppa64|hpux-hppa64-*)
   128    128   			platform="$(echo "${kit}" | cut -f 1-2 -d '-')"
   129    129   			kitcreator="./build/make-kit-${platform}"
   130    130   			runnable="0"
   131    131   			xcompile="1"
   132    132   			iszip="0"
          133  +
          134  +			if echo "${kit}" | egrep -- '-(hppa64|amd64|sparc64)-' >/dev/null; then
          135  +				args="${args} --enable-64bit"
          136  +			fi
   133    137   			;;
   134    138   	esac
   135    139   
   136    140   	if [ "${xcompile}" != "0" ]; then
   137    141   		kit="${kit}-xcompile"
   138    142   	fi
   139    143   
................................................................................
   170    174   				tempkit="$(echo "${tempkit}" | sed 's@-nomk4-@-@')"
   171    175   				nomk4="1"
   172    176   				iszip="1"
   173    177   				;;
   174    178   			*-kitdll-*)
   175    179   				kitdll="1"
   176    180   				;;
          181  +			*-debug-*)
          182  +				args="${args} --enable-symbols"
          183  +				;;
   177    184   		esac
   178    185   	done
   179    186   
   180    187   	if [ "${kitdll}" = "1" ]; then
   181    188   		# Currently no KitDLL uses Zip
   182    189   		iszip="0"
   183    190   	fi
................................................................................
   200    207   			failoutputname="${TESTDIR}/kits/failed/tclkit-${version}-${kit}"
   201    208   		fi
   202    209   		buildlog="${outputname}-build.log"
   203    210   		failbuildlog="${failoutputname}-build.log"
   204    211   		testresultslog="${outputname}-tests.log"
   205    212   
   206    213   		if [ ! -f "${outputname}" ]; then
   207         -			unset KITCREATOR_PKGS STATICTK
          214  +			unset KITCREATOR_PKGS STATICTK STRIP
   208    215   
   209    216   			if [ -f "${failoutputname}" ]; then
   210    217   				echo "Skipping rebuilding failed kit ${version}/${kit} ..."
   211    218   
   212    219   				failed="${failed} ${version}/${kit}-build"
   213    220   
   214    221   				continue
................................................................................
   252    259   			if [ "${statictk}" = "1" ]; then
   253    260   				STATICTK="1"
   254    261   				export STATICTK
   255    262   
   256    263   				echo "  STATICTK=\"${STATICTK}\"" >> "${buildlog}"
   257    264   				echo "  export STATICTK" >> "${buildlog}"
   258    265   			fi
          266  +
          267  +			if echo "${args}" | grep -- '--enable-symbols' >/dev/null; then
          268  +				STRIP='true'
          269  +				export STRIP
          270  +
          271  +				echo "  STRIP='true'" >> "${buildlog}"
          272  +				echo "  export STRIP" >> "${buildlog}"
          273  +			fi
   259    274   
   260    275   			if [ "${kitcreator}" != "./kitcreator" ]; then
   261    276   				echo "  mkdir build" >> "${buildlog}"
   262    277   
   263    278   				# Several build scripts rely on minkit to work
   264    279   				if grep './build/make-minkit' "${kitcreator}" >/dev/null 2>/dev/null; then
   265    280   					echo "  cat << \__EOF__ > ./build/make-minkit" >> "${buildlog}"