Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: forrest-dev@xml.apache.org
Date: 22 Feb 2003 13:08:02 -0000
Message-ID: <20030222130802.28165.qmail@icarus.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/forrestbot/scripts
 local-vars-cocoondev.org publish_livesite

jefft       2003/02/22 05:08:02

  Modified:    src/resources/forrestbot/scripts local-vars-cocoondev.org
                        publish_livesite
  Log:
  Attempt avalon-site commit support
  
  Revision  Changes    Path
  1.7       +1 -0      xml-forrest/src/resources/forrestbot/scripts/local-vars-cocoondev.org
  
  Index: local-vars-cocoondev.org
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrestbot/scripts/local-vars-cocoondev.org,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- local-vars-cocoondev.org	25 Jan 2003 10:57:56 -0000	1.6
  +++ local-vars-cocoondev.org	22 Feb 2003 13:08:01 -0000	1.7
  @@ -19,6 +19,7 @@
   # If you want the 'publish_livesite' command to work, you must set XML_SITE to
   # point to a CVS checkout of the xml-site module.
   XML_SITE=/home/j/jeffturner/xml-site
  +AVALON_SITE=/home/j/jeffturner/avalon-site
   
   # Max number of seconds we expect a full forrestbot run to take, before we
   # assume something's hung and kill the processes.  Defaults to 20 minutes.
  
  
  
  1.9       +13 -7     xml-forrest/src/resources/forrestbot/scripts/publish_livesite
  
  Index: publish_livesite
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrestbot/scripts/publish_livesite,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- publish_livesite	10 Feb 2003 09:26:31 -0000	1.8
  +++ publish_livesite	22 Feb 2003 13:08:01 -0000	1.9
  @@ -12,31 +12,37 @@
   
   MODULE=${1:-xml-forrest}
   case $MODULE in
  -  xml-forrest) TARGET="forrest" ;;
  -  xml-forrest-template) TARGET="forrest-sample" ;;
  -  xml-site) TARGET="/" ;;
  +  xml-forrest)          REPOS="xml-site"    ; TARGET="forrest" ;;
  +  xml-forrest-template) REPOS="xml-site"    ; TARGET="forrest-sample" ;;
  +  xml-site)             REPOS="xml-site"    ; TARGET="/" ;;
  +  avalon-phoenix)       REPOS="avalon-site" ; TARGET="phoenix" ;;
   esac
   log "MODULE is $MODULE"
   [ "$MODULE" = "xml-site" ] && ARGS=-l
   log "ARGS is $ARGS"
   
   SRC_DIR=$WEBAPP/sites/$MODULE
  -LIVECVS=$XML_SITE/targets/$TARGET
  +[ "$REPOS" = "xml-site" ] && LIVECVS=$XML_SITE/targets/$TARGET
  +[ "$REPOS" = "avalon-site" ] && LIVECVS=$AVALON_SITE/site/$TARGET
   
   function sanity_checks()
   {
     [ -z "$TARGET" ] && echo "Unknown module: $MODULE" && exit;
   
  -  if [ -z "$XML_SITE" ]; then
  +  if [ "$REPOS" = "xml-site" -a -z "$XML_SITE" ]; then
       echo "Please set the XML_SITE var in local-vars-`uname -n`"
       exit
     fi	
  +  if [ "$REPOS" = "avalon-site" -a -z "$AVALON_SITE" ]; then
  +    echo "Please set the AVALON_SITE var in local-vars-`uname -n`"
  +    exit
  +  fi	
     if [ ! -d "$SRC_DIR" ]; then
       echo "Expected website contents in $SRC_DIR"
       exit
     fi
     if [ ! -d "$LIVECVS" ]; then
  -    echo "Expected checked-out xml-site/ HTML in non-existent directory $LIVECVS"
  +    echo "Expected checked-out $REPOS/ HTML in non-existent directory $LIVECVS"
       exit
     fi
   }
  @@ -48,7 +54,7 @@
     cd $LIVECVS
     cvsco $ARGS
     cvs up $ARGS -dP
  -  log "Copying generated docs to xml-site.."
  +  log "Copying generated docs to $REPOS.."
     log "  src  : $SRC_DIR/*"
     log "  dest : $PWD" 
     cp -r -p $SRC_DIR/* .