Could someone please verify that this script still runs on non windows systems? (I currently don't have a required system at hand).
Thanks Carsten [EMAIL PROTECTED] wrote: > Author: cziegeler > Date: Sun Jul 31 07:00:34 2005 > New Revision: 226644 > > URL: http://svn.apache.org/viewcvs?rev=226644&view=rev > Log: > Make update script runnable using windows > Exclude new jcr block > > Modified: > forrest/trunk/etc/cocoon_upgrade/build.xml > forrest/trunk/etc/cocoon_upgrade/local.blocks.properties > > Modified: forrest/trunk/etc/cocoon_upgrade/build.xml > URL: > http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/build.xml?rev=226644&r1=226643&r2=226644&view=diff > ============================================================================== > --- forrest/trunk/etc/cocoon_upgrade/build.xml (original) > +++ forrest/trunk/etc/cocoon_upgrade/build.xml Sun Jul 31 07:00:34 2005 > @@ -100,8 +100,16 @@ > <copy todir="${cocoon.home}"> > <fileset dir="." includes="local.*.properties"/> > </copy> > -<!-- FIXME: This only works within unix --> > - <exec dir="${cocoon.home}" executable="${cocoon.home}/build.sh"/> > + <condition property="build.script" value="build.bat"> > + <os family="windows"/> > + </condition> > + <condition property="build.script" value="build.sh"> > + <not> > + <os family="windows"/> > + </not> > + </condition> > + > + <exec dir="${cocoon.home}" executable="${cocoon.home}/${build.script}"/> > </target> > > <target name="copy-cocoon" depends="init"> > > Modified: forrest/trunk/etc/cocoon_upgrade/local.blocks.properties > URL: > http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/local.blocks.properties?rev=226644&r1=226643&r2=226644&view=diff > ============================================================================== > --- forrest/trunk/etc/cocoon_upgrade/local.blocks.properties (original) > +++ forrest/trunk/etc/cocoon_upgrade/local.blocks.properties Sun Jul 31 > 07:00:34 2005 > @@ -1,6 +1,5 @@ > > -# Copyright 1999-2004 The Apache Software Foundation or its licensors, > -# as applicable. > +# Copyright 1999-2005 The Apache Software Foundation > # > # Licensed under the Apache License, Version 2.0 (the "License"); > # you may not use this file except in compliance with the License. > @@ -122,6 +121,7 @@ > #-----[dependency]: "javaflow" depends on "forms", "ojb" (for samples). > #-----[dependency]: "javaflow" is needed by "scratchpad". > include.block.javaflow=false > +include.block.jcr=false > #-----[dependency]: "jms" depends on "databases" (for samples), "hsqldb" > (for samples). > #-----[dependency]: "jms" is needed by "eventcache", "slide". > include.block.jms=false > > > -- Carsten Ziegeler - Open Source Group, S&N AG http://www.s-und-n.de http://www.osoco.org/weblogs/rael/
