1.1 --- a/mdr/build.xml Tue Jul 01 13:35:02 2003 +0000
1.2 +++ b/mdr/build.xml Thu Jul 03 14:09:26 2003 +0000
1.3 @@ -41,6 +41,14 @@
1.4 <property name="djava.jar.dir" location="${nbroot}/scripting/external"/>
1.5 <property name="jmi.jar.dir" location="external"/>
1.6
1.7 + <path id="cp">
1.8 + <pathelement location="${openide-13javac-workaround.jar}"/>
1.9 + <pathelement location="${openide.jar}"/>
1.10 + <pathelement location="${openide-deprecated.jar}"/> <!-- XXX -->
1.11 + <pathelement location="${openide-loaders.jar}"/> <!-- XXX -->
1.12 + <fileset dir="${xml-apis.jar.dir}" includes="xml-apis*.jar"/>
1.13 + <fileset dir="${jmi.jar.dir}" includes="*.jar"/>
1.14 + </path>
1.15 <!-- =========================================================== -->
1.16 <!-- == Taskdefs =============================================== -->
1.17 <!-- =========================================================== -->
1.18 @@ -77,20 +85,10 @@
1.19 <javac srcdir="src" destdir="${build.mdr.classes.dir}"
1.20 debug="${build.compiler.debug}"
1.21 deprecation="${build.compiler.deprecation}">
1.22 + <classpath refid="cp"/>
1.23 <classpath>
1.24 - <pathelement location="${openide-13javac-workaround.jar}"/>
1.25 - <pathelement location="${openide.jar}"/>
1.26 - <pathelement location="${openide-deprecated.jar}"/> <!-- XXX -->
1.27 - <pathelement location="${openide-loaders.jar}"/> <!-- XXX -->
1.28 - <fileset dir="${xml-apis.jar.dir}">
1.29 - <include name="xml-apis*.jar"/>
1.30 - </fileset>
1.31 - <fileset dir="external">
1.32 - <include name="jmi*.jar"/>
1.33 - <include name="mof*.jar"/>
1.34 - </fileset>
1.35 - <pathelement location="${naming.jar}"/>
1.36 - <pathelement location="${looks.jar}"/>
1.37 + <pathelement location="${naming.jar}"/>
1.38 + <pathelement location="${looks.jar}"/>
1.39 </classpath>
1.40 <exclude name="org/netbeans/modules/mdrtoolkit/"/>
1.41 <exclude name="org/netbeans/mdrshell/"/>
1.42 @@ -101,18 +99,9 @@
1.43 <javac srcdir="src" destdir="${build.mdr.classes.dir}"
1.44 debug="${build.compiler.debug}"
1.45 deprecation="${build.compiler.deprecation}">
1.46 + <classpath refid="cp"/>
1.47 <classpath>
1.48 - <pathelement location="${openide-13javac-workaround.jar}"/>
1.49 - <pathelement location="${openide.jar}"/>
1.50 - <pathelement location="${openide-deprecated.jar}"/> <!-- XXX -->
1.51 - <pathelement location="${openide-loaders.jar}"/> <!-- XXX -->
1.52 - <fileset dir="${djava.jar.dir}">
1.53 - <include name="djava*.jar"/>
1.54 - </fileset>
1.55 - <fileset dir="${jmi.jar.dir}">
1.56 - <include name="jmi*.jar"/>
1.57 - <include name="mof*.jar"/>
1.58 - </fileset>
1.59 + <fileset dir="${djava.jar.dir}" includes="djava*.jar"/>
1.60 </classpath>
1.61 <include name="org/netbeans/mdrshell/"/>
1.62 </javac>
1.63 @@ -123,18 +112,8 @@
1.64 <javac srcdir="src" destdir="${build.mdr.classes.dir}"
1.65 debug="${build.compiler.debug}"
1.66 deprecation="${build.compiler.deprecation}">
1.67 + <classpath refid="cp"/>
1.68 <classpath>
1.69 - <pathelement location="${openide-13javac-workaround.jar}"/>
1.70 - <pathelement location="${openide.jar}"/>
1.71 - <pathelement location="${openide-deprecated.jar}"/> <!-- XXX -->
1.72 - <pathelement location="${openide-loaders.jar}"/> <!-- XXX -->
1.73 - <fileset dir="${xml-apis.jar.dir}">
1.74 - <include name="xml-apis*.jar"/>
1.75 - </fileset>
1.76 - <fileset dir="${jmi.jar.dir}">
1.77 - <include name="jmi*.jar"/>
1.78 - <include name="mof*.jar"/>
1.79 - </fileset>
1.80 <pathelement location="${openidex.jar}"/>
1.81 </classpath>
1.82 <include name="org/netbeans/modules/mdrtoolkit/"/>
1.83 @@ -420,72 +399,19 @@
1.84 </makenbm>
1.85 </target>
1.86
1.87 - <target name="apichanges-check" description="Check syntax of API changes list. Requires Ant 1.4!">
1.88 - <xmlvalidate file="api/doc/changes/apichanges.xml" failonerror="true"/>
1.89 - </target>
1.90 - <target name="apichanges" description="Regenerate HTML from XML API changes list." depends="apichanges-check">
1.91 - <!-- Ant 1.3 and 1.4 disagree on style attribute. -->
1.92 - <!-- 1.3: treated as a name relative to XML file. -->
1.93 - <!-- 1.4: treated as a filename consistent with normal Ant usage. -->
1.94 - <!-- Be safe and give the absolute path here. -->
1.95 - <style in="api/doc/changes/apichanges.xml" out="www/apichanges.html" destdir="www" style="api/doc/changes/apichanges.xsl"/>
1.96 - </target>
1.97 + <!-- =========================================================== -->
1.98 + <!-- == Production of JavaDoc and API changes ================== -->
1.99 + <!-- =========================================================== -->
1.100
1.101 - <target name="javadoc" depends="clean,mdr-apis">
1.102 - <copy todir="${build.dir}/javadoc">
1.103 - <fileset dir="${build.dir}">
1.104 - <include name="MdrAPIs/**"/>
1.105 - <include name="MdrAPIs.zip"/>
1.106 - </fileset>
1.107 - </copy>
1.108 - </target>
1.109 -
1.110 - <!-- todo: better javadoc -->
1.111 - <target name="mdr-apis" depends="netbeans">
1.112 - <property name="jdk-docs-location" value="http://java.sun.com/j2se/1.3/docs/api"/>
1.113 - <property name="openide-docs-location" value="http://www.netbeans.org/download/apis/"/>
1.114 - <property name="openide.package-list.loc" location="${nbroot}/openide/OpenAPIs"/>
1.115 - <property name="looks-docs-location" value="../LooksAPIs"/>
1.116 - <property name="looks.package-list.loc" location="${nbroot}/openidex/looks/LooksAPIs"/>
1.117 - <echo message="Build MDR API documentation..."/>
1.118 - <delete dir="${build.dir}/MdrAPIs"/>
1.119 - <mkdir dir="${build.dir}/MdrAPIs"/>
1.120 - <javadoc destdir="${build.dir}/MdrAPIs"
1.121 - packagenames="org.netbeans.api.*"
1.122 - doctitle="Metadata Repository Javadoc"
1.123 - windowtitle="MDR Javadoc"
1.124 - use="true"
1.125 - splitindex="true"
1.126 - author="false"
1.127 - version="false"
1.128 - maxmemory="64m">
1.129 - <sourcepath path="src"/>
1.130 - <classpath>
1.131 - <pathelement location="${openide-13javac-workaround.jar}"/>
1.132 - <pathelement location="${openide.jar}"/>
1.133 - <pathelement location="${openide-deprecated.jar}"/> <!-- XXX -->
1.134 - <pathelement location="${openide-loaders.jar}"/> <!-- XXX -->
1.135 - <fileset dir="${xml-apis.jar.dir}">
1.136 - <include name="xml-apis*.jar"/>
1.137 - </fileset>
1.138 - <fileset dir="${jmi.jar.dir}">
1.139 - <include name="*.jar"/>
1.140 - </fileset>
1.141 - </classpath>
1.142 - <link href="${jdk-docs-location}"
1.143 - offline="true"
1.144 - packagelistLoc="${nbroot}/openide/api/doc"
1.145 - />
1.146 - <link href="${openide-docs-location}"
1.147 - offline="true"
1.148 - packagelistLoc="${openide.package-list.loc}"
1.149 - />
1.150 - <link href="${looks-docs-location}"
1.151 - offline="true"
1.152 - packagelistLoc="${looks.package-list.loc}"
1.153 - />
1.154 - </javadoc>
1.155 - <zip zipfile="${build.dir}/MdrAPIs.zip" basedir="${build.dir}/MdrAPIs"/>
1.156 + <target name="javadoc">
1.157 + <ant dir="${nbext}/javadoctools" antfile="template.xml" target="javadoc">
1.158 + <property name="javadoc.base" location="." />
1.159 + <property name="javadoc.name" value="Metadata Repository API" />
1.160 + <property name="javadoc.title" value="Metadata Repository API" />
1.161 + <property name="javadoc.packages" value="org.netbeans.api.mdr,org.netbeans.api.xmi" />
1.162 + <property name="javadoc.classpath" refid="cp" />
1.163 + <property name="javadoc.apichanges" location="api/doc/changes/apichanges.xml" />
1.164 + </ant>
1.165 </target>
1.166
1.167 <!-- =========================================================== -->