[48989] trunk/base/portmgr/jobs/PortIndexRegen.sh

[wsiegrist at apple.com]

Revision: 48989
          http://trac.macports.org/changeset/48989
Author:   wsiegrist at apple.com
Date:     2009-04-01 08:49:56 -0700 (Wed, 01 Apr 2009)
Log Message:
-----------
Use trunk instead of release for generating the indexes so we can make PortIndex.quick

Modified Paths:
--------------
    trunk/base/portmgr/jobs/PortIndexRegen.sh

Modified: trunk/base/portmgr/jobs/PortIndexRegen.sh
===================================================================
--- trunk/base/portmgr/jobs/PortIndexRegen.sh	2009-04-01 15:37:26 UTC (rev 48988)
+++ trunk/base/portmgr/jobs/PortIndexRegen.sh	2009-04-01 15:49:56 UTC (rev 48989)
@@ -23,7 +23,6 @@
 # Other settings (probably don't need to be changed).
 SVN_CONFIG_DIR=${ROOT}/svnconfig
 REPO_BASE=http://svn.macports.org/repository/macports
-RELEASE_URL_FILE="config/RELEASE_URL"
 SVN="/opt/local/bin/svn -q --non-interactive --config-dir $SVN_CONFIG_DIR"
 # Where to checkout the source code. This needs to exist!
 SRCTREE=${ROOT}/source
@@ -80,22 +79,10 @@
        || { echo "Checking out the trunk from $REPO_BASE/trunk/base failed." >> $FAILURE_LOG ; bail ; }
 fi
 
-# Extract the release URL from HEAD
-read RELEASE_URL < ${ROOT}/${TMPDIR}/${RELEASE_URL_FILE}
-[ -n ${RELEASE_URL} ] || { echo "no RELEASE_URL specified in svn HEAD." >> $FAILURE_LOG; bail ; }
-
-# Checkout/update the release base
-if [ -d ${SRCTREE}/base ]; then
-    $SVN switch ${RELEASE_URL} ${SRCTREE}/base > $FAILURE_LOG 2>&1 \
-	|| { echo "Updating base from ${RELEASE_URL} failed." >> $FAILURE_LOG; bail ; }
-else
-    $SVN checkout ${RELEASE_URL} ${SRCTREE}/base > $FAILURE_LOG 2>&1 \
-	|| { echo "Checking out base from ${RELEASE_URL} failed." >> $FAILURE_LOG ; bail ; }
-fi
 echo `date -u +%s` > ${ROOT}/BASE-TIMESTAMP
 
 # (re)configure.
-cd ${SRCTREE}/base/ && \
+cd ${ROOT}/${TMPDIR} && \
     mkdir -p ${TCLPKG} && \
     ./configure \
     --prefix=${PREFIX} \
@@ -106,15 +93,15 @@
 
 # clean
 # (cleaning is useful because we don't want the indexing to fail because dependencies aren't properly computed).
-{ cd ${SRCTREE}/base/ && make clean > $FAILURE_LOG 2>&1 ; } \
+{ cd ${ROOT}/${TMPDIR} && make clean > $FAILURE_LOG 2>&1 ; } \
     || { echo "make clean failed." >> $FAILURE_LOG ; bail ; }
 
 # (re)build
-{ cd ${SRCTREE}/base/ && make > $FAILURE_LOG 2>&1 ; } \
+{ cd ${ROOT}/${TMPDIR} && make > $FAILURE_LOG 2>&1 ; } \
     || { echo "make failed." >> $FAILURE_LOG ; bail ; }
 
 # (re)install
-{ cd ${SRCTREE}/base/ && make install > $FAILURE_LOG 2>&1 ; } \
+{ cd ${ROOT}/${TMPDIR} && make install > $FAILURE_LOG 2>&1 ; } \
     || { echo "make install failed." >> $FAILURE_LOG ; bail ; }
 
 # (re)index
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090401/b5eaf782/attachment.html>