Revision: 79880 http://trac.macports.org/changeset/79880 Author: jmr@macports.org Date: 2011-06-28 19:22:55 -0700 (Tue, 28 Jun 2011) Log Message: ----------- mpab: * make more noise on stdout * don't skip building ports that already have an archive Modified Paths: -------------- contrib/mpab/chroot-scripts/buildports contrib/mpab/chroot-scripts/recreateportindex contrib/mpab/mpsync.sh Modified: contrib/mpab/chroot-scripts/buildports =================================================================== --- contrib/mpab/chroot-scripts/buildports 2011-06-29 01:51:38 UTC (rev 79879) +++ contrib/mpab/chroot-scripts/buildports 2011-06-29 02:22:55 UTC (rev 79880) @@ -39,6 +39,7 @@ { installedPorts=`${PREFIX}/bin/port echo active | /usr/bin/awk '{print $1}'` for uninstallPort in $installedPorts; do + echo "Deactivating $uninstallPort" portOutput=`${PREFIX}/bin/port -dvf deactivate $uninstallPort 2>&1` if [[ $? != 0 ]]; then echo $portOutput @@ -94,10 +95,10 @@ portVersion=`${PREFIX}/bin/port info --version ${portName} | awk '{print $2}'` portRevision=`${PREFIX}/bin/port info --revision ${portName} | awk '{print $2}'` portPackageBaseName="${portName}-${portVersion}_${portRevision}" - ls ${packageDir}/${portName}/${portPackageBaseName}[+.]*${tclOS}_${tclOSMajor}.${ACCEPT_ARCHS}${ARCHIVE_TYPE} > /dev/null 2>&1 - if [[ $? == 0 ]]; then - echo "package found, not building again" - else + #ls ${packageDir}/${portName}/${portPackageBaseName}[+.]*${tclOS}_${tclOSMajor}.${ACCEPT_ARCHS}${ARCHIVE_TYPE} > /dev/null 2>&1 + #if [[ $? == 0 ]]; then + # echo "package found, not building again" + #else skipPort="" portDeps=`${PREFIX}/bin/port echo depof:${portName}` for oneDep in ${portDeps}; do @@ -107,7 +108,7 @@ fi done if [[ -z $skipPort ]]; then - ${PREFIX}/bin/port -dv install $portName > ${PORTRESULTSDIR}/${portName}.log 2>&1 + ${PREFIX}/bin/port -dv install $portName | tee ${PORTRESULTSDIR}/${portName}.log 2>&1 if [[ $? == 0 ]]; then /bin/mv ${PORTRESULTSDIR}/${portName}.log ${PORTRESULTSDIR}/success echo "success" @@ -125,7 +126,7 @@ echo "skipping, ${skipPort} previously failed and is needed" echo "${portName} not built due to failed dependency ${skipPort}" > ${PORTRESULTSDIR}/fail/${portName}.log fi - fi + #fi currentCount=$((${currentCount}+1)) done Modified: contrib/mpab/chroot-scripts/recreateportindex =================================================================== --- contrib/mpab/chroot-scripts/recreateportindex 2011-06-29 01:51:38 UTC (rev 79879) +++ contrib/mpab/chroot-scripts/recreateportindex 2011-06-29 02:22:55 UTC (rev 79880) @@ -11,4 +11,4 @@ fi cd ${SRC_PREFIX}/dports -${PREFIX}/bin/portindex > /dev/null +${PREFIX}/bin/portindex Modified: contrib/mpab/mpsync.sh =================================================================== --- contrib/mpab/mpsync.sh 2011-06-29 01:51:38 UTC (rev 79879) +++ contrib/mpab/mpsync.sh 2011-06-29 02:22:55 UTC (rev 79880) @@ -43,13 +43,12 @@ if [[ -d ${dataDir}/${exportDir} ]] ; then svn update --non-interactive \ - -r HEAD ${dataDir}/${exportDir}/* \ - > /dev/null || exit 1 + -r HEAD ${dataDir}/${exportDir}/* || exit 1 else echo "Checking out macports from svn..." svn checkout --non-interactive -r HEAD \ https://svn.macports.org/repository/macports/trunk \ - ${dataDir}/${exportDir} > /dev/null || exit 1 + ${dataDir}/${exportDir} || exit 1 fi if [[ -n "$chrootPath" && ! -d "$chrootPath" ]] ; then