Author: crossley Date: Sun Aug 24 22:57:22 2008 New Revision: 688626 URL: http://svn.apache.org/viewvc?rev=688626&view=rev Log: We don't name the cocoon jars with svn.revision number anymore, so revise "copy-cocoon" target and the notes. We now declare the revision number in the commit message.
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=688626&r1=688625&r2=688626&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 22:57:22 2008 @@ -14,11 +14,11 @@ 1. Keep our local.*.properties files sychronised with Cocoon's. -2. Perhaps need to update version numbers for Cocoon in ./build.xml and - the ./build.sh files. +2. Perhaps need to update version number for Cocoon in ./build.xml file. Step 3 and 4 can be done with "./build.sh 0" -3. Copy the cocoon libraries to forrest. + +3. Copy the cocoon supporting libraries to forrest. See ./build.xml where some are excluded. You might need to add/exclude others via this build.xml file. @@ -37,26 +37,15 @@ 5. cd $FORREST_HOME/etc/cocoon_upgrade -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. +Steps 6 and 7 can be done with "./build.sh 1" -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: +6. Build Cocoon core and the blocks that we need. ant build-cocoon -7. cd $FORREST_HOME/lib - -(FIXME: we don't need this 7a anymore.) -7a. For each cocoon-{name}-{cocoon.version}-{cocoon.revision}.jar - -svn mv cocoon-{name}-{cocoon.version}-{cocoon.OLDrevision}.jar -cocoon-{name}-{cocoon.version}-{cocoon.NEWrevision}.jar - -svn ci -m "prework for upgrade to {cocoon.NEWrevision}" +7. Copy the built Cocoon jars to Forrest. -7b. ant copy-cocoon + ant copy-cocoon 8. We need to make sure there is a license.txt file for each of the jars that we have in the lib/* directories. 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=688626&r1=688625&r2=688626&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 22:57:22 2008 @@ -78,10 +78,7 @@ ant copy-optional-libs svnDialog elif [ "$step" = "1" ]; then - 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.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=688626&r1=688625&r2=688626&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 22:57:22 2008 @@ -140,8 +140,9 @@ =============================================================== --> <delete> <fileset dir="${forrest.home}/lib/core" includes="cocoon-*.jar"> - <!-- exclude any temporary blocks until is official in Cocoon - <exclude name="cocoon-foo-block-2.2.0-dev.jar"/> + <!-- NOTE: If you have been experimenting with temporary blocks, then + exclude them from deletion. + <exclude name="cocoon-foo-block-r123456.jar"/> --> </fileset> </delete> @@ -152,8 +153,7 @@ </fileset> </copy> <copy todir="${forrest.home}/lib/core"> - <mapper type="glob" from="*.jar" - to="cocoon-*-${cocoon.version}.jar"/> + <mapper type="glob" from="*.jar" to="cocoon-*.jar"/> <fileset dir="${cocoon.home}/build/cocoon-${cocoon.version}/blocks"> <include name="*-block.jar"/> <!-- servlet.jar has been added within jetty-->