1.1 --- a/visualweb/ravebuild/build.properties	Tue Feb 06 17:02:47 2007 +0000
     1.2 +++ b/visualweb/ravebuild/build.properties	Tue Feb 06 18:59:27 2007 +0000
     1.3 @@ -21,3 +21,7 @@
     1.4  # the corresponding file will be removed from the original NB source!!
     1.5  # Look at the j2ee or j2eeserver modules as examples.
     1.6  #netbeans.forked.modules=libs,xml
     1.7 +
     1.8 +netbeans.dest.dir=rave
     1.9 +#netbeans.location=../../nbbuild/netbeans
    1.10 +nojdkCopy=true

     2.1 --- a/visualweb/ravebuild/build.xml	Tue Feb 06 17:02:47 2007 +0000
     2.2 +++ b/visualweb/ravebuild/build.xml	Tue Feb 06 18:59:27 2007 +0000
     2.3 @@ -97,7 +97,7 @@
     2.4          unless="skip.netbeans.copy">
     2.5          <mkdir dir="${netbeans.dest.dir}"/>
     2.6          <copy overwrite="true" todir="${netbeans.dest.dir}">
     2.7 -            <fileset dir="${netbeans.location}" includes="**"/>
     2.8 +            <fileset dir="${netbeans.dir}" includes="**"/>
     2.9          </copy>
    2.10          <chmod perm="755" file="${netbeans.dest.dir}/bin/netbeans"/>
    2.11          <property name="cluster.location" location="${netbeans.dest.dir}/visualweb1"/>
    2.12 @@ -255,10 +255,22 @@
    2.13      </target>
    2.14  
    2.15      <target name="-validate-cache">
    2.16 +
    2.17 +        <condition property="netbeans.dir.tmp" value="${netbeans.location}">
    2.18 +            <available file="${netbeans.location}/bin/netbeans"/>
    2.19 +        </condition>
    2.20 +
    2.21 +        <condition property="netbeans.dir" value="../../nbbuild/netbeans">
    2.22 +            <not>
    2.23 +                <isset property="netbeans.dir.tmp"/>
    2.24 +            </not>
    2.25 +        </condition>
    2.26 +        <property name="netbeans.dir" location="${netbeans.location}"/>
    2.27 +
    2.28 +
    2.29          <condition property="netbeans.bin.available">
    2.30              <or>
    2.31 -		<available file="${basedir}/../../nbbuild" type="dir"/>
    2.32 -                <available file="${netbeans.location}/bin/netbeans"/>
    2.33 +                <available file="${netbeans.dir}/bin/netbeans"/>
    2.34  		<isset property="bypass.cache.validation"/>
    2.35              </or>
    2.36  	</condition>
    2.37 @@ -1043,6 +1055,7 @@
    2.38      </target>
    2.39  
    2.40      <target name="-unzip-netbeans-bin" depends="-get-netbeans-bin, init">
    2.41 +        <mkdir dir="${nb.bin.base}"/>
    2.42          <!-- use exec to avoid the file permission preservation issue in ant -->
    2.43          <exec dir="${basedir}" executable="unzip" failonerror="true">
    2.44              <arg line="${cache.dir}/${nb.bin.zip} -d ${nb.bin.base}"/>