Index: server/work/build_all.sh ================================================================== --- server/work/build_all.sh +++ server/work/build_all.sh @@ -32,10 +32,14 @@ ) if [ -z "${TCLCONFIGDIR}" ]; then TCLCONFIGDIR="/usr/lib" fi export TCLCONFIGDIR + +# Determine platform +PLATFORM="$(./platform)" +export PLATFORM # Build all appropriate directories faileddirs="" for dir in */; do export dir @@ -46,20 +50,21 @@ failed=0 ( cd "${dir}" || exit 1 - rm -f "build.log" rm -rf "build" "out" if [ "${DISTCLEAN}" = "1" ]; then rm -rf "src" fi if [ "${CLEANONLY}" = "1" ]; then exit 0 fi - ./build.sh 2>&1 | tee "build.log" || exit 1 + mkdir -p "out/${PLATFORM}" >/dev/null 2>/dev/null + + ./build.sh 2>&1 | tee "out/${PLATFORM}/build.log" || exit 1 ) || failed=1 if [ "${failed}" = "1" ]; then rm -rf "${dir}/out" faileddirs="${faileddirs} ${dir}" @@ -78,8 +83,8 @@ # Create tarfile of built packages PLATFORM="$(./platform)" DATECODE="$(date +%Y%m%d%H%M)" OUTFILEBASE="tclpkgs-${PLATFORM}-${DATECODE}" -tar -cf - */out */build.log | bzip2 -9c > "${OUTFILEBASE}.tar.bz2" +tar -cf - */out | bzip2 -9c > "${OUTFILEBASE}.tar.bz2" exit 0 Index: server/work/tls/build.sh ================================================================== --- server/work/tls/build.sh +++ server/work/tls/build.sh @@ -42,12 +42,11 @@ ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --with-ssl-dir="${SSLDIR}" gmake || exit 1 ) || exit 1 ( - rm -rf "${PLATDIR}" - mkdir -p "${PLATDIR}" + mkdir -p "${PLATDIR}" >/dev/null 2>/dev/null cp "build/${BUILDDIR}/libtls1.6.so" "${PLATDIR}/" cp "build/${BUILDDIR}/pkgIndex.tcl" "${PLATDIR}/" cp "build/${BUILDDIR}/tls.tcl" "${PLATDIR}/" ) || exit 1