forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject svn commit: rev 20781 - forrest/trunk/etc/cocoon_upgrade
Date Thu, 03 Jun 2004 17:14:52 GMT
Author: cheche
Date: Thu Jun  3 10:14:52 2004
New Revision: 20781

Modified:
   forrest/trunk/etc/cocoon_upgrade/build.xml
   forrest/trunk/etc/cocoon_upgrade/local.build.properties
   forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh
Log:
build/dist/shbat is not longer used. Debug off 


Modified: forrest/trunk/etc/cocoon_upgrade/build.xml
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/build.xml	(original)
+++ forrest/trunk/etc/cocoon_upgrade/build.xml	Thu Jun  3 10:14:52 2004
@@ -25,7 +25,7 @@
        =============================================================== -->
        <property name="cocoon.home"              location="../../../../cocoon-2.1"/>
        <property name="forrest.root"             location="../../"/>
-       <property name="forrest.build"            location="../../build/dist/shbat"/>
+       <property name="forrest.build"            location="../../src/core"/>
   </target>
 
   <target name="import-cocoon-xconf" depends="init">

Modified: forrest/trunk/etc/cocoon_upgrade/local.build.properties
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/local.build.properties	(original)
+++ forrest/trunk/etc/cocoon_upgrade/local.build.properties	Thu Jun  3 10:14:52 2004
@@ -25,7 +25,7 @@
 
 exclude.webapp.documentation=true
 exclude.webapp.javadocs=true
-exclude.webapp.samples=true
+#exclude.webapp.samples=true
 
 # ---- Build Exclusions --------------------------------------------------------
 
@@ -103,7 +103,7 @@
 # ---- Compilation -------------------------------------------------------------
 
 compiler=modern
-compiler.debug=on
+compiler.debug=off
 compiler.optimize=on
 compiler.deprecation=off
 compiler.nowarn=on

Modified: forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh	(original)
+++ forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh	Thu Jun  3 10:14:52 2004
@@ -23,7 +23,7 @@
 cd $PWD/../../../../
 BASE=$PWD/`dirname $0`
 ## MUST BE OVERRIDDEN:
-COCOON_VERSION=2.1.5-dev
+COCOON_VERSION=2.1.5
 COCOON_HOME=$BASE/cocoon-2.1
 FORREST=$BASE/forrest/trunk
 NEKODTD_VERSION=0.1.10
@@ -39,34 +39,13 @@
 ## identifies it.  By default, we assume a date (see $JARSUFFIX) was used
 COCOONJAR_SUFFIX="[0-9]*"
 
-## Decide what kind of update to perform.
-### - 'testing' copies them to the distribution in
-##   build/dist/shbat/*
-## - 'real' copies upgraded jars to lib/core/
-## - 'real_with_cvs' copies to lib/core/, and marks jars for removal/addition
-##   in CVS.  Should only be performed by Forrest committers
-#
-UPGRADE_TYPE=testing
-#UPGRADE_TYPE=real
-#UPGRADE_TYPE=real_with_cvs
-#
-######################################################################
-
 CLIB=$COCOON_HOME/lib/*
 CBUILD=$COCOON_HOME/build/cocoon-$COCOON_VERSION
 CBLOCKS=$CBUILD/blocks
 
-FDIST=$FORREST/build/dist/shbat
-
-## Determines where to copy new jars to:
-
-if [ "$UPGRADE_TYPE" = "real" -o "$UPGRADE_TYPE" = "real_with_cvs" ]; then
-  FLIB=$FORREST/lib/core
-  FLIB_ENDORSED=$FORREST/lib/endorsed
-elif [ "$UPGRADE_TYPE" = "testing" ]; then
-  FLIB=$FDIST/lib/core
-  FLIB_ENDORSED=$FDIST/lib/endorsed
-fi
+FDIST=$FORREST/src/core
+FLIB=$FORREST/lib/core
+FLIB_ENDORSED=$FORREST/lib/endorsed
 
 alias push="pushd . > /dev/null"
 alias pop="popd > /dev/null"
@@ -256,8 +235,10 @@
 copy jakarta-regexp
 # We'll keep our own jing thankyou
 #copy jing
-#jisp-2.0.1.jar
-copy jisp
+# jcs-1.0-dev-20040516.jar
+copy jcs
+#commons-logging-1.0.3.jar needed by jcs
+copy commons-logging
 #jtidy-04aug2000r7-dev.jar
 bcopy jtidy
 #logkit-1.1.jar

Mime
View raw message