Changeset 29303 for trunk/base


Ignore:
Timestamp:
Sep 20, 2007, 8:06:02 PM (12 years ago)
Author:
dluke@…
Message:

Build the new guide from the doc-new directory (new guide no longer requires configure to be run in base, so the script is much simpler)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/portmgr/GuideRegen.sh

    r27965 r29303  
    3838# Function to spam people in charge if something goes wrong during guide regen.
    3939bail () {
    40     mail -s "Guide Regen failure on ${DATE}" $SPAM_LOVERS < $FAILURE_LOG
     40    mail -s "Guide Regen Failure on ${DATE}" $SPAM_LOVERS < $FAILURE_LOG
    4141    cleanup; exit 1
    4242}
     
    5656
    5757# Checkout/update the doc tree
    58 if [ -d ${SRCTREE}/doc ]; then
    59     $SVN update ${SRCTREE}/doc > $FAILURE_LOG 2>&1 \
    60         || { echo "Updating the doc tree from $REPO_BASE/trunk/doc failed." >> $FAILURE_LOG; bail ; }
     58if [ -d ${SRCTREE}/doc-new ]; then
     59    $SVN update ${SRCTREE}/doc-new > $FAILURE_LOG 2>&1 \
     60        || { echo "Updating the doc tree from $REPO_BASE/trunk/doc-new failed." >> $FAILURE_LOG; bail ; }
    6161else
    62     $SVN checkout ${REPO_BASE}/trunk/doc ${SRCTREE}/doc > $FAILURE_LOG 2>&1 \
    63         || { echo "Checking out the doc tree from $REPO_BASE/trunk/s failed." >> $FAILURE_LOG; bail ; }
     62    $SVN checkout ${REPO_BASE}/trunk/doc-new ${SRCTREE}/doc-new > $FAILURE_LOG 2>&1 \
     63        || { echo "Checking out the doc tree from $REPO_BASE/trunk/doc-new failed." >> $FAILURE_LOG; bail ; }
    6464fi
    6565
    66 # Checkout/update HEAD
    67 if [ -d ${SRCTREE}/base ]; then
    68     $SVN update ${SRCTREE}/base > $FAILURE_LOG 2>&1 \
    69         || { echo "Updating the trunk from $REPO_BASE/trunk/base failed." >> $FAILURE_LOG; bail ; }
    70 else
    71     $SVN checkout ${REPO_BASE}/trunk/base ${SRCTREE}/base > $FAILURE_LOG 2>&1 \
    72         || { echo "Checking out the trunk from $REPO_BASE/trunk/base failed." >> $FAILURE_LOG; bail ; }
    73 fi
    74 
    75 # (re)configure.
    76 cd ${SRCTREE}/base/ && \
    77     ./configure \
    78     --prefix=${PREFIX} \
    79     --with-install-user=${MP_USER} \
    80     --with-install-group=${MP_GROUP} > $FAILURE_LOG 2>&1 \
    81     || { echo "./configure script failed." >> $FAILURE_LOG ; bail ; }
    82 
    8366# (re)build
    84 { cd ${SRCTREE}/doc/guide && make xhtml new > $FAILURE_LOG 2>&1 ; } \
     67{ cd ${SRCTREE}/doc/doc-new && make guide > $FAILURE_LOG 2>&1 ; } \
    8568    || { echo "make failed." >> $FAILURE_LOG ; bail ; }
    8669
Note: See TracChangeset for help on using the changeset viewer.