1.1 --- a/mdr/build.xml	Mon Aug 19 14:39:03 2002 +0000
     1.2 +++ b/mdr/build.xml	Tue Aug 20 16:07:56 2002 +0000
     1.3 @@ -27,7 +27,7 @@
     1.4    <property name="dist.base" value="www.netbeans.org/download/nbms/40/MDR"/>
     1.5    <property name="build.dir" location="."/>
     1.6    <property name="build.mdr.classes.dir" location="${build.dir}/src"/>
     1.7 -  <property name="build.jmi.classes.dir" location="${build.dir}/jmi"/>
     1.8 +  <property name="mdrbin" location="${binroot}/mdr/release"/>
     1.9  
    1.10    <!-- all external files and directories -->
    1.11    <property name="nbantext.jar" location="${nbext}/nbantext.jar"/>
    1.12 @@ -39,8 +39,9 @@
    1.13    <property name="naming.jar" location="${nbroot}/core/naming/netbeans/modules/autoload/naming.jar"/>
    1.14    <property name="looks.jar" location="${nbroot}/openidex/looks/netbeans/modules/autoload/looks.jar"/>
    1.15    <property name="standard-jar-excludes.txt" location="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
    1.16 -  <property name="mof.xml" location="jmi/mof.xml"/>
    1.17    <property name="standard-nbm-license.txt" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
    1.18 +  <property name="mof.jar" location="${mdrbin}/modules/autoload/mof.jar"/>
    1.19 +  <property name="jmi.jar" location="${mdrbin}/modules/autoload/jmi.jar"/>
    1.20  
    1.21    <!-- =========================================================== -->
    1.22    <!-- == Taskdefs =============================================== -->
    1.23 @@ -62,7 +63,6 @@
    1.24      <property name="buildnumber" value="${DSTAMP}-${TSTAMP}"/>
    1.25      <echo message="buildnumber = ${buildnumber}"/>
    1.26      
    1.27 -    <mkdir dir="${build.jmi.classes.dir}"/>
    1.28      <mkdir dir="${build.mdr.classes.dir}"/>
    1.29    </target>
    1.30  
    1.31 @@ -72,25 +72,7 @@
    1.32  
    1.33    <target name="compile" depends="compile-src"/>
    1.34    
    1.35 -  <target name="compile-jmi">
    1.36 -    <!-- sources -->
    1.37 -    <javac srcdir="jmi" destdir="${build.jmi.classes.dir}"
    1.38 -           debug="${build.compiler.debug}" 
    1.39 -           deprecation="${build.compiler.deprecation}">
    1.40 -      <classpath>
    1.41 -        <pathelement location="${openide-13javac-workaround.jar}"/>
    1.42 -        <fileset dir="${openide.jar.dir}">
    1.43 -            <include name="openide*.jar"/>
    1.44 -        </fileset>
    1.45 -        <pathelement location="${xml-apis.jar}"/>
    1.46 -        <pathelement location="${djava.jar}"/>
    1.47 -        <pathelement location="${build.jmi.classes.dir}/"/>
    1.48 -        <pathelement location="${openidex.jar}"/>
    1.49 -      </classpath>
    1.50 -    </javac>    
    1.51 -  </target>
    1.52 -
    1.53 -  <target name="compile-src" depends="compile-jmi">
    1.54 +  <target name="compile-src">
    1.55      <!-- sources -->
    1.56      <javac srcdir="src" destdir="${build.mdr.classes.dir}"
    1.57             debug="${build.compiler.debug}" 
    1.58 @@ -102,30 +84,13 @@
    1.59          </fileset>
    1.60          <pathelement location="${xml-apis.jar}"/>
    1.61          <pathelement location="${djava.jar}"/>
    1.62 -        <pathelement location="${build.jmi.classes.dir}/"/>
    1.63 -        <pathelement location="${openidex.jar}"/>
    1.64 -      </classpath>
    1.65 -      <exclude name="org/netbeans/modules/mdrexplorer/**"/>
    1.66 -    </javac>    
    1.67 -  </target>
    1.68 -
    1.69 -  <target name="compile-explorer" depends="compile-jmi,compile-src">
    1.70 -    <javac srcdir="src" destdir="${build.mdr.classes.dir}"
    1.71 -           debug="${build.compiler.debug}" 
    1.72 -           deprecation="${build.compiler.deprecation}">
    1.73 -      <classpath>
    1.74 -        <pathelement location="${openide-13javac-workaround.jar}"/>
    1.75 -        <fileset dir="${openide.jar.dir}">
    1.76 -            <include name="openide*.jar"/>
    1.77 -        </fileset>
    1.78 -        <pathelement location="${xml-apis.jar}"/>
    1.79 -        <pathelement location="${djava.jar}"/>
    1.80 -        <pathelement location="${build.jmi.classes.dir}/"/>
    1.81 +        <pathelement location="${jmi.jar}/"/>
    1.82 +        <pathelement location="${mof.jar}/"/>
    1.83          <pathelement location="${openidex.jar}"/>
    1.84          <pathelement location="${naming.jar}"/>
    1.85          <pathelement location="${looks.jar}"/>
    1.86        </classpath>
    1.87 -    </javac> 
    1.88 +    </javac>    
    1.89    </target>
    1.90  
    1.91    <!-- =========================================================== -->
    1.92 @@ -134,44 +99,13 @@
    1.93  
    1.94    <target name="jars" depends="init,jars-all"/>
    1.95  
    1.96 -  <target name="jars-jmi" depends="compile-jmi">
    1.97 -    <mkdir dir="${build.dir}/netbeans/modules"/>
    1.98 -    <mkdir dir="${build.dir}/netbeans/modules/autoload"/>
    1.99 -    <mkdir dir="${build.jmi.classes.dir}/javax/jmi/model/resources"/>
   1.100 +  <target name="release">
   1.101 +    <copy todir="${build.dir}/netbeans">
   1.102 +      <fileset dir="${mdrbin}"/>
   1.103 +    </copy>
   1.104 +  </target>
   1.105  
   1.106 -    <copy file="${mof.xml}" tofile="${build.jmi.classes.dir}/javax/jmi/model/resources/mof.xml"/>
   1.107 -
   1.108 -    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
   1.109 -    <copy file="manifest-mof.mf" filtering="on" tofile="${build.dir}/manifest-mof-subst.mf"/>    
   1.110 -
   1.111 -    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
   1.112 -    <copy file="manifest-jmi.mf" filtering="on" tofile="${build.dir}/manifest-jmi-subst.mf"/>    
   1.113 -
   1.114 -    <locjar jarfile="${build.dir}/netbeans/modules/autoload/mof.jar"
   1.115 -            manifest="${build.dir}/manifest-mof-subst.mf"
   1.116 -            compress="false">
   1.117 -      <locale name="ja"/>
   1.118 -      <fileset dir="${build.jmi.classes.dir}" excludesfile="${standard-jar-excludes.txt}">
   1.119 -        <include name="javax/"/>
   1.120 -	    <exclude name="javax/jmi/reflect/"/>
   1.121 -        <exclude name="javax/jmi/xmi/"/>
   1.122 -      </fileset>
   1.123 -    </locjar>
   1.124 -
   1.125 -    <locjar jarfile="${build.dir}/netbeans/modules/autoload/jmi.jar"
   1.126 -            manifest="${build.dir}/manifest-jmi-subst.mf"
   1.127 -            compress="false">
   1.128 -      <locale name="ja"/>
   1.129 -      <fileset dir="${build.jmi.classes.dir}" excludesfile="${standard-jar-excludes.txt}">
   1.130 -        <include name="javax/jmi/reflect/"/>
   1.131 -        <include name="javax/jmi/xmi/"/>
   1.132 -      </fileset>
   1.133 -    </locjar>
   1.134 -  </target>
   1.135 -  
   1.136 -  <target name="jars-all" depends="jars-mdr,explorer-jar"/>
   1.137 -  
   1.138 -  <target name="jars-mdr" depends="compile,jars-jmi">
   1.139 +  <target name="jars-all" depends="compile">
   1.140      <mkdir dir="${build.dir}/apps"/>
   1.141  
   1.142      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
   1.143 @@ -183,6 +117,9 @@
   1.144      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
   1.145      <copy file="manifest-mdrapi.mf" filtering="on" tofile="${build.dir}/manifest-mdrapi-subst.mf"/>    
   1.146  
   1.147 +    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
   1.148 +    <copy file="manifest-explorer.mf" filtering="on" tofile="${build.dir}/manifest-explorer-subst.mf"/> 
   1.149 +
   1.150      <locjar jarfile="${build.dir}/netbeans/modules/ext/nbmdr.jar"
   1.151              compress="false">
   1.152        <locale name="ja"/>
   1.153 @@ -261,12 +198,6 @@
   1.154          <exclude name="org/netbeans/api/mdr/events/doc-files/"/>
   1.155        </fileset>
   1.156      </locjar>
   1.157 -  </target>
   1.158 -
   1.159 -  <target name="explorer-jar" depends="compile-explorer, init">
   1.160 -  
   1.161 -    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
   1.162 -    <copy file="manifest-explorer.mf" filtering="on" tofile="${build.dir}/manifest-explorer-subst.mf"/> 
   1.163  
   1.164      <locjar jarfile="${build.dir}/netbeans/modules/mdrexplorer.jar"
   1.165        compress="false"             
   1.166 @@ -279,18 +210,10 @@
   1.167          <include name="org/netbeans/modules/mdrexplorer/"/> 
   1.168        </fileset>
   1.169      </locjar>
   1.170 -    
   1.171 -  </target>
   1.172 -
   1.173 -  <!-- =========================================================== -->
   1.174 -  <!-- == MDR-Explorer target =================================== -->
   1.175 -  <!-- =========================================================== -->
   1.176 -
   1.177 -  <target name="mdrexplorer" depends="explorer-jar">
   1.178    </target>
   1.179  
   1.180    <!-- Default targets -->
   1.181 -  <target name="netbeans" depends="jars" description="Main build target, builds only MDR modules and libraries.">
   1.182 +  <target name="netbeans" depends="jars,release" description="Main build target - builds MDR modules and libraries.">
   1.183        <!--genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/-->
   1.184    </target>
   1.185  
   1.186 @@ -298,7 +221,7 @@
   1.187    <!-- == Production of NBM ====================================== -->
   1.188    <!-- =========================================================== -->
   1.189  
   1.190 -  <target name="nbm" depends="toolkit-nbm,mdr-nbm,jmi-nbm,mof-nbm,mdrapi-nbm,mdrexplorer-nbm"/>
   1.191 +  <target name="nbm" depends="toolkit-nbm,mdr-nbm,mdrapi-nbm,mdrexplorer-nbm"/>
   1.192      
   1.193    <target name="mdrapi-nbm" depends="netbeans">
   1.194      <mkdir dir="${build.dir}/mdrapi-nbm-tmp"/>
   1.195 @@ -360,6 +283,7 @@
   1.196               module="netbeans/modules/autoload/jmi.jar"
   1.197  	     homepage="http://mdr.${homepage.base}/"
   1.198  	     distribution="http://${dist.base}/jmi.nbm">
   1.199 +      <license file="jmi-license.txt"/>
   1.200      </makenbm>
   1.201    </target>
   1.202    
   1.203 @@ -375,10 +299,11 @@
   1.204               module="netbeans/modules/autoload/mof.jar"
   1.205  	     homepage="http://mdr.${homepage.base}/"
   1.206  	     distribution="http://${dist.base}/mof.nbm">
   1.207 +      <license file="mof-license.txt"/>
   1.208      </makenbm>
   1.209    </target>
   1.210  
   1.211 -  <target name="mdrexplorer-nbm" depends="explorer-jar">
   1.212 +  <target name="mdrexplorer-nbm" depends="netbeans">
   1.213  	<mkdir dir="${build.dir}/mdrexplorer-nbm-tmp"/>
   1.214  	<copy todir="${build.dir}/mdrexplorer-nbm-tmp">
   1.215  		<fileset dir="${build.dir}">
   1.216 @@ -456,12 +381,6 @@
   1.217          <include name="**/*.class"/>
   1.218        </fileset>
   1.219      </delete>
   1.220 -    <delete>
   1.221 -      <fileset dir="${build.jmi.classes.dir}">
   1.222 -        <include name="**/*.class"/>
   1.223 -      </fileset>
   1.224 -    </delete>
   1.225 -    <delete dir="${build.jmi.classes.dir}/javax/jmi/model/resources"/>
   1.226      <delete file="${build.dir}/manifest-mdr-subst.mf"/>
   1.227      <delete file="${build.dir}/manifest-mdrapi-subst.mf"/>
   1.228      <delete file="${build.dir}/manifest-toolkit-subst.mf"/>
   1.229 @@ -471,15 +390,11 @@
   1.230      <delete file="${build.dir}/mdr.nbm"/>
   1.231      <delete file="${build.dir}/mdrapi.nbm"/>
   1.232      <delete file="${build.dir}/mdrtoolkit.nbm"/>
   1.233 -    <delete file="${build.dir}/mof.nbm"/>
   1.234 -    <delete file="${build.dir}/jmi.nbm"/>
   1.235      <delete file="${build.dir}/mdrexplorer.nbm"/>
   1.236      <delete dir="${build.dir}/netbeans"/>
   1.237      <delete dir="${build.dir}/apps"/>
   1.238      <delete dir="${build.dir}/Info"/>
   1.239      <delete dir="${build.dir}/toolkit-nbm-tmp"/>
   1.240 -    <delete dir="${build.dir}/jmi-nbm-tmp"/>
   1.241 -    <delete dir="${build.dir}/mof-nbm-tmp"/>
   1.242      <delete dir="${build.dir}/mdrapi-nbm-tmp"/>
   1.243      <delete dir="${build.dir}/mdrexplorer-nbm-tmp"/>
   1.244      <delete dir="${build.dir}/javadoc"/>