svn commit: r280710 - in /forrest/trunk/etc/cocoon_upgrade: README.txt build.sh build.xml

[th...@apache.org]

Author: thorsten
Date: Tue Sep 13 16:04:44 2005
New Revision: 280710

URL: http://svn.apache.org/viewcvs?rev=280710&view=rev
Log:
Added a shell script to do some steps of the cocoon update process. Still there are some steps that should rather be done by a script then committer interaction. Updated the readme to state that some steps could be done by the script.

Added:
    forrest/trunk/etc/cocoon_upgrade/build.sh   (with props)
Modified:
    forrest/trunk/etc/cocoon_upgrade/README.txt
    forrest/trunk/etc/cocoon_upgrade/build.xml

Modified: forrest/trunk/etc/cocoon_upgrade/README.txt
URL: http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/README.txt?rev=280710&r1=280709&r2=280710&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/README.txt (original)
+++ forrest/trunk/etc/cocoon_upgrade/README.txt Tue Sep 13 16:04:44 2005
@@ -6,9 +6,15 @@
 
 Instructions for use:
 
+NOTE:
+Make sure that you have set $COCOON_HOME like e.g.:
+#COCOON_HOME
+export COCOON_HOME=/home/thorsten/apache/cocoon-trunk/
+
 1. cd $FORREST_HOME/etc/cocoon_upgrade
 
-2. Copy all cocoon libraries.
+Step 2 and 3 can be done with "./build.sh 0"
+2. Copy all cocoon libraries to forrest.
     ant copy-core-libs
     ant copy-endorsed-libs
     ant copy-optional-libs
@@ -22,6 +28,7 @@
 
 4. cd $FORREST_HOME/etc/cocoon_upgrade
 
+Steps 5 and 6 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
    ant build-cocoon
 

Added: forrest/trunk/etc/cocoon_upgrade/build.sh
URL: http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/build.sh?rev=280710&view=auto
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/build.sh (added)
+++ forrest/trunk/etc/cocoon_upgrade/build.sh Tue Sep 13 16:04:44 2005
@@ -0,0 +1,91 @@
+#!/bin/sh
+# Copyright 2002-2004 The Apache Software Foundation or its licensors,
+# as applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+help()
+{
+  cat <<HELP
+*********************************************************
+This script should help you to update cocoon for forrest.
+*********************************************************
+NOTE: 
+Please read README.txt *before* using this script. 
+###################################################
+It is devided in mutliple steps because you need to controll the outcome of the script manually. Read the README.txt
+
+Usage:
+./build.sh -h -> shows this help
+./build.sh 0 -> execute the first step of this script
+HELP
+  exit 0
+}
+error()
+{
+cat<<ERROR
+error: 
+Please use ./build.sh -h to see the help. You have to provide the step you want to execute. Like ./build.sh -s 0
+ERROR
+}
+svnDialog()
+{
+  cd  $FORREST_HOME/lib
+  cat<<CONTROL
+***************    
+svn st - Output
+***************
+CONTROL
+  svn st
+  cat<<CONTROL
+*****************************    
+Please check the above output. 
+******************************
+Verify that all there is not two versions of libraries within same directory. If you see "?" that means you need to resolve by hand. Start with:
+
+cd $FORREST_HOME/lib;svn st
+
+#################################
+Follow README.txt for next steps
+#################################
+
+CONTROL
+}
+step=
+[ -z "$1" ] && help
+[ "$1" = "-h" ] && help
+step=$1
+
+cd $FORREST_HOME/etc/cocoon_upgrade
+if [ -z $step ]; then
+	echo no step
+  error
+else
+  echo Trying to execute step $step
+  if [ "$step" = "0" ]; then
+    ant copy-core-libs
+    ant copy-endorsed-libs
+    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.2.0-dev
+     svnDialog
+  else
+    echo step $step not found
+    error
+  fi
+fi
+

Propchange: forrest/trunk/etc/cocoon_upgrade/build.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/etc/cocoon_upgrade/build.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: forrest/trunk/etc/cocoon_upgrade/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/build.xml?rev=280710&r1=280709&r2=280710&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/build.xml (original)
+++ forrest/trunk/etc/cocoon_upgrade/build.xml Tue Sep 13 16:04:44 2005
@@ -23,6 +23,7 @@
   <!-- ===============================================================
        Set properties
        =============================================================== -->
+    <property file="revision.properties" />
     <property environment="env"/>
     <property name="cocoon.home" location="${env.COCOON_HOME}"/>
     <property name="cocoon.version" value="2.2.0-dev"/>