1.1 --- a/openide.util/build.xml	Mon Nov 24 08:07:56 2003 +0000
     1.2 +++ b/openide.util/build.xml	Tue Mar 09 09:53:15 2004 +0000
     1.3 @@ -13,7 +13,14 @@
     1.4  -->
     1.5  
     1.6  <project name="openide/util" default="netbeans" basedir=".">
     1.7 -  <property name="nbroot" location="../.." />
     1.8 +  <import file="../../nbbuild/default.xml"/>
     1.9 +
    1.10 +  <target name="boot">
    1.11 +    <ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
    1.12 +    <property file="${moduleCluster.file}"/>
    1.13 +  </target>
    1.14 +
    1.15 +  <property name="nbroot" location="${nb_all}" />
    1.16  
    1.17    <property name="nbm_alias" value="nb_ide"/>
    1.18    <property name="homepage.base" value="netbeans.org"/>
    1.19 @@ -27,20 +34,19 @@
    1.20        <pathelement location="src" />
    1.21    </path>
    1.22    
    1.23 -  <target name="compile" >
    1.24 +  <target name="compile" depends="init">
    1.25      <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
    1.26        <property name="localdir" location="src" />
    1.27        <property name="selector" value="openide.util" />
    1.28      </ant>
    1.29    </target>
    1.30    
    1.31 -  <target name="patch" depends="compile" >
    1.32 +  <target name="patch" depends="compile,boot" >
    1.33      <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="${nbroot}/nbbuild/nbantext.jar"/>
    1.34 -    <ant antfile="${nbroot}/core/build.xml" dir="${nbroot}/core" target="boot" />
    1.35      
    1.36      <enhanceclass basedir="src" >
    1.37          <classpath>
    1.38 -            <pathelement location="${nbroot}/core/netbeans/lib/ext/boot.jar"/>
    1.39 +            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
    1.40              <!-- See xtest/instance/build-clover.xml for explanation: -->
    1.41              <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
    1.42          </classpath>