Changeset 79880

Timestamp:

06/28/11 19:22:55 (4 years ago)

Author:

jmr@…

Message:

mpab:

• make more noise on stdout
• don't skip building ports that already have an archive

Location:

contrib/mpab

Files:

• chroot-scripts/buildports (modified) (4 diffs)
• chroot-scripts/recreateportindex (modified) (1 diff)
• mpsync.sh (modified) (1 diff)

contrib/mpab/chroot-scripts/buildports

@@ -40 +40 @@
    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
@@ -95 +96 @@
    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}`
@@ -108 +109 @@
       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
@@ -126 +127 @@
          echo "${portName} not built due to failed dependency ${skipPort}" > ${PORTRESULTSDIR}/fail/${portName}.log
       fi
-   fi
+   #fi
    currentCount=$((${currentCount}+1))
 done

contrib/mpab/chroot-scripts/recreateportindex

@@ -12 +12 @@
 
 cd ${SRC_PREFIX}/dports
-${PREFIX}/bin/portindex > /dev/null
+${PREFIX}/bin/portindex

contrib/mpab/mpsync.sh

@@ -44 +44 @@
 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