1.1 --- a/openide.util/build.xml	Tue Mar 09 09:53:15 2004 +0000
     1.2 +++ b/openide.util/build.xml	Thu Mar 25 16:04:45 2004 +0000
     1.3 @@ -8,86 +8,36 @@
     1.4  http://www.sun.com/
     1.5  
     1.6  The Original Code is NetBeans. The Initial Developer of the Original
     1.7 -Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
     1.8 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
     1.9  Microsystems, Inc. All Rights Reserved.
    1.10  -->
    1.11  
    1.12  <project name="openide/util" default="netbeans" basedir=".">
    1.13    <import file="../../nbbuild/default.xml"/>
    1.14  
    1.15 -  <target name="boot">
    1.16 -    <ant antfile="${nb_all}/core/build.xml" dir="${nb_all}/core" target="boot" />
    1.17 -    <property file="${moduleCluster.file}"/>
    1.18 -  </target>
    1.19 -
    1.20    <property name="nbroot" location="${nb_all}" />
    1.21  
    1.22 -  <property name="nbm_alias" value="nb_ide"/>
    1.23 -  <property name="homepage.base" value="netbeans.org"/>
    1.24 -  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
    1.25 -  <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
    1.26 -
    1.27 -  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
    1.28 -  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
    1.29 -  
    1.30 -  <path id="classpath" >
    1.31 -      <pathelement location="src" />
    1.32 -  </path>
    1.33 +  <path id="classpath"/>
    1.34    
    1.35    <target name="compile" depends="init">
    1.36      <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
    1.37 +      <property name="destdir" location="build/classes"/>
    1.38        <property name="localdir" location="src" />
    1.39        <property name="selector" value="openide.util" />
    1.40      </ant>
    1.41    </target>
    1.42    
    1.43 -  <target name="patch" depends="compile,boot" >
    1.44 -    <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="${nbroot}/nbbuild/nbantext.jar"/>
    1.45 -    
    1.46 -    <enhanceclass basedir="src" >
    1.47 -        <classpath>
    1.48 -            <pathelement location="${core.dir}/${nb.lib.dir}/ext/boot.jar"/>
    1.49 -            <!-- See xtest/instance/build-clover.xml for explanation: -->
    1.50 -            <pathelement location="${nbroot}/core/netbeans/lib/ext/clover.jar"/>
    1.51 -        </classpath>
    1.52 -        
    1.53 -        <!-- renames two methods and makes them public -->
    1.54 -        <patch class="org/openide/util/actions/SystemAction" > 
    1.55 -            <member name="s3tIcon" rename="setIcon" />
    1.56 -            <member name="g3tIcon" rename="getIcon" />
    1.57 -        </patch>
    1.58 -    </enhanceclass>
    1.59 -  </target>
    1.60 -
    1.61 -  <target name="jars" depends="compile,patch">
    1.62 -    <mkdir dir="netbeans/lib"/>
    1.63 +  <target name="jars" depends="compile">
    1.64 +    <mkdir dir="build/netbeans/lib"/>
    1.65      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
    1.66 -    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
    1.67 -    <jar jarfile="netbeans/lib/openide-util.jar" manifest="manifest-subst.mf" compress="false">
    1.68 -      <fileset dir="src">
    1.69 -        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
    1.70 -      </fileset>
    1.71 +    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
    1.72 +    <jar jarfile="build/netbeans/lib/openide-util.jar" manifest="build/manifest-subst.mf" compress="false">
    1.73 +      <fileset dir="build/classes"/>
    1.74      </jar>
    1.75    </target>
    1.76  
    1.77 -  <target name="netbeans" depends="jars">
    1.78 -    <!-- No! Not yet. Not an actual module, should be merged into other libs instead?
    1.79 -    <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
    1.80 -    -->
    1.81 -  </target>
    1.82 +  <target name="netbeans" depends="jars"/>
    1.83  
    1.84 -  <target name="nbm" depends="netbeans">
    1.85 -    <makenbm file="openide-util.nbm"
    1.86 -             topdir="."
    1.87 -             module="netbeans/lib/openide-util.jar"
    1.88 -	     homepage="http://openide.${homepage.base}/"
    1.89 -             needsrestart="false"
    1.90 -	     distribution="http://${dist.base}/openide-util.nbm">
    1.91 -      <license file="${license.file}"/>
    1.92 -      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
    1.93 -    </makenbm>
    1.94 -  </target>
    1.95 -  
    1.96    <target name="javadoc">
    1.97      <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
    1.98        <property name="localdir" location="src" />
    1.99 @@ -105,20 +55,8 @@
   1.100    
   1.101  
   1.102    <target name="clean">
   1.103 -    <delete dir="src/org/openide/resources" />
   1.104 -    <delete dir="src/org/openide/util" />
   1.105 -    <delete dir="src/org/openide/xml" />
   1.106 -    <delete >
   1.107 -      <fileset dir="src" >
   1.108 -        <include name="**/*.class" />
   1.109 -      </fileset>
   1.110 -    </delete>
   1.111 -    <delete file="manifest-subst.mf"/>
   1.112 -    <delete file="treefs.nbm"/>
   1.113 -    <delete dir="netbeans"/>
   1.114 +    <delete dir="build"/>
   1.115      <delete dir="javadoc"/>
   1.116 -    <delete dir="Info"/>
   1.117 -    <delete dir="reload"/>
   1.118    </target>
   1.119  
   1.120  </project>