forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject cvs commit: xml-forrest/etc/cocoon_upgrade upgrade_cocoon_jars.sh
Date Fri, 05 Sep 2003 17:27:32 GMT
cheche      2003/09/05 10:27:32

  Modified:    etc/cocoon_upgrade upgrade_cocoon_jars.sh
  Log:
  Add a COCOON_VERSION instead of 2.1*
  REPLACE COCOON to COCOON_HOME to use same naming standards.
  
  Revision  Changes    Path
  1.23      +12 -11    xml-forrest/etc/cocoon_upgrade/upgrade_cocoon_jars.sh
  
  Index: upgrade_cocoon_jars.sh
  ===================================================================
  RCS file: /home/cvs/xml-forrest/etc/cocoon_upgrade/upgrade_cocoon_jars.sh,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- upgrade_cocoon_jars.sh	5 Sep 2003 12:54:17 -0000	1.22
  +++ upgrade_cocoon_jars.sh	5 Sep 2003 17:27:32 -0000	1.23
  @@ -2,12 +2,13 @@
   ######################################################################
   # A script for upgrading Forrest's jars with those from Cocoon.  Use at own
   # risk!  Make sure you build Cocoon before running this.  If your cocoon-2.1
  -# directory is not on the same level as xml-forrest/, set the COCOON variable
  +# directory is not on the same level as xml-forrest/, set the COCOON_HOME variable
   # below.
   #
   BASE=$PWD/`dirname $0`
   ## MUST BE OVERRIDDEN:
  -COCOON=$BASE/../../../cocoon-2.1
  +COCOON_VERSION=2.1.1
  +COCOON_HOME=$BASE/../../../cocoon-2.1
   FORREST=$BASE/../..
   NEKODTD_VERSION=0.1.6
   NEKODTD_HOME=$BASE/../../../nekodtd-$NEKODTD_VERSION
  @@ -35,8 +36,8 @@
   #
   ######################################################################
   
  -CLIB=$COCOON/lib/*
  -CBUILD=$COCOON/build/cocoon-2.1*
  +CLIB=$COCOON_HOME/lib/*
  +CBUILD=$COCOON_HOME/build/cocoon-$COCOON_VERSION
   CBLOCKS=$CBUILD/blocks
   
   FDIST=$FORREST/build/dist/shbat
  @@ -64,7 +65,7 @@
   function sanity_check()
   {
     checkdir "$FORREST" FORREST
  -  checkdir "$COCOON" COCOON
  +  checkdir "$COCOON_HOME" COCOON_HOME
     checkdir "$FLIB" FLIB
     checkdir "$NEKODTD_HOME" NEKODTD_HOME
     checkdir "$NEKOPULL_HOME" NEKOPULL_HOME
  @@ -100,7 +101,7 @@
   {
     echo -n "Copying block dep:	$1			"
     rm $FLIB/$1*
  -  cp $COCOON/src/blocks/*/lib/$1* $FLIB/
  +  cp $COCOON_HOME/src/blocks/*/lib/$1* $FLIB/
     echo "done"
   }
   
  @@ -132,9 +133,9 @@
   
   function copy_local_blocks_properties()
   {
  -  echo -n "Copy local.blocks.properties to $COCOON 		"
  +  echo -n "Copy local.blocks.properties to $COCOON_HOME 		"
     push
  -  cp -bu local.blocks.properties $COCOON
  +  cp -bu local.blocks.properties $COCOON_HOME
     pop
     echo "done"
   }
  @@ -143,9 +144,9 @@
   {
     echo -n "Builing Cocoon 		"
     push
  -  cd $COCOON
  -  $COCOON/build.sh clean
  -  $COCOON/build.sh
  +  cd $COCOON_HOME
  +  $COCOON_HOME/build.sh clean
  +  $COCOON_HOME/build.sh
     pop
     echo "done"
   }
  
  
  

Mime
View raw message