Check-in [fac84a637c]
Overview
Comment:Updated to include package version in output directory
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:fac84a637cde39247e268766d443e882504550db
User & Date: rkeene on 2011-07-19 23:58:03
Other Links: manifest | tags
Context
2011-07-19
23:59
Fixed missing file from buildsrc build check-in: ffd307b622 user: rkeene tags: trunk
23:58
Updated to include package version in output directory check-in: fac84a637c user: rkeene tags: trunk
23:32
Added support for using platform::identify Added tdom build support check-in: 5a1dc6798b user: rkeene tags: trunk
Changes

Modified server/buildpkgs/build_all.sh from [17e48df935] to [98c08187b6].

   178    178   		if [ "${DISTCLEAN}" = "1" ]; then
   179    179   			rm -rf "src"
   180    180   		fi
   181    181   		if [ "${CLEANONLY}" = "1" ]; then
   182    182   			exit 0
   183    183   		fi
   184    184   
   185         -		mkdir -p "out/${PLATFORM}" >/dev/null 2>/dev/null
          185  +		mkdir -p "out" >/dev/null 2>/dev/null
   186    186   
   187         -		./build.sh > "out/${PLATFORM}/build.log" 2>&1 || exit 1
          187  +		./build.sh > "out/build-${PLATFORM}.log" 2>&1 || exit 1
   188    188   	) || failed=1
   189    189   
   190    190   	if [ "${failed}" = "1" ]; then
   191         -		cp "${dir}/out/${PLATFORM}/build.log" "${dir}/failed-${PLATFORM}-`hostname`.log"
          191  +		cp "${dir}/out/build-${PLATFORM}.log" "${dir}/failed-${PLATFORM}-`hostname`.log"
   192    192   
   193    193   		rm -rf "${dir}/out"
   194    194   		faileddirs="${faileddirs} ${dir}"
   195    195   		echo "Failed to build ${dir}"
          196  +	else
          197  +		outdir="$(ls -1d "${dir}/out"/*/"${PLATFORM}/" | head -1)"
          198  +		mv "${dir}/out/build-${PLATFORM}.log" "${outdir}/build.log"
   196    199   	fi
   197    200   done
   198    201   
   199    202   # Cleanup is done at this point
   200    203   if [ "${CLEANONLY}" = "1" ]; then
   201    204   	exit 0
   202    205   fi
................................................................................
   210    213   DATECODE="$(date +%Y%m%d%H%M)"
   211    214   
   212    215   if [ -z "${PKGHASHCODE}" ]; then
   213    216   	OUTFILEBASE="tclpkgs-${PLATFORM}-${DATECODE}"
   214    217   else
   215    218   	OUTFILEBASE="tclpkgs-${PKGHASHCODE}-${PLATFORM}-${DATECODE}"
   216    219   fi
   217         -tar -cf - */out | bzip2 -9c > "${OUTFILEBASE}.tar.bz2"
          220  +
          221  +rm -rf __tmp__
          222  +mkdir __tmp__
          223  +instdir="$(cd __tmp__ && pwd)"
          224  +for dir in */; do
          225  +	basename="$(dirname "${dir}")"
          226  +	pkginstdir="${instdir}/${dir}"
          227  +
          228  +	(
          229  +		cd "${dir}/out" 2>/dev/null >/dev/null || exit 1
          230  +
          231  +		mkdir "${pkginstdir}"
          232  +
          233  +		cp -r * "${pkginstdir}/"
          234  +	)
          235  +done
          236  +
          237  +(
          238  +	cd __tmp__ || exit 1
          239  +
          240  +	tar -cf - *
          241  +) | bzip2 -9c > "${OUTFILEBASE}.tar.bz2"
          242  +
          243  +rm -rf __tmp__
   218    244   
   219    245   exit 0

Modified server/buildpkgs/common.sh from [80980e80c6] to [ad199373ac].

   105    105   				"${PATCH:-patch}" -p1 < "${patchfile}"
   106    106   			)
   107    107   		done
   108    108   	done
   109    109   }
   110    110   
   111    111   WORKDIR="${TMPDIR:-/tmp}/tcl-buildpkgs-$$${RANDOM}${RANDOM}${RANDOM}"
   112         -PLATDIR="$(pwd)/out/${PLATFORM}"
          112  +PLATDIR="$(pwd)/out/${VERS}/${PLATFORM}"
   113    113   export WORKDIR PLATDIR
   114    114   
   115    115   setup_tcl84