1.1 --- a/mdr/build.xml	Wed Aug 21 09:24:26 2002 +0000
     1.2 +++ b/mdr/build.xml	Wed Aug 21 14:46:52 2002 +0000
     1.3 @@ -90,6 +90,26 @@
     1.4          <pathelement location="${naming.jar}"/>
     1.5          <pathelement location="${looks.jar}"/>
     1.6        </classpath>
     1.7 +      <exclude name="org/netbeans/modules/mdrtoolkit/"/>
     1.8 +    </javac>    
     1.9 +  </target>
    1.10 +
    1.11 +  <target name="toolkit-compile">
    1.12 +    <!-- sources -->
    1.13 +    <javac srcdir="src" destdir="${build.mdr.classes.dir}"
    1.14 +           debug="${build.compiler.debug}" 
    1.15 +           deprecation="${build.compiler.deprecation}">
    1.16 +      <classpath>
    1.17 +        <pathelement location="${openide-13javac-workaround.jar}"/>
    1.18 +        <fileset dir="${openide.jar.dir}">
    1.19 +            <include name="openide*.jar"/>
    1.20 +        </fileset>
    1.21 +        <pathelement location="${xml-apis.jar}"/>
    1.22 +        <pathelement location="${jmi.jar}/"/>
    1.23 +        <pathelement location="${mof.jar}/"/>
    1.24 +        <pathelement location="${openidex.jar}"/>
    1.25 +      </classpath>
    1.26 +      <include name="org/netbeans/modules/mdrtoolkit/"/>
    1.27      </javac>    
    1.28    </target>
    1.29  
    1.30 @@ -112,9 +132,6 @@
    1.31      <copy file="manifest.mf" filtering="on" tofile="${build.dir}/manifest-mdr-subst.mf"/>    
    1.32  
    1.33      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
    1.34 -    <copy file="manifest-toolkit.mf" filtering="on" tofile="${build.dir}/manifest-toolkit-subst.mf"/>    
    1.35 -
    1.36 -    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
    1.37      <copy file="manifest-mdrapi.mf" filtering="on" tofile="${build.dir}/manifest-mdrapi-subst.mf"/>    
    1.38  
    1.39      <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
    1.40 @@ -172,18 +189,6 @@
    1.41        <fileset dir="mdr-meta-inf" includes="**"/>
    1.42      </locjar>
    1.43  
    1.44 -    <locjar jarfile="${build.dir}/netbeans/modules/mdrtoolkit.jar"
    1.45 -            compress="false"             
    1.46 -            manifest="${build.dir}/manifest-toolkit-subst.mf">
    1.47 -      <locale name="ja"/>
    1.48 -      <fileset dir="${build.mdr.classes.dir}" excludesfile="${standard-jar-excludes.txt}">
    1.49 -        <include name="org/netbeans/modules/mdrtoolkit/"/>	
    1.50 -      </fileset>
    1.51 -      <fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
    1.52 -        <include name="org/netbeans/modules/mdrtoolkit/"/>  
    1.53 -      </fileset>
    1.54 -    </locjar>
    1.55 -
    1.56      <!-- Localized jar probably not needed -->
    1.57      <locjar jarfile="${build.dir}/netbeans/modules/autoload/mdrapi.jar"
    1.58              compress="false"
    1.59 @@ -211,6 +216,23 @@
    1.60        </fileset>
    1.61      </locjar>
    1.62    </target>
    1.63 +  
    1.64 +  <target name="toolkit-jar" depends="init,toolkit-compile">
    1.65 +    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
    1.66 +    <copy file="manifest-toolkit.mf" filtering="on" tofile="${build.dir}/manifest-toolkit-subst.mf"/>    
    1.67 +
    1.68 +    <locjar jarfile="${build.dir}/netbeans/modules/mdrtoolkit.jar"
    1.69 +            compress="false"             
    1.70 +            manifest="${build.dir}/manifest-toolkit-subst.mf">
    1.71 +      <locale name="ja"/>
    1.72 +      <fileset dir="${build.mdr.classes.dir}" excludesfile="${standard-jar-excludes.txt}">
    1.73 +        <include name="org/netbeans/modules/mdrtoolkit/"/>	
    1.74 +      </fileset>
    1.75 +      <fileset dir="src" excludesfile="${standard-jar-excludes.txt}">
    1.76 +        <include name="org/netbeans/modules/mdrtoolkit/"/>  
    1.77 +      </fileset>
    1.78 +    </locjar>
    1.79 +  </target>
    1.80  
    1.81    <!-- Default targets -->
    1.82    <target name="netbeans" depends="jars,release" description="Main build target - builds MDR modules and libraries.">
    1.83 @@ -221,7 +243,7 @@
    1.84    <!-- == Production of NBM ====================================== -->
    1.85    <!-- =========================================================== -->
    1.86  
    1.87 -  <target name="nbm" depends="toolkit-nbm,mdr-nbm,mdrapi-nbm,mdrexplorer-nbm"/>
    1.88 +  <target name="nbm" depends="mdr-nbm,mdrapi-nbm,mdrexplorer-nbm"/>
    1.89      
    1.90    <target name="mdrapi-nbm" depends="netbeans">
    1.91      <mkdir dir="${build.dir}/mdrapi-nbm-tmp"/>