forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r688609 - in /forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade: README.txt build.sh build.xml
Date Mon, 25 Aug 2008 03:23:44 GMT
Author: crossley
Date: Sun Aug 24 20:23:44 2008
New Revision: 688609

URL: http://svn.apache.org/viewvc?rev=688609&view=rev
Log:
Change Cocoon version numbers to be 2.1.12-dev and add reminder to verify that that is current.

Modified:
    forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/README.txt
    forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.sh
    forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.xml

Modified: forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/README.txt
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/README.txt?rev=688609&r1=688608&r2=688609&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/README.txt (original)
+++ forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/README.txt Sun Aug 24 20:23:44
2008
@@ -14,34 +14,39 @@
 
 1. Keep our local.*.properties files sychronised with Cocoon's.
 
-Step 2 and 3 can be done with "./build.sh 0"
-2. Copy the cocoon libraries to forrest.
-   See ./build.xml where some are excluded. You might need to add/exclude others.
+2. Perhaps need to update version numbers for Cocoon in ./build.xml and
+   the ./build.sh files.
+
+Step 3 and 4 can be done with "./build.sh 0"
+3. Copy the cocoon libraries to forrest.
+
+   See ./build.xml where some are excluded. You might need to add/exclude
+   others via this build.xml file.
    Remember that things will change with Cocoon and we must keep in sync.
 
     ant copy-core-libs
     ant copy-endorsed-libs
     ant copy-optional-libs
 
-3. Verify that there are not two versions of libraries within the same directory:
+4. Verify that there are not two versions of libraries within the same directory:
 
    cd $FORREST_HOME/lib/endorsed
    svn st
    cd $FORREST_HOME/lib/core
    svn st
 
-4. cd $FORREST_HOME/etc/cocoon_upgrade
+5. cd $FORREST_HOME/etc/cocoon_upgrade
 
-Steps 5 and 6 can be done with "./build.sh 1" it will create an ant property file,
+Steps 6 and 7 can be done with "./build.sh 1" it will create an ant property file,
 so you do not need to edit the build.xml.
 
-5. Edit build.xml and modify new revision
+6. Edit build.xml and modify new revision
 (FIXME: we don't need svn.revision anymore, so probably don't need ./build.sh either)
    Then build cocoon:
 
    ant build-cocoon
 
-6. cd $FORREST_HOME/lib
+7. cd $FORREST_HOME/lib
 
 (FIXME: we don't need this 7a anymore.)
 7a. For each cocoon-{name}-{cocoon.version}-{cocoon.revision}.jar

Modified: forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.sh
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.sh?rev=688609&r1=688608&r2=688609&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.sh (original)
+++ forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.sh Sun Aug 24 20:23:44
2008
@@ -81,7 +81,7 @@
      cd $COCOON_HOME;svn info|grep Revision|awk '{print "echo svn.revision=-r"$2" > $FORREST_HOME/etc/cocoon_upgrade/revision.properties"}'|sh
      cd $FORREST_HOME/etc/cocoon_upgrade/
      ant build-cocoon
-     ln -s $COCOON_HOME/build/cocoon/ $COCOON_HOME/build/cocoon-2.2.0-dev
+     ln -s $COCOON_HOME/build/cocoon/ $COCOON_HOME/build/cocoon-2.1.12-dev
      svnDialog
   else
     echo step $step not found

Modified: forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.xml
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.xml?rev=688609&r1=688608&r2=688609&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.xml (original)
+++ forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/build.xml Sun Aug 24 20:23:44
2008
@@ -26,7 +26,7 @@
     <property file="revision.properties" />
     <property environment="env"/>
     <property name="cocoon.home" location="${env.COCOON_HOME}"/>
-    <property name="cocoon.version" value="2.2.0-dev"/>
+    <property name="cocoon.version" value="2.1.12-dev"/>
     <property name="forrest.home" location="${env.FORREST_HOME}"/>
   </target>
 



Mime
View raw message