1.1 --- a/vcscore/build.xml	Wed Jul 02 08:03:05 2003 +0000
     1.2 +++ b/vcscore/build.xml	Wed Jul 02 08:10:44 2003 +0000
     1.3 @@ -26,19 +26,21 @@
     1.4    <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
     1.5    <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
     1.6  
     1.7 +  <path id="cp">
     1.8 +    <pathelement location="../openidex/netbeans/modules/autoload/openidex.jar"/>
     1.9 +    <pathelement location="../openide/openide-13javac-workaround.jar"/>
    1.10 +    <pathelement location="../openide/netbeans/lib/openide.jar"/>
    1.11 +    <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
    1.12 +    <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
    1.13 +    <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
    1.14 +    <fileset dir="../libs/external">
    1.15 +      <include name="regexp*.jar" />
    1.16 +    </fileset>
    1.17 +  </path>
    1.18 +
    1.19    <target name="compile">
    1.20      <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
    1.21 -      <classpath>
    1.22 -        <pathelement location="../openidex/netbeans/modules/autoload/openidex.jar"/>
    1.23 -      	<pathelement location="../openide/openide-13javac-workaround.jar"/>
    1.24 -      	<pathelement location="../openide/netbeans/lib/openide.jar"/>
    1.25 -        <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
    1.26 -        <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
    1.27 -        <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
    1.28 -        <fileset dir="../libs/external">
    1.29 -          <include name="regexp*.jar" />
    1.30 -        </fileset>
    1.31 -      </classpath>
    1.32 +      <classpath refid="cp"/>
    1.33      </javac>
    1.34    </target>
    1.35  
    1.36 @@ -55,14 +57,6 @@
    1.37      </locjar>
    1.38    </target>
    1.39  
    1.40 -  <!--
    1.41 -  <target name="javahelp">
    1.42 -    <copy todir="netbeans/docs">
    1.43 -      <fileset dir="javahelp"/>
    1.44 -    </copy>
    1.45 -  </target>
    1.46 -  -->
    1.47 -  
    1.48    <target name="netbeans" depends="jars">
    1.49      <genlist targetname="nbm" outputfiledir="netbeans"/>
    1.50    </target>
    1.51 @@ -78,47 +72,19 @@
    1.52      </makenbm>
    1.53    </target>
    1.54  
    1.55 -  <!-- VCS API documentation -->
    1.56 -  <target name="vcs-apis" description="Create VCS API documentation.">
    1.57 -    <property name="jdk-docs-location" value="http://java.sun.com/j2se/1.3/docs/api"/>
    1.58 -    <property name="regexp-docs-location" value="http://jakarta.apache.org/regexp/apidocs/"/>
    1.59 -    <property name="openide-docs-location" value="http://www.netbeans.org/download/apis/"/>
    1.60 -    <echo message="Build VCS API documentation..."/>
    1.61 -    <mkdir dir="VCSAPIs"/>
    1.62 -    <javadoc destdir="VCSAPIs"
    1.63 -             packagenames="org.netbeans.api.vcs,org.netbeans.api.vcs.commands,org.netbeans.spi.vcs,org.netbeans.spi.vcs.commands"
    1.64 -             doctitle="NetBeans VCS APIs"
    1.65 -             use="true"
    1.66 -             splitindex="true"
    1.67 -             author="false"
    1.68 -             version="false"
    1.69 -             maxmemory="64m"
    1.70 -    >
    1.71 -      <sourcepath>
    1.72 -        <pathelement location="api/doc"/>
    1.73 -        <pathelement location="src"/>
    1.74 -      </sourcepath>
    1.75 -      <classpath>
    1.76 -        <fileset dir="${nbroot}/openide/netbeans/lib">
    1.77 -          <include name="openide*.jar" />
    1.78 -        </fileset>
    1.79 -        <fileset dir="../libs/external">
    1.80 -          <include name="regexp*.jar" />
    1.81 -        </fileset>
    1.82 -      </classpath>
    1.83 -      <link href="${jdk-docs-location}"
    1.84 -            offline="true"
    1.85 -            packagelistLoc="${nbroot}/openide/api/doc"
    1.86 -      />
    1.87 -      <link href="${openide-docs-location}"
    1.88 -            offline="true"
    1.89 -            packagelistLoc="api/doc/openide"
    1.90 -      />
    1.91 -    </javadoc>
    1.92 -    <zip zipfile="VCSAPIs.zip" basedir="VCSAPIs"/>
    1.93 +  <target name="javadoc" description="Build Javadoc.">
    1.94 +    <!-- Ant 1.4 bug workaround: <property refid="..."/> does not work inside <ant> -->
    1.95 +    <property name="_cp" refid="cp"/>
    1.96 +    <ant dir="${nbroot}/nbbuild/javadoctools" antfile="template.xml" target="javadoc">
    1.97 +      <property name="javadoc.base" location="."/>
    1.98 +      <property name="javadoc.name" value="VCSAPI"/>
    1.99 +      <property name="javadoc.title" value="VCS API"/>
   1.100 +      <property name="javadoc.packages" value="org.netbeans.api.vcs,org.netbeans.api.vcs.commands,org.netbeans.spi.vcs,org.netbeans.spi.vcs.commands"/>
   1.101 +      <property name="javadoc.classpath" value="${_cp}"/>
   1.102 +      <property name="javadoc.apichanges" location="api/doc/changes/apichanges.xml"/>
   1.103 +    </ant>
   1.104    </target>
   1.105  
   1.106 -
   1.107    <target name="clean">
   1.108      <delete>
   1.109        <fileset dir="src">
   1.110 @@ -127,20 +93,9 @@
   1.111      </delete>
   1.112      <delete file="manifest-subst.mf"/>
   1.113      <delete file="vcscore.nbm"/>
   1.114 -    <delete file="VCSAPIs.zip"/>
   1.115 -    <delete dir="VCSAPIs"/>
   1.116      <delete dir="netbeans"/>
   1.117      <delete dir="javadoc"/>
   1.118      <delete dir="Info"/>
   1.119    </target>
   1.120  
   1.121 -  <target name="javadoc" description="Build vcscore module API documentation." depends="vcs-apis">
   1.122 -    <copy todir="javadoc">
   1.123 -      <fileset dir=".">
   1.124 -        <include name="VCSAPIs/**"/>
   1.125 -        <include name="VCSAPIs.zip"/>
   1.126 -      </fileset>
   1.127 -    </copy>
   1.128 -  </target>
   1.129 -
   1.130  </project>