1.1 --- a/clazz/build.xml Wed Dec 11 16:30:33 2002 +0000
1.2 +++ b/clazz/build.xml Wed Dec 11 17:06:49 2002 +0000
1.3 @@ -18,33 +18,28 @@
1.4 <property name="homepage.base" value="netbeans.org"/>
1.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
1.6 <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
1.7 - <property name="build" location="../nbbuild/netbeans"/>
1.8
1.9 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
1.10 <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
1.11
1.12 - <patternset id="clazz.files">
1.13 - <include name="modules/clazz.jar"/>
1.14 - </patternset>
1.15 -
1.16 <target name="compile">
1.17 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
1.18 <classpath>
1.19 <pathelement location="../openide/openide-13javac-workaround.jar"/>
1.20 - <pathelement location="${build}/modules/autoload/classfile.jar"/>
1.21 - <pathelement location="${build}/lib/openide.jar"/>
1.22 - <pathelement location="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
1.23 - <pathelement location="${build}/modules/autoload/java-src-model.jar"/>
1.24 - <pathelement location="${build}/modules/autoload/openide-execution.jar"/>
1.25 + <pathelement location="../classfile/netbeans/modules/autoload/classfile.jar"/>
1.26 + <pathelement location="../openide/netbeans/lib/openide.jar"/>
1.27 + <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
1.28 + <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
1.29 + <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
1.30 </classpath>
1.31 </javac>
1.32 </target>
1.33 <target name="jars" depends="compile">
1.34 - <mkdir dir="${build}/modules"/>
1.35 + <mkdir dir="netbeans/modules"/>
1.36 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
1.37 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
1.38 <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
1.39 - <locjar jarfile="${build}/modules/clazz.jar"
1.40 + <locjar jarfile="netbeans/modules/clazz.jar"
1.41 manifest="manifest-subst.mf"
1.42 basedir="src"
1.43 excludesfile="../nbbuild/standard-jar-excludes.txt"
1.44 @@ -54,17 +49,13 @@
1.45 </target>
1.46
1.47 <target name="netbeans" depends="jars">
1.48 - <genlist outputfiledir="${build}" module="modules/clazz.jar">
1.49 - <fileset dir="${build}">
1.50 - <patternset refID="clazz.files"/>
1.51 - </fileset>
1.52 - </genlist>
1.53 + <genlist targetname="nbm" outputfiledir="netbeans"/>
1.54 </target>
1.55
1.56 <target name="nbm" depends="netbeans">
1.57 <makenbm file="clazz.nbm"
1.58 - productDir="${build}"
1.59 - module="modules/clazz.jar"
1.60 + topdir="."
1.61 + module="netbeans/modules/clazz.jar"
1.62 homepage="http://clazz.${homepage.base}/"
1.63 distribution="http://${dist.base}/clazz.nbm">
1.64 <license file="${license.file}"/>
1.65 @@ -77,13 +68,12 @@
1.66 <fileset dir="src">
1.67 <include name="**/*.class"/>
1.68 </fileset>
1.69 - <fileset dir="${build}">
1.70 - <patternset refID="clazz.files"/>
1.71 - </fileset>
1.72 </delete>
1.73 <delete file="manifest-subst.mf"/>
1.74 <delete file="clazz.nbm"/>
1.75 + <delete dir="netbeans"/>
1.76 <delete dir="javadoc"/>
1.77 + <delete dir="Info"/>
1.78 </target>
1.79 <target name="real-clean" depends="clean">
1.80 <delete dir="reload"/>
1.81 @@ -101,7 +91,7 @@
1.82 />
1.83 </target>
1.84 <target name="test" depends="test-build" description="Reload the JAR for testing.">
1.85 - <nbinstaller action="reinstall" module="${build}/reload/clazz.jar"/>
1.86 + <nbinstaller action="reinstall" module="reload/clazz.jar"/>
1.87 </target>
1.88
1.89 <target name="javadoc" description="Build clazz module API documentation.">
2.1 --- a/group/build.xml Wed Dec 11 16:30:33 2002 +0000
2.2 +++ b/group/build.xml Wed Dec 11 17:06:49 2002 +0000
2.3 @@ -20,31 +20,26 @@
2.4 <property name="homepage.base" value="netbeans.org"/>
2.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
2.6 <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
2.7 - <property name="build" location="../nbbuild/netbeans"/>
2.8
2.9 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
2.10 <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
2.11 <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
2.12
2.13 - <patternset id="utilities/group.files">
2.14 - <include name="modules/group.jar"/>
2.15 - </patternset>
2.16 -
2.17 <target name="compile">
2.18 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
2.19 <classpath>
2.20 - <pathelement location="${build}/lib/openide.jar"/>
2.21 - <pathelement location="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
2.22 - <pathelement location="${build}/modules/autoload/openide-compiler.jar"/>
2.23 + <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
2.24 + <pathelement location="${nbroot}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
2.25 + <pathelement location="${nbroot}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
2.26 </classpath>
2.27 </javac>
2.28 </target>
2.29
2.30 <target name="jars" depends="compile">
2.31 - <mkdir dir="${build}/modules"/>
2.32 + <mkdir dir="netbeans/modules"/>
2.33 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
2.34 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
2.35 - <locjar jarfile="${build}/modules/group.jar"
2.36 + <locjar jarfile="netbeans/modules/group.jar"
2.37 manifest="manifest-subst.mf"
2.38 basedir="src"
2.39 excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
2.40 @@ -54,17 +49,13 @@
2.41 </target>
2.42
2.43 <target name="netbeans" depends="jars">
2.44 - <genlist outputfiledir="${build}" module="modules/group.jar">
2.45 - <fileset dir="${build}">
2.46 - <patternset refID="utilities/group.files"/>
2.47 - </fileset>
2.48 - </genlist>
2.49 + <genlist targetname="nbm" outputfiledir="netbeans"/>
2.50 </target>
2.51
2.52 <target name="nbm" depends="netbeans">
2.53 <makenbm file="group.nbm"
2.54 - productDir="${build}"
2.55 - module="modules/group.jar"
2.56 + topdir="."
2.57 + module="netbeans/modules/group.jar"
2.58 homepage="http://${homepage.base}/#group"
2.59 distribution="http://${dist.base}/group.nbm">
2.60 <license file="${license.file}"/>
2.61 @@ -77,12 +68,11 @@
2.62 <fileset dir="src">
2.63 <include name="**/*.class"/>
2.64 </fileset>
2.65 - <fileset dir="${build}">
2.66 - <patternset refID="utilities/group.files"/>
2.67 - </fileset>
2.68 </delete>
2.69 <delete file="manifest-subst.mf"/>
2.70 <delete file="group.nbm"/>
2.71 + <delete dir="netbeans"/>
2.72 + <delete dir="Info"/>
2.73 </target>
2.74
2.75 </project>
3.1 --- a/jndi/build.xml Wed Dec 11 16:30:33 2002 +0000
3.2 +++ b/jndi/build.xml Wed Dec 11 17:06:49 2002 +0000
3.3 @@ -21,7 +21,6 @@
3.4 <property name="homepage.base" value="netbeans.org"/>
3.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
3.6 <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
3.7 - <property name="build" location="../nbbuild/netbeans"/>
3.8
3.9 <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext}/nbantext.jar"/>
3.10 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
3.11 @@ -29,11 +28,6 @@
3.12 <taskdef name="tojar" classname="org.netbeans.nbbuild.ToJar" classpath="${nbext}/nbantext.jar"/>
3.13 <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
3.14
3.15 - <patternset id="jndi.files">
3.16 - <include name="modules/jndi.jar"/>
3.17 - <include name="modules/docs/jndi.jar"/>
3.18 - </patternset>
3.19 -
3.20 <target name="check-classes">
3.21 <available property="have_classes" classname="javax.naming.Context"/>
3.22 </target>
3.23 @@ -42,18 +36,18 @@
3.24 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
3.25 <classpath>
3.26 <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
3.27 - <pathelement location="${build}/lib/openide.jar"/>
3.28 - <pathelement location="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
3.29 - <pathelement location="${build}/modules/autoload/openidex.jar"/>
3.30 + <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
3.31 + <pathelement location="${nbroot}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
3.32 + <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
3.33 </classpath>
3.34 </javac>
3.35 </target>
3.36
3.37 <target name="jars" depends="compile">
3.38 - <mkdir dir="${build}/modules"/>
3.39 + <mkdir dir="netbeans/modules"/>
3.40 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
3.41 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
3.42 - <locjar jarfile="${build}/modules/jndi.jar"
3.43 + <locjar jarfile="netbeans/modules/jndi.jar"
3.44 manifest="manifest-subst.mf"
3.45 basedir="src"
3.46 excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
3.47 @@ -62,12 +56,14 @@
3.48 </locjar>
3.49 </target>
3.50
3.51 - <target name="netbeans" depends="jars,javahelp">
3.52 - <genlist outputfiledir="${build}" module="modules/jndi.jar">
3.53 - <fileset dir="${build}">
3.54 - <patternset refID="jndi.files"/>
3.55 - </fileset>
3.56 - </genlist>
3.57 + <target name="release">
3.58 +<!-- <copy todir="netbeans">
3.59 + <fileset dir="release"/>
3.60 + </copy> -->
3.61 + </target>
3.62 +
3.63 + <target name="netbeans" depends="jars,release,javahelp">
3.64 + <genlist targetname="nbm" outputfiledir="netbeans"/>
3.65 </target>
3.66
3.67 <target name="javahelp">
3.68 @@ -94,8 +90,8 @@
3.69 -->
3.70 <mkdir dir="javahelp/org/netbeans/modules/usersguide"/>
3.71 <copy file="${nbroot}/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css" tofile="javahelp/org/netbeans/modules/usersguide/ide.css"/>
3.72 - <mkdir dir="${build}/modules/docs"/>
3.73 - <locjar jarfile="${build}/modules/docs/jndi.jar" compress="true">
3.74 + <mkdir dir="netbeans/modules/docs"/>
3.75 + <locjar jarfile="netbeans/modules/docs/jndi.jar" compress="true">
3.76 <fileset dir="javahelp" excludesfile="${nbext}/standard-jar-excludes.txt" excludes="org/netbeans/modules/usersguide/"/>
3.77 <locale name="ja"/>
3.78 </locjar>
3.79 @@ -104,8 +100,8 @@
3.80
3.81 <target name="nbm" depends="netbeans">
3.82 <makenbm file="jndi.nbm"
3.83 - productDir="${build}"
3.84 - module="modules/jndi.jar"
3.85 + topdir="."
3.86 + module="netbeans/modules/jndi.jar"
3.87 homepage="http://http://${homepage.base}/jndi.html"
3.88 distribution="http://${dist.base}/jndi.nbm">
3.89 <license file="${license.file}"/>
3.90 @@ -119,13 +115,12 @@
3.91 <include name="**/*.class"/>
3.92 <include name="**/*.jar"/>
3.93 </fileset>
3.94 - <fileset dir="${build}">
3.95 - <patternset refID="jndi.files"/>
3.96 - </fileset>
3.97 </delete>
3.98 <delete file="manifest-subst.mf"/>
3.99 <delete file="jndi.nbm"/>
3.100 + <delete dir="netbeans"/>
3.101 <delete dir="javadoc"/>
3.102 + <delete dir="Info"/>
3.103 <delete dir="javahelp/org/netbeans/modules/jndi/docs/ja/JavaHelpSearch2"/>
3.104 <delete dir="javahelp/org/netbeans/modules/jndi/docs/JavaHelpSearch2"/>
3.105 <delete dir="javahelp/org/netbeans/modules/usersguide"/>
4.1 --- a/loaderswitcher/build.xml Wed Dec 11 16:30:33 2002 +0000
4.2 +++ b/loaderswitcher/build.xml Wed Dec 11 17:06:49 2002 +0000
4.3 @@ -55,7 +55,7 @@
4.4 <target name="nbm" depends="netbeans">
4.5 <makenbm file="loaderswitcher.nbm"
4.6 topdir="."
4.7 - module="modules/loaderswitcher.jar"
4.8 + module="netbeans/modules/loaderswitcher.jar"
4.9 homepage="http://utilities.${homepage.base}/loaderswitcher/"
4.10 distribution="http://${dist.base}/loaderswitcher.nbm">
4.11 <license file="${license.file}"/>
5.1 --- a/metrics/build.xml Wed Dec 11 16:30:33 2002 +0000
5.2 +++ b/metrics/build.xml Wed Dec 11 17:06:49 2002 +0000
5.3 @@ -18,27 +18,20 @@
5.4 <property name="homepage.base" value="netbeans.org"/>
5.5 <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
5.6
5.7 - <property name="build" location="../nbbuild/netbeans"/>
5.8 <property name="nbm_alias" value="nb_ide"/>
5.9
5.10 - <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
5.11 -
5.12 - <patternset id="metrics.files">
5.13 - <include name="modules/metrics.jar"/>
5.14 - </patternset>
5.15 -
5.16 <target name="compile" depends="check-root">
5.17 <javac srcdir="src" destdir="src" deprecation="true"
5.18 debug="${build.compiler.debug}">
5.19 <classpath>
5.20 <pathelement location="../openide/openide-13javac-workaround.jar"/>
5.21 - <pathelement location="${build}/lib/openide.jar"/>
5.22 - <pathelement location="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
5.23 - <pathelement location="${build}/modules/autoload/java-src-model.jar"/>
5.24 - <pathelement location="${build}/modules/java.jar" />
5.25 - <pathelement location="${build}/modules/clazz.jar" />
5.26 - <pathelement location="${build}/modules/autoload/classfile.jar" />
5.27 - <pathelement location="${build}/modules/autoload/java-api.jar"/>
5.28 + <pathelement location="../openide/netbeans/lib/openide.jar"/>
5.29 + <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
5.30 + <pathelement location="../java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
5.31 + <pathelement location="../java/netbeans/modules/java.jar" />
5.32 + <pathelement location="../clazz/netbeans/modules/clazz.jar" />
5.33 + <pathelement location="../classfile/netbeans/modules/autoload/classfile.jar" />
5.34 + <pathelement location="../java/api/netbeans/modules/autoload/java-api.jar"/>
5.35 <fileset dir="../core/external">
5.36 <include name="xml-apis*.jar"/>
5.37 </fileset>
5.38 @@ -48,23 +41,17 @@
5.39
5.40
5.41 <target name="jars" depends="compile">
5.42 - <mkdir dir="${build}/modules" />
5.43 + <mkdir dir="netbeans/modules" />
5.44 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
5.45 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
5.46 - <jar jarfile="${build}/modules/metrics.jar"
5.47 + <jar jarfile="netbeans/modules/metrics.jar"
5.48 manifest="manifest-subst.mf"
5.49 basedir="src"
5.50 excludesfile="jar-excludes.txt"
5.51 compress="false"/>
5.52 </target>
5.53
5.54 - <target name="netbeans" depends="jars">
5.55 - <genlist outputfiledir="${build}" module="modules/metrics.jar">
5.56 - <fileset dir="${build}">
5.57 - <patternset refID="metrics.files"/>
5.58 - </fileset>
5.59 - </genlist>
5.60 - </target>
5.61 + <target name="netbeans" depends="jars"/>
5.62
5.63 <target name="check-root" depends="check-root-file" unless="root-specified">
5.64 <fail message="Environment variable NB_ROOT invalid or not set."/>
5.65 @@ -78,12 +65,11 @@
5.66 <fileset dir="src">
5.67 <include name="**/*.class"/>
5.68 </fileset>
5.69 - <fileset dir="${build}">
5.70 - <patternset refID="metrics.files"/>
5.71 - </fileset>
5.72 </delete>
5.73 <delete file="manifest-subst.mf"/>
5.74 <delete file="metrics.nbm"/>
5.75 + <delete dir="netbeans"/>
5.76 + <delete dir="Info"/>
5.77 </target>
5.78
5.79 <target name="real-clean" depends="clean">
5.80 @@ -92,8 +78,8 @@
5.81 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
5.82 <target name="nbm" depends="netbeans">
5.83 <makenbm file="metrics.nbm"
5.84 - productDir="${build}"
5.85 - module="modules/metrics.jar"
5.86 + topdir="."
5.87 + module="netbeans/modules/metrics.jar"
5.88 homepage="http://metrics.${homepage.base}/"
5.89 distribution="http://${dist.base}/metrics.nbm">
5.90 <license file="${license.file}"/>
6.1 --- a/metrics/examples/nom/build.xml Wed Dec 11 16:30:33 2002 +0000
6.2 +++ b/metrics/examples/nom/build.xml Wed Dec 11 17:06:49 2002 +0000
6.3 @@ -66,7 +66,7 @@
6.4 <target name="nbm" depends="netbeans">
6.5 <makenbm file="metrics-nom.nbm"
6.6 topdir="."
6.7 - module="modules/metrics-nom.jar"
6.8 + module="netbeans/modules/metrics-nom.jar"
6.9 homepage="http://www.netbeans.org"
6.10 distribution="http://www.netbeans.org/download/nbms/40/metrics-nom.nbm">
6.11 <license file="../nbbuild/standard-nbm-license.txt"/>
7.1 --- a/o.n.tasklistapi/build.xml Wed Dec 11 16:30:33 2002 +0000
7.2 +++ b/o.n.tasklistapi/build.xml Wed Dec 11 17:06:49 2002 +0000
7.3 @@ -15,7 +15,6 @@
7.4 <project name="tasklist/api" default="netbeans" basedir=".">
7.5
7.6 <property name="nb_all" value="../.."/>
7.7 - <property name="build" location="../nbbuild/netbeans"/>
7.8
7.9 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
7.10 <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nb_all}/nbbuild/nbantext.jar"/>
7.11 @@ -29,20 +28,16 @@
7.12 </classpath>
7.13 </taskdef>
7.14
7.15 - <property name="nbm_alias" value="nb_ide"/>
7.16 - <property name="homepage.base" value="netbeans.org"/>
7.17 - <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
7.18 - <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
7.19 + <property name="nbm_alias" value="nb_ide"/>
7.20 + <property name="homepage.base" value="netbeans.org"/>
7.21 + <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
7.22 + <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
7.23
7.24 - <patternset id="tasklist/api.files">
7.25 - <include name="modules/autoload/tasklist-api.jar"/>
7.26 - </patternset>
7.27 -
7.28 <target name="compile">
7.29 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
7.30 <classpath>
7.31 <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
7.32 - <fileset dir="${build}/lib">
7.33 + <fileset dir="${nb_all}/openide/netbeans/lib">
7.34 <include name="openide*.jar" />
7.35 </fileset>
7.36 </classpath>
7.37 @@ -50,10 +45,10 @@
7.38 </target>
7.39
7.40 <target name="jars" depends="compile">
7.41 - <mkdir dir="${build}/modules/autoload"/>
7.42 + <mkdir dir="netbeans/modules/autoload"/>
7.43 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
7.44 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
7.45 - <locjar jarfile="${build}/modules/autoload/tasklist-api.jar"
7.46 + <locjar jarfile="netbeans/modules/autoload/tasklist-api.jar"
7.47 manifest="manifest-subst.mf"
7.48 basedir="src"
7.49 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
7.50 @@ -63,17 +58,13 @@
7.51 </target>
7.52
7.53 <target name="netbeans" depends="jars">
7.54 - <genlist outputfiledir="${build}" module="modules/autoload/tasklist-api.jar">
7.55 - <fileset dir="${build}">
7.56 - <patternset refID="tasklist/api.files"/>
7.57 - </fileset>
7.58 - </genlist>
7.59 + <genlist targetname="nbm" outputfiledir="netbeans"/>
7.60 </target>
7.61
7.62 <target name="nbm" depends="netbeans">
7.63 <makenbm file="../tasklist-api.nbm"
7.64 - productDir="${build}"
7.65 - module="modules/autoload/tasklist-api.jar"
7.66 + topdir="."
7.67 + module="netbeans/modules/autoload/tasklist-api.jar"
7.68 homepage="http://tasklist.${homepage.base}/"
7.69 distribution="http://${dist.base}/tasklist-api.nbm">
7.70 <license file="${license.file}"/>
7.71 @@ -86,12 +77,11 @@
7.72 <fileset dir="src">
7.73 <include name="**/*.class"/>
7.74 </fileset>
7.75 - <fileset dir="${build}">
7.76 - <patternset refID="tasklist/api.files"/>
7.77 - </fileset>
7.78 </delete>
7.79 <delete file="manifest-subst.mf"/>
7.80 <delete file="../tasklist-api.nbm"/>
7.81 + <delete dir="netbeans"/>
7.82 + <delete dir="Info"/>
7.83 <delete dir="javadoc"/>
7.84 <delete dir="TasklistAPI"/>
7.85 <delete file="TasklistAPI.zip"/>
8.1 --- a/remotefs/build.xml Wed Dec 11 16:30:33 2002 +0000
8.2 +++ b/remotefs/build.xml Wed Dec 11 17:06:49 2002 +0000
8.3 @@ -17,30 +17,25 @@
8.4 <property name="homepage.base" value="netbeans.org"/>
8.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
8.6 <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
8.7 - <property name="build" location="../nbbuild/netbeans"/>
8.8
8.9 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
8.10 <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
8.11
8.12 - <patternset id="remotefs.files">
8.13 - <include name="modules/remotefs.jar"/>
8.14 - </patternset>
8.15 -
8.16 <target name="compile">
8.17 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
8.18 <classpath>
8.19 <pathelement location="../openide/openide-13javac-workaround.jar"/>
8.20 - <pathelement location="${build}/lib/openide.jar"/>
8.21 - <pathelement location="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
8.22 + <pathelement location="../openide/netbeans/lib/openide.jar"/>
8.23 + <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
8.24 </classpath>
8.25 </javac>
8.26 </target>
8.27
8.28 <target name="jars" depends="compile">
8.29 - <mkdir dir="${build}/modules"/>
8.30 + <mkdir dir="netbeans/modules"/>
8.31 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
8.32 <copyfile src="manifest.mf" dest="manifest-subst.mf" filtering="on"/>
8.33 - <jar jarfile="${build}/modules/remotefs.jar"
8.34 + <jar jarfile="netbeans/modules/remotefs.jar"
8.35 manifest="manifest-subst.mf"
8.36 basedir="src"
8.37 excludesfile="../nbbuild/standard-jar-excludes.txt"
8.38 @@ -48,17 +43,13 @@
8.39 </target>
8.40
8.41 <target name="netbeans" depends="jars">
8.42 - <genlist outputfiledir="${build}" module="modules/remotefs.jar">
8.43 - <fileset dir="${build}">
8.44 - <patternset refID="remotefs.files"/>
8.45 - </fileset>
8.46 - </genlist>
8.47 + <genlist targetname="nbm" outputfiledir="netbeans"/>
8.48 </target>
8.49
8.50 <target name="nbm" depends="netbeans">
8.51 <makenbm file="remotefs.nbm"
8.52 - productDir="${build}"
8.53 - module="modules/remotefs.jar"
8.54 + topdir="."
8.55 + module="netbeans/modules/remotefs.jar"
8.56 homepage="http://remotefs.${homepage.base}/"
8.57 distribution="http://${dist.base}/remotefs.nbm">
8.58 <license file="${license.file}"/>
8.59 @@ -67,16 +58,13 @@
8.60 </target>
8.61
8.62 <target name="clean">
8.63 - <delete>
8.64 - <fileset dir="src">
8.65 - <include name="**/*.class"/>
8.66 - </fileset>
8.67 - <fileset dir="${build}">
8.68 - <patternset refID="remotefs.files"/>
8.69 - </fileset>
8.70 + <delete dir="src">
8.71 + <include name="**/*.class"/>
8.72 </delete>
8.73 <delete file="manifest-subst.mf"/>
8.74 + <deltree dir="netbeans"/>
8.75 <delete file="remotefs.nbm"/>
8.76 + <deltree dir="Info"/>
8.77 </target>
8.78
8.79 </project>
9.1 --- a/rmi/build.xml Wed Dec 11 16:30:33 2002 +0000
9.2 +++ b/rmi/build.xml Wed Dec 11 17:06:49 2002 +0000
9.3 @@ -21,20 +21,12 @@
9.4 <property name="homepage.base" value="netbeans.org"/>
9.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
9.6 <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
9.7 - <property name="build" location="../nbbuild/netbeans"/>
9.8
9.9 <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext}/nbantext.jar"/>
9.10 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
9.11 <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
9.12 <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
9.13
9.14 - <patternset id="rmi.files">
9.15 - <include name="modules/rmi.jar"/>
9.16 - <include name="modules/docs/rmi.jar"/>
9.17 - <include name="lib/ext/rmi-ext.jar"/>
9.18 - <include name="bin/rmid*"/>
9.19 - </patternset>
9.20 -
9.21 <target name="precompile">
9.22 <javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
9.23 <classpath />
9.24 @@ -71,13 +63,13 @@
9.25 <classpath>
9.26 <pathelement location="libsrc"/>
9.27 <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
9.28 - <pathelement location="${build}/lib/openide.jar"/>
9.29 - <pathelement location="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
9.30 - <pathelement location="${build}/modules/autoload/java-src-model.jar"/>
9.31 - <pathelement location="${build}/modules/java.jar"/>
9.32 - <pathelement location="${build}/modules/autoload/debuggerCore.jar"/>
9.33 - <pathelement location="${build}/modules/autoload/openide-compiler.jar"/>
9.34 - <pathelement location="${build}/modules/autoload/openide-execution.jar"/>
9.35 + <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
9.36 + <pathelement location="${nbroot}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
9.37 + <pathelement location="${nbroot}/openide/compiler/netbeans/modules/autoload/openide-compiler.jar"/>
9.38 + <pathelement location="${nbroot}/openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
9.39 + <pathelement location="${nbroot}/java/srcmodel/netbeans/modules/autoload/java-src-model.jar"/>
9.40 + <pathelement location="${nbroot}/java/netbeans/modules/java.jar"/>
9.41 + <pathelement location="${nbroot}/debuggercore/netbeans/modules/autoload/debuggerCore.jar"/>
9.42 <!-- Hopefully set up by nbbuild/build.xml: -->
9.43 <pathelement location="${jdkhome}/lib/tools.jar"/>
9.44 </classpath>
9.45 @@ -85,18 +77,18 @@
9.46 </target>
9.47
9.48 <target name="jars" depends="compile">
9.49 - <mkdir dir="${build}/modules"/>
9.50 + <mkdir dir="netbeans/modules"/>
9.51 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
9.52 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
9.53 - <locjar jarfile="${build}/modules/rmi.jar"
9.54 + <locjar jarfile="netbeans/modules/rmi.jar"
9.55 manifest="manifest-subst.mf"
9.56 basedir="src"
9.57 excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
9.58 compress="false">
9.59 <locale name="ja"/>
9.60 </locjar>
9.61 - <mkdir dir="${build}/lib/ext"/>
9.62 - <locjar jarfile="${build}/lib/ext/rmi-ext.jar"
9.63 + <mkdir dir="netbeans/lib/ext"/>
9.64 + <locjar jarfile="netbeans/lib/ext/rmi-ext.jar"
9.65 basedir="libsrc"
9.66 excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
9.67 compress="false">
9.68 @@ -105,17 +97,13 @@
9.69 </target>
9.70
9.71 <target name="release">
9.72 - <copy todir="${build}">
9.73 + <copy todir="netbeans">
9.74 <fileset dir="release" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
9.75 </copy>
9.76 </target>
9.77
9.78 <target name="netbeans" depends="jars,release,javahelp">
9.79 - <genlist outputfiledir="${build}" module="modules/rmi.jar">
9.80 - <fileset dir="${build}">
9.81 - <patternset refID="rmi.files"/>
9.82 - </fileset>
9.83 - </genlist>
9.84 + <genlist targetname="nbm" outputfiledir="netbeans"/>
9.85 </target>
9.86
9.87 <target name="javahelp">
9.88 @@ -140,8 +128,8 @@
9.89 </jhindexer>-->
9.90 <mkdir dir="javahelp/org/netbeans/modules/usersguide"/>
9.91 <copy file="${nbroot}/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css" tofile="javahelp/org/netbeans/modules/usersguide/ide.css"/>
9.92 - <mkdir dir="${build}/modules/docs"/>
9.93 - <locjar jarfile="${build}/modules/docs/rmi.jar" compress="true">
9.94 + <mkdir dir="netbeans/modules/docs"/>
9.95 + <locjar jarfile="netbeans/modules/docs/rmi.jar" compress="true">
9.96 <fileset dir="javahelp" excludesfile="${nbext}/standard-jar-excludes.txt" excludes="org/netbeans/modules/usersguide/"/>
9.97 <locale name="ja"/>
9.98 </locjar>
9.99 @@ -150,8 +138,8 @@
9.100
9.101 <target name="nbm" depends="netbeans">
9.102 <makenbm file="rmi.nbm"
9.103 - productDir="${build}"
9.104 - module="modules/rmi.jar"
9.105 + topdir="."
9.106 + module="netbeans/modules/rmi.jar"
9.107 homepage="http://rmi.${homepage.base}"
9.108 distribution="http://${dist.base}/rmi.nbm">
9.109 <license file="${license.file}"/>
9.110 @@ -168,13 +156,12 @@
9.111 <fileset dir="libsrc">
9.112 <include name="**/*.class"/>
9.113 </fileset>
9.114 - <fileset dir="${build}">
9.115 - <patternset refID="rmi.files"/>
9.116 - </fileset>
9.117 </delete>
9.118 <delete file="manifest-subst.mf"/>
9.119 <delete file="rmi.nbm"/>
9.120 + <delete dir="netbeans"/>
9.121 <delete dir="javadoc"/>
9.122 + <delete dir="Info"/>
9.123 <delete dir="javahelp/org/netbeans/modules/rmi/docs/JavaHelpSearch2"/>
9.124 <delete dir="javahelp/org/netbeans/modules/rmi/docs/ja/JavaHelpSearch2"/>
9.125 <delete dir="javahelp/org/netbeans/modules/usersguide"/>
10.1 --- a/suggestions_framework/build.xml Wed Dec 11 16:30:33 2002 +0000
10.2 +++ b/suggestions_framework/build.xml Wed Dec 11 17:06:49 2002 +0000
10.3 @@ -24,34 +24,29 @@
10.4 <property name="homepage.base" value="netbeans.org"/>
10.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
10.6 <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
10.7 - <property name="build" location="../nbbuild/netbeans"/>
10.8
10.9 - <patternset id="tasklist/suggestion.files">
10.10 - <include name="modules/tasklist-suggestions.jar"/>
10.11 - </patternset>
10.12 -
10.13 <target name="compile">
10.14 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
10.15 <classpath>
10.16 <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
10.17 - <fileset dir="${build}/lib">
10.18 + <fileset dir="${nb_all}/openide/netbeans/lib">
10.19 <include name="openide*.jar" />
10.20 </fileset>
10.21 <!-- tasklist api -->
10.22 <pathelement path="../api/src"/>
10.23 <!-- tasklist core -->
10.24 <pathelement path="../core/src"/>
10.25 - <pathelement path="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
10.26 + <pathelement path="../../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
10.27 <pathelement path="../../core/external/xml-apis-1.0b2.jar"/>
10.28 </classpath>
10.29 </javac>
10.30 </target>
10.31
10.32 <target name="jars" depends="compile">
10.33 - <mkdir dir="${build}/modules"/>
10.34 + <mkdir dir="netbeans/modules"/>
10.35 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
10.36 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
10.37 - <locjar jarfile="${build}/modules/tasklist-suggestions.jar"
10.38 + <locjar jarfile="netbeans/modules/tasklist-suggestions.jar"
10.39 manifest="manifest-subst.mf"
10.40 basedir="src"
10.41 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
10.42 @@ -61,17 +56,13 @@
10.43 </target>
10.44
10.45 <target name="netbeans" depends="jars">
10.46 - <genlist outputfiledir="${build}" module="modules/tasklist-suggestions.jar">
10.47 - <fileset dir="${build}">
10.48 - <patternset refID="tasklist/suggestion.files"/>
10.49 - </fileset>
10.50 - </genlist>
10.51 + <genlist targetname="nbm" outputfiledir="netbeans"/>
10.52 </target>
10.53
10.54 <target name="nbm" depends="netbeans">
10.55 <makenbm file="../tasklist-suggestions.nbm"
10.56 - productDir="${build}"
10.57 - module="modules/tasklist-suggestions.jar"
10.58 + topdir="."
10.59 + module="netbeans/modules/tasklist-suggestions.jar"
10.60 homepage="http://tasklist.${homepage.base}/"
10.61 distribution="http://${dist.base}/tasklist-suggestions.nbm">
10.62 <license file="${license.file}"/>
10.63 @@ -85,12 +76,11 @@
10.64 <fileset dir="src">
10.65 <include name="**/*.class"/>
10.66 </fileset>
10.67 - <fileset dir="${build}">
10.68 - <patternset refID="tasklist/suggestion.files"/>
10.69 - </fileset>
10.70 </delete>
10.71 <delete file="manifest-subst.mf"/>
10.72 <delete file="../tasklist-suggestions.nbm"/>
10.73 + <delete dir="netbeans"/>
10.74 + <delete dir="Info"/>
10.75 <delete dir="javadoc"/>
10.76 </target>
10.77
11.1 --- a/sysprops/build.xml Wed Dec 11 16:30:33 2002 +0000
11.2 +++ b/sysprops/build.xml Wed Dec 11 17:06:49 2002 +0000
11.3 @@ -17,30 +17,25 @@
11.4 <property name="homepage.base" value="netbeans.org"/>
11.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
11.6 <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
11.7 - <property name="build" location="../nbbuild/netbeans"/>
11.8
11.9 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
11.10 <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
11.11
11.12 - <patternset id="sysprops.files">
11.13 - <include name="modules/sysprops.jar"/>
11.14 - </patternset>
11.15 -
11.16 <target name="compile">
11.17 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
11.18 <classpath>
11.19 <pathelement location="../openide/openide-13javac-workaround.jar"/>
11.20 - <pathelement location="${build}/lib/openide.jar"/>
11.21 - <pathelement location="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
11.22 + <pathelement location="../openide/netbeans/lib/openide.jar"/>
11.23 + <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
11.24 </classpath>
11.25 </javac>
11.26 </target>
11.27
11.28 <target name="jars" depends="compile">
11.29 - <mkdir dir="${build}/modules"/>
11.30 + <mkdir dir="netbeans/modules"/>
11.31 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
11.32 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
11.33 - <jar jarfile="${build}/modules/sysprops.jar"
11.34 + <jar jarfile="netbeans/modules/sysprops.jar"
11.35 manifest="manifest-subst.mf"
11.36 basedir="src"
11.37 excludesfile="../nbbuild/standard-jar-excludes.txt"
11.38 @@ -48,17 +43,13 @@
11.39 </target>
11.40
11.41 <target name="netbeans" depends="jars">
11.42 - <genlist outputfiledir="${build}" module="modules/sysprops.jar">
11.43 - <fileset dir="${build}">
11.44 - <patternset refID="sysprops.files"/>
11.45 - </fileset>
11.46 - </genlist>
11.47 + <genlist targetname="nbm" outputfiledir="netbeans"/>
11.48 </target>
11.49
11.50 <target name="nbm" depends="netbeans">
11.51 <makenbm file="sysprops.nbm"
11.52 - productDir="${build}"
11.53 - module="modules/sysprops.jar"
11.54 + topdir="."
11.55 + module="netbeans/modules/sysprops.jar"
11.56 needsrestart="false"
11.57 homepage="http://sysprops.${homepage.base}/"
11.58 distribution="http://${dist.base}/sysprops.nbm">
11.59 @@ -84,12 +75,11 @@
11.60 <fileset dir="src">
11.61 <include name="**/*.class"/>
11.62 </fileset>
11.63 - <fileset dir="${build}">
11.64 - <patternset refID="sysprops.files"/>
11.65 - </fileset>
11.66 </delete>
11.67 <delete file="manifest-subst.mf"/>
11.68 + <delete dir="netbeans"/>
11.69 <delete file="sysprops.nbm"/>
11.70 + <delete dir="Info"/>
11.71 </target>
11.72
11.73 </project>
12.1 --- a/tasklist.bugs/build.xml Wed Dec 11 16:30:33 2002 +0000
12.2 +++ b/tasklist.bugs/build.xml Wed Dec 11 17:06:49 2002 +0000
12.3 @@ -24,24 +24,19 @@
12.4 <property name="homepage.base" value="netbeans.org"/>
12.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
12.6 <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
12.7 - <property name="build" location="../nbbuild/netbeans"/>
12.8
12.9 - <patternset id="tasklist/bugs.files">
12.10 - <include name="modules/tasklist-bugs.jar"/>
12.11 - </patternset>
12.12 -
12.13 <target name="compile">
12.14 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
12.15 <classpath>
12.16 <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
12.17 - <fileset dir="${build}/lib">
12.18 + <fileset dir="${nb_all}/openide/netbeans/lib">
12.19 <include name="openide*.jar" />
12.20 </fileset>
12.21 <!-- tasklist api -->
12.22 <pathelement path="../api/src"/>
12.23 <!-- tasklist core -->
12.24 <pathelement path="../core/src"/>
12.25 - <pathelement path="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
12.26 + <pathelement path="../../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
12.27 <fileset dir="../../core/external">
12.28 <include name="xml-apis*.jar"/>
12.29 </fileset>
12.30 @@ -50,10 +45,10 @@
12.31 </target>
12.32
12.33 <target name="jars" depends="compile">
12.34 - <mkdir dir="${build}/modules"/>
12.35 + <mkdir dir="netbeans/modules"/>
12.36 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
12.37 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
12.38 - <locjar jarfile="${build}/modules/tasklist-bugs.jar"
12.39 + <locjar jarfile="netbeans/modules/tasklist-bugs.jar"
12.40 manifest="manifest-subst.mf"
12.41 basedir="src"
12.42 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
12.43 @@ -63,17 +58,13 @@
12.44 </target>
12.45
12.46 <target name="netbeans" depends="jars">
12.47 - <genlist outputfiledir="${build}" module="modules/tasklist-bugs.jar">
12.48 - <fileset dir="${build}">
12.49 - <patternset refID="tasklist/bugs.files"/>
12.50 - </fileset>
12.51 - </genlist>
12.52 + <genlist targetname="nbm" outputfiledir="netbeans"/>
12.53 </target>
12.54
12.55 <target name="nbm" depends="netbeans">
12.56 <makenbm file="../tasklist-bugs.nbm"
12.57 - productDir="${build}"
12.58 - module="modules/tasklist-bugs.jar"
12.59 + topdir="."
12.60 + module="netbeans/modules/tasklist-bugs.jar"
12.61 homepage="http://tasklist.${homepage.base}/"
12.62 distribution="http://${dist.base}/tasklist-bugs.nbm">
12.63 <license file="${license.file}"/>
12.64 @@ -87,12 +78,11 @@
12.65 <fileset dir="src">
12.66 <include name="**/*.class"/>
12.67 </fileset>
12.68 - <fileset dir="${build}">
12.69 - <patternset refID="tasklist/bugs.files"/>
12.70 - </fileset>
12.71 </delete>
12.72 <delete file="manifest-subst.mf"/>
12.73 <delete file="../tasklist-bugs.nbm"/>
12.74 + <delete dir="netbeans"/>
12.75 + <delete dir="Info"/>
12.76 <delete dir="javadoc"/>
12.77 </target>
12.78
13.1 --- a/tasklist.core/build.xml Wed Dec 11 16:30:33 2002 +0000
13.2 +++ b/tasklist.core/build.xml Wed Dec 11 17:06:49 2002 +0000
13.3 @@ -25,23 +25,18 @@
13.4 <property name="homepage.base" value="netbeans.org"/>
13.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
13.6 <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
13.7 - <property name="build" location="../nbbuild/netbeans"/>
13.8
13.9 - <patternset id="tasklist/core.files">
13.10 - <include name="modules/autoload/tasklist-core.jar"/>
13.11 - </patternset>
13.12 -
13.13 <target name="compile" depends="init-14,compile-14">
13.14 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
13.15 <exclude name="org/netbeans/**/*14.java"/>
13.16 <classpath>
13.17 <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
13.18 - <fileset dir="${build}/lib">
13.19 + <fileset dir="${nb_all}/openide/netbeans/lib">
13.20 <include name="openide*.jar" />
13.21 </fileset>
13.22 <!-- tasklist api -->
13.23 <pathelement path="../api/src"/>
13.24 - <pathelement path="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
13.25 + <pathelement path="../../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
13.26 </classpath>
13.27 </javac>
13.28 </target>
13.29 @@ -55,22 +50,22 @@
13.30 <include name="org/netbeans/**/*14.java"/>
13.31 <classpath>
13.32 <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
13.33 - <fileset dir="${build}/lib">
13.34 + <fileset dir="${nb_all}/openide/netbeans/lib">
13.35 <include name="openide*.jar" />
13.36 </fileset>
13.37 <!-- tasklist api -->
13.38 <pathelement path="../api/src"/>
13.39 - <pathelement path="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
13.40 + <pathelement path="../../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
13.41 </classpath>
13.42 </javac>
13.43 </target>
13.44
13.45
13.46 <target name="jars" depends="compile">
13.47 - <mkdir dir="${build}/modules"/>
13.48 + <mkdir dir="netbeans/modules"/>
13.49 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
13.50 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
13.51 - <locjar jarfile="${build}/modules/autoload/tasklist-core.jar"
13.52 + <locjar jarfile="netbeans/modules/autoload/tasklist-core.jar"
13.53 manifest="manifest-subst.mf"
13.54 basedir="src"
13.55 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
13.56 @@ -80,17 +75,13 @@
13.57 </target>
13.58
13.59 <target name="netbeans" depends="jars">
13.60 - <genlist outputfiledir="${build}" module="modules/autoload/tasklist-core.jar">
13.61 - <fileset dir="${build}">
13.62 - <patternset refID="tasklist/core.files"/>
13.63 - </fileset>
13.64 - </genlist>
13.65 + <genlist targetname="nbm" outputfiledir="netbeans"/>
13.66 </target>
13.67
13.68 <target name="nbm" depends="netbeans">
13.69 <makenbm file="../tasklist-core.nbm"
13.70 - productDir="${build}"
13.71 - module="modules/autoload/tasklist-core.jar"
13.72 + topdir="."
13.73 + module="netbeans/modules/autoload/tasklist-core.jar"
13.74 homepage="http://tasklist.${homepage.base}/"
13.75 distribution="http://${dist.base}/tasklist-core.nbm">
13.76 <license file="${license.file}"/>
13.77 @@ -104,12 +95,11 @@
13.78 <fileset dir="src">
13.79 <include name="**/*.class"/>
13.80 </fileset>
13.81 - <fileset dir="${build}">
13.82 - <patternset refID="tasklist/core.files"/>
13.83 - </fileset>
13.84 </delete>
13.85 <delete file="manifest-subst.mf"/>
13.86 <delete file="../tasklist-core.nbm"/>
13.87 + <delete dir="netbeans"/>
13.88 + <delete dir="Info"/>
13.89 <delete dir="javadoc"/>
13.90 </target>
13.91
14.1 --- a/tasklist.docscan/build.xml Wed Dec 11 16:30:33 2002 +0000
14.2 +++ b/tasklist.docscan/build.xml Wed Dec 11 17:06:49 2002 +0000
14.3 @@ -24,17 +24,12 @@
14.4 <property name="homepage.base" value="netbeans.org"/>
14.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
14.6 <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
14.7 - <property name="build" location="../nbbuild/netbeans"/>
14.8
14.9 - <patternset id="tasklist/docscan.files">
14.10 - <include name="modules/tasklist-docscan.jar"/>
14.11 - </patternset>
14.12 -
14.13 <target name="compile">
14.14 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
14.15 <classpath>
14.16 <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
14.17 - <fileset dir="${build}/lib">
14.18 + <fileset dir="${nb_all}/openide/netbeans/lib">
14.19 <include name="openide*.jar" />
14.20 </fileset>
14.21 <!-- tasklist api -->
14.22 @@ -43,22 +38,22 @@
14.23 <pathelement path="../core/src"/>
14.24 <!-- usertasks -->
14.25 <pathelement path="../usertasks/src"/>
14.26 - <pathelement location="${build}/modules/ext/nb-editor.jar"/>
14.27 - <pathelement location="${build}/modules/editor.jar"/>
14.28 + <pathelement location="../../editor/netbeans/modules/ext/nb-editor.jar"/>
14.29 + <pathelement location="../../editor/netbeans/modules/editor.jar"/>
14.30 <fileset dir="../../core/external">
14.31 <include name="regexp*.jar" />
14.32 <include name="xml-apis*.jar"/>
14.33 </fileset>
14.34 - <pathelement path="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
14.35 + <pathelement path="../../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
14.36 </classpath>
14.37 </javac>
14.38 </target>
14.39
14.40 <target name="jars" depends="compile">
14.41 - <mkdir dir="${build}/modules"/>
14.42 + <mkdir dir="netbeans/modules"/>
14.43 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
14.44 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
14.45 - <locjar jarfile="${build}/modules/tasklist-docscan.jar"
14.46 + <locjar jarfile="netbeans/modules/tasklist-docscan.jar"
14.47 manifest="manifest-subst.mf"
14.48 basedir="src"
14.49 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
14.50 @@ -68,17 +63,13 @@
14.51 </target>
14.52
14.53 <target name="netbeans" depends="jars">
14.54 - <genlist outputfiledir="${build}" module="modules/tasklist-docscan.jar">
14.55 - <fileset dir="${build}">
14.56 - <patternset refID="tasklist/docscan.files"/>
14.57 - </fileset>
14.58 - </genlist>
14.59 + <genlist targetname="nbm" outputfiledir="netbeans"/>
14.60 </target>
14.61
14.62 <target name="nbm" depends="netbeans">
14.63 <makenbm file="../tasklist-docscan.nbm"
14.64 - productDir="${build}"
14.65 - module="modules/tasklist-docscan.jar"
14.66 + topdir="."
14.67 + module="netbeans/modules/tasklist-docscan.jar"
14.68 homepage="http://tasklist.${homepage.base}/"
14.69 distribution="http://${dist.base}/tasklist-docscan.nbm">
14.70 <license file="${license.file}"/>
14.71 @@ -92,9 +83,6 @@
14.72 <fileset dir="src">
14.73 <include name="**/*.class"/>
14.74 </fileset>
14.75 - <fileset dir="${build}">
14.76 - <patternset refID="tasklist/docscan.files"/>
14.77 - </fileset>
14.78 </delete>
14.79 <delete file="manifest-subst.mf"/>
14.80 <delete file="../tasklist-docscan.nbm"/>
15.1 --- a/tasklist.editor/build.xml Wed Dec 11 16:30:33 2002 +0000
15.2 +++ b/tasklist.editor/build.xml Wed Dec 11 17:06:49 2002 +0000
15.3 @@ -24,17 +24,12 @@
15.4 <property name="homepage.base" value="netbeans.org"/>
15.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
15.6 <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
15.7 - <property name="build" location="../nbbuild/netbeans"/>
15.8
15.9 - <patternset id="tasklist/editor.files">
15.10 - <include name="modules/eager/tasklist-editor.jar"/>
15.11 - </patternset>
15.12 -
15.13 <target name="compile">
15.14 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
15.15 <classpath>
15.16 <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
15.17 - <fileset dir="${build}/lib">
15.18 + <fileset dir="${nb_all}/openide/netbeans/lib">
15.19 <include name="openide*.jar" />
15.20 </fileset>
15.21 <!-- tasklist api -->
15.22 @@ -43,22 +38,22 @@
15.23 <pathelement path="../core/src"/>
15.24 <!-- usertasks -->
15.25 <pathelement path="../usertasks/src"/>
15.26 - <pathelement location="${build}/modules/ext/nb-editor.jar"/>
15.27 - <pathelement location="${build}/modules/editor.jar"/>
15.28 + <pathelement location="../../editor/netbeans/modules/ext/nb-editor.jar"/>
15.29 + <pathelement location="../../editor/netbeans/modules/editor.jar"/>
15.30 <fileset dir="../../core/external">
15.31 <include name="regexp*.jar" />
15.32 <include name="xml-apis*.jar"/>
15.33 </fileset>
15.34 - <pathelement path="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
15.35 + <pathelement path="../../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
15.36 </classpath>
15.37 </javac>
15.38 </target>
15.39
15.40 <target name="jars" depends="compile">
15.41 - <mkdir dir="${build}/modules"/>
15.42 + <mkdir dir="netbeans/modules"/>
15.43 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
15.44 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
15.45 - <locjar jarfile="${build}/modules/eager/tasklist-editor.jar"
15.46 + <locjar jarfile="netbeans/modules/eager/tasklist-editor.jar"
15.47 manifest="manifest-subst.mf"
15.48 basedir="src"
15.49 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
15.50 @@ -68,17 +63,13 @@
15.51 </target>
15.52
15.53 <target name="netbeans" depends="jars">
15.54 - <genlist outputfiledir="${build}" module="modules/eager/tasklist-editor.jar">
15.55 - <fileset dir="${build}">
15.56 - <patternset refID="tasklist/editor.files"/>
15.57 - </fileset>
15.58 - </genlist>
15.59 + <genlist targetname="nbm" outputfiledir="netbeans"/>
15.60 </target>
15.61
15.62 <target name="nbm" depends="netbeans">
15.63 <makenbm file="../tasklist-editor.nbm"
15.64 - productDir="${build}"
15.65 - module="modules/eager/tasklist-editor.jar"
15.66 + topdir="."
15.67 + module="netbeans/modules/eager/tasklist-editor.jar"
15.68 homepage="http://tasklist.${homepage.base}/"
15.69 distribution="http://${dist.base}/tasklist-editor.nbm">
15.70 <license file="${license.file}"/>
15.71 @@ -92,12 +83,11 @@
15.72 <fileset dir="src">
15.73 <include name="**/*.class"/>
15.74 </fileset>
15.75 - <fileset dir="${build}">
15.76 - <patternset refID="tasklist/editor.files"/>
15.77 - </fileset>
15.78 </delete>
15.79 <delete file="manifest-subst.mf"/>
15.80 <delete file="../tasklist-editor.nbm"/>
15.81 + <delete dir="netbeans"/>
15.82 + <delete dir="Info"/>
15.83 <delete dir="javadoc"/>
15.84 </target>
15.85
16.1 --- a/tasklist.usertasks/build.xml Wed Dec 11 16:30:33 2002 +0000
16.2 +++ b/tasklist.usertasks/build.xml Wed Dec 11 17:06:49 2002 +0000
16.3 @@ -24,24 +24,19 @@
16.4 <property name="homepage.base" value="netbeans.org"/>
16.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
16.6 <property name="license.file" value="${nb_all}/nbbuild/standard-nbm-license.txt"/>
16.7 - <property name="build" location="../nbbuild/netbeans"/>
16.8
16.9 - <patternset id="tasklist/usertasks.files">
16.10 - <include name="modules/tasklist-usertasks.jar"/>
16.11 - </patternset>
16.12 -
16.13 <target name="compile">
16.14 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
16.15 <classpath>
16.16 <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
16.17 - <fileset dir="${build}/lib">
16.18 + <fileset dir="${nb_all}/openide/netbeans/lib">
16.19 <include name="openide*.jar" />
16.20 </fileset>
16.21 <!-- tasklist api -->
16.22 <pathelement path="../api/src"/>
16.23 <!-- tasklist core -->
16.24 <pathelement path="../core/src"/>
16.25 - <pathelement path="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
16.26 + <pathelement path="../../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
16.27 <fileset dir="../../core/external">
16.28 <include name="xml-apis*.jar"/>
16.29 </fileset>
16.30 @@ -50,10 +45,10 @@
16.31 </target>
16.32
16.33 <target name="jars" depends="compile">
16.34 - <mkdir dir="${build}/modules"/>
16.35 + <mkdir dir="netbeans/modules"/>
16.36 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
16.37 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
16.38 - <locjar jarfile="${build}/modules/tasklist-usertasks.jar"
16.39 + <locjar jarfile="netbeans/modules/tasklist-usertasks.jar"
16.40 manifest="manifest-subst.mf"
16.41 basedir="src"
16.42 excludesfile="${nb_all}/nbbuild/standard-jar-excludes.txt"
16.43 @@ -63,17 +58,13 @@
16.44 </target>
16.45
16.46 <target name="netbeans" depends="jars">
16.47 - <genlist outputfiledir="${build}" module="modules/tasklist-usertasks.jar">
16.48 - <fileset dir="${build}">
16.49 - <patternset refID="tasklist/usertasks.files"/>
16.50 - </fileset>
16.51 - </genlist>
16.52 + <genlist targetname="nbm" outputfiledir="netbeans"/>
16.53 </target>
16.54
16.55 <target name="nbm" depends="netbeans">
16.56 <makenbm file="../tasklist-usertasks.nbm"
16.57 - productDir="${build}"
16.58 - module="modules/tasklist-usertasks.jar"
16.59 + topdir="."
16.60 + module="netbeans/modules/tasklist-usertasks.jar"
16.61 homepage="http://tasklist.${homepage.base}/"
16.62 distribution="http://${dist.base}/tasklist-usertasks.nbm">
16.63 <license file="${license.file}"/>
16.64 @@ -87,12 +78,11 @@
16.65 <fileset dir="src">
16.66 <include name="**/*.class"/>
16.67 </fileset>
16.68 - <fileset dir="${build}">
16.69 - <patternset refID="tasklist/usertasks.files"/>
16.70 - </fileset>
16.71 </delete>
16.72 <delete file="manifest-subst.mf"/>
16.73 <delete file="../tasklist-usertasks.nbm"/>
16.74 + <delete dir="netbeans"/>
16.75 + <delete dir="Info"/>
16.76 <delete dir="javadoc"/>
16.77 </target>
16.78
17.1 --- a/vcs.advanced/build.xml Wed Dec 11 16:30:33 2002 +0000
17.2 +++ b/vcs.advanced/build.xml Wed Dec 11 17:06:49 2002 +0000
17.3 @@ -22,18 +22,17 @@
17.4 <property name="homepage.base" value="netbeans.org"/>
17.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
17.6 <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
17.7 - <property name="build" location="../nbbuild/netbeans"/>
17.8 +
17.9 + <property name="stdprofiles" value="cvsprofiles, pvcs, vss"/>
17.10
17.11 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
17.12 <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
17.13 + <!-- <taskdef name="tojar" classname="org.netbeans.nbbuild.ToJar" classpath="${nbext}/nbantext.jar"/> -->
17.14 <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
17.15 <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
17.16 + <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="${nbext_root}/nbantext.jar"/>
17.17 <taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="${nbext}/nbantext.jar"/>
17.18
17.19 - <patternset id="vcsgeneric.files">
17.20 - <include name="modules/vcsgen.jar"/>
17.21 - </patternset>
17.22 -
17.23 <target name="compile">
17.24 <javac srcdir="src"
17.25 deprecation="${build.compiler.deprecation}"
17.26 @@ -42,16 +41,18 @@
17.27 excludes="org/netbeans/modules/vcs/advanced/config/">
17.28 <classpath>
17.29 <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
17.30 - <pathelement location="${build}/lib/openide.jar"/>
17.31 - <pathelement location="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
17.32 - <pathelement location="${build}/modules/autoload/openidex.jar"/>
17.33 - <pathelement location="${build}/modules/autoload/vcscore.jar"/>
17.34 - <pathelement location="${build}/modules/diff.jar"/>
17.35 + <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
17.36 + <pathelement location="${nbroot}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
17.37 + <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
17.38 + <pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
17.39 + <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
17.40 <fileset dir="${nbroot}/core/external">
17.41 <include name="xml-apis*.jar"/>
17.42 </fileset>
17.43 </classpath>
17.44 </javac>
17.45 + <!-- <ant dir="profiles/pvcs" inheritAll="false" target="compile"/> -->
17.46 + <!-- <for-each locations="${stdprofiles}" startdir="profiles"/> -->
17.47 </target>
17.48
17.49 <target name="jars" depends="compile">
17.50 @@ -77,10 +78,10 @@
17.51 <makelayer topdir="src" destfile="src/org/netbeans/modules/vcs/advanced/config/layer-includes-resources.xml" absolutepath="true">
17.52 <include name="org/netbeans/modules/vcs/profiles/resources/*.*"/>
17.53 </makelayer>
17.54 - <mkdir dir="${build}/modules"/>
17.55 + <mkdir dir="netbeans/modules"/>
17.56 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
17.57 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
17.58 - <locjar jarfile="${build}/modules/vcsgen.jar"
17.59 + <locjar jarfile="netbeans/modules/vcsgen.jar"
17.60 manifest="manifest-subst.mf"
17.61 basedir="src"
17.62 excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
17.63 @@ -96,20 +97,55 @@
17.64 <include name="org/netbeans/modules/vcs/profiles/**/*.form"/>
17.65 </fileset>
17.66 </locjar>
17.67 + <!-- <for-each locations="${stdprofiles}" startdir="profiles"/> -->
17.68 +<!-- <nbmerge dest="netbeans" topdir="profiles" modules="${stdprofiles}" targetprefix="profile-"/>-->
17.69 + <!--
17.70 + <patternset id="stdprofilesFolders" includes="${stdprofiles}"/>
17.71 + <copy todir="netbeans/modules" flatten="true" includeEmptyDirs="false">
17.72 + <fileset dir="profiles">
17.73 + <patternset refid="stdprofilesFolders">
17.74 + <include name="**/*.jar"/>
17.75 + <exclude name="**/*_??.jar"/>
17.76 + </patternset>
17.77 + </fileset>
17.78 + </copy>
17.79 + -->
17.80 + <!--
17.81 + <copydir src="profiles" dest="netbeans/modules" flatten="true" includes="${stdprofiles}">
17.82 + <patternset id="stdprofiles.jars">
17.83 + <include name="**/*.jar"/>
17.84 + <exclude name="**/*_??.jar"/>
17.85 + </patternset>
17.86 + </copydir>
17.87 + <copydir src="profiles" dest="netbeans/modules/locale" flatten="true" includes="${stdprofiles}">
17.88 + <patternset id="stdprofiles.jars">
17.89 + <include name="**/*_??.jar"/>
17.90 + </patternset>
17.91 + </copydir>
17.92 + -->
17.93 + </target>
17.94 +
17.95 + <target name="profile-cvsprofiles">
17.96 + <echo message="Building CVS profiles..."/>
17.97 + <ant dir="profiles/cvsprofiles" target="netbeans"/>
17.98 + </target>
17.99 + <target name="profile-pvcs">
17.100 + <echo message="Building PVCS profiles..."/>
17.101 + <ant dir="profiles/pvcs" target="netbeans"/>
17.102 + </target>
17.103 + <target name="profile-vss">
17.104 + <echo message="Building VSS profiles..."/>
17.105 + <ant dir="profiles/vss" target="netbeans"/>
17.106 </target>
17.107
17.108 <target name="netbeans" depends="jars">
17.109 - <genlist outputfiledir="${build}" module="modules/vcsgen.jar">
17.110 - <fileset dir="${build}">
17.111 - <patternset refID="vcsgeneric.files"/>
17.112 - </fileset>
17.113 - </genlist>
17.114 + <genlist targetname="nbm" outputfiledir="netbeans"/>
17.115 </target>
17.116
17.117 <target name="nbm" depends="netbeans">
17.118 <makenbm file="vcsgen.nbm"
17.119 - productDir="${build}"
17.120 - module="modules/vcsgen.jar"
17.121 + topdir="."
17.122 + module="netbeans/modules/vcsgen.jar"
17.123 homepage="http://vcsgeneric.${homepage.base}/"
17.124 distribution="http://${dist.base}/vcsgen.nbm">
17.125 <license file="${license.file}"/>
17.126 @@ -124,13 +160,12 @@
17.127 <include name="**/*.jar"/>
17.128 <include name="org/netbeans/modules/vcs/advanced/config/layer-include*.xml"/>
17.129 </fileset>
17.130 - <fileset dir="${build}">
17.131 - <patternset refID="vcsgeneric.files"/>
17.132 - </fileset>
17.133 </delete>
17.134 <delete file="manifest-subst.mf"/>
17.135 <delete file="vcsgen.nbm"/>
17.136 + <delete dir="netbeans"/>
17.137 <delete dir="javadoc"/>
17.138 + <delete dir="Info"/>
17.139 </target>
17.140
17.141 <target name="javadoc" description="Build vcsgeneric module API documentation.">
18.1 --- a/vcs.profiles.clearcase/build.xml Wed Dec 11 16:30:33 2002 +0000
18.2 +++ b/vcs.profiles.clearcase/build.xml Wed Dec 11 17:06:49 2002 +0000
18.3 @@ -94,7 +94,7 @@
18.4 <target name="nbm" depends="netbeans">
18.5 <makenbm file="clearcase-profile.nbm"
18.6 topdir="."
18.7 - module="modules/clearcase-profile.jar"
18.8 + module="netbeans/modules/clearcase-profile.jar"
18.9 homepage="http://vcsgeneric.${homepage.base}/"
18.10 distribution="http://${dist.base}/clearcase-profile.nbm">
18.11 <license file="${license.file1}"/>
19.1 --- a/vcs.profiles.cvsprofiles/build.xml Wed Dec 11 16:30:33 2002 +0000
19.2 +++ b/vcs.profiles.cvsprofiles/build.xml Wed Dec 11 17:06:49 2002 +0000
19.3 @@ -21,17 +21,11 @@
19.4 <property name="homepage.base" value="netbeans.org"/>
19.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
19.6 <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
19.7 - <property name="build" location="../nbbuild/netbeans"/>
19.8 -
19.9 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
19.10 <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
19.11 <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
19.12 <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
19.13
19.14 - <patternset id="vcsgeneric/profiles/cvsprofiles.files">
19.15 - <include name="modules/cvs-profile.jar"/>
19.16 - </patternset>
19.17 -
19.18 <target name="compile">
19.19 <!--<echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}, nbext1 = ${nbext1}"/>-->
19.20 <javac srcdir="src"
19.21 @@ -40,12 +34,12 @@
19.22 destdir="src">
19.23 <classpath>
19.24 <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
19.25 - <pathelement location="${build}/lib/openide.jar"/>
19.26 - <pathelement location="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
19.27 - <pathelement location="${build}/modules/autoload/openidex.jar"/>
19.28 - <pathelement location="${build}/modules/autoload/vcscore.jar"/>
19.29 - <pathelement location="${build}/modules/vcsgen.jar"/>
19.30 - <pathelement location="${build}/modules/diff.jar"/>
19.31 + <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
19.32 + <pathelement location="${nbroot}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
19.33 + <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
19.34 + <pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
19.35 + <pathelement location="${nbroot}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
19.36 + <pathelement location="${nbroot}/diff/netbeans/modules/diff.jar"/>
19.37 <fileset dir="${nbroot}/core/external">
19.38 <include name="xml-apis*.jar"/>
19.39 <include name="regexp*.jar"/>
19.40 @@ -83,10 +77,10 @@
19.41 <include name="org/netbeans/modules/vcs/profiles/cvsprofiles/list/*.java"/>
19.42 <include name="org/netbeans/modules/vcs/profiles/cvsprofiles/list/*.properties"/>
19.43 </makelayer>
19.44 - <mkdir dir="${build}/modules"/>
19.45 + <mkdir dir="netbeans/modules"/>
19.46 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
19.47 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
19.48 - <locjar jarfile="${build}/modules/cvs-profile.jar"
19.49 + <locjar jarfile="netbeans/modules/cvs-profile.jar"
19.50 manifest="manifest-subst.mf"
19.51 basedir="src"
19.52 excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
19.53 @@ -105,17 +99,13 @@
19.54 </target>
19.55
19.56 <target name="netbeans" depends="jars">
19.57 - <genlist outputfiledir="${build}" module="modules/cvs-profile.jar">
19.58 - <fileset dir="${build}">
19.59 - <patternset refID="vcsgeneric/profiles/cvsprofiles.files"/>
19.60 - </fileset>
19.61 - </genlist>
19.62 + <genlist targetname="nbm" outputfiledir="netbeans"/>
19.63 </target>
19.64
19.65 <target name="nbm" depends="netbeans">
19.66 <makenbm file="cvs-profile.nbm"
19.67 - productDir="${build}"
19.68 - module="modules/cvs-profile.jar"
19.69 + topdir="."
19.70 + module="netbeans/modules/cvs-profile.jar"
19.71 homepage="http://vcsgeneric.${homepage.base}/"
19.72 distribution="http://${dist.base}/cvs-profile.nbm">
19.73 <license file="${license.file}"/>
19.74 @@ -130,12 +120,11 @@
19.75 <include name="**/*.jar"/>
19.76 <include name="src/org/netbeans/modules/vcs/profiles/cvsprofiles/layer-include*.xml"/>
19.77 </fileset>
19.78 - <fileset dir="${build}">
19.79 - <patternset refID="vcsgeneric/profiles/cvsprofiles.files"/>
19.80 - </fileset>
19.81 </delete>
19.82 <delete file="manifest-subst.mf"/>
19.83 <delete file="cvs-profile.nbm"/>
19.84 + <delete dir="netbeans"/>
19.85 + <delete dir="Info"/>
19.86 </target>
19.87
19.88 </project>
20.1 --- a/vcs.profiles.pvcs/build.xml Wed Dec 11 16:30:33 2002 +0000
20.2 +++ b/vcs.profiles.pvcs/build.xml Wed Dec 11 17:06:49 2002 +0000
20.3 @@ -21,17 +21,12 @@
20.4 <property name="homepage.base" value="netbeans.org"/>
20.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
20.6 <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
20.7 - <property name="build" location="../nbbuild/netbeans"/>
20.8
20.9 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
20.10 <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
20.11 <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
20.12 <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
20.13
20.14 - <patternset id="vcsgeneric/profiles/pvcs.files">
20.15 - <include name="modules/pvcs-profile.jar"/>
20.16 - </patternset>
20.17 -
20.18 <target name="compile">
20.19 <!-- <echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}"/> -->
20.20 <javac srcdir="src"
20.21 @@ -40,11 +35,11 @@
20.22 destdir="src">
20.23 <classpath>
20.24 <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
20.25 - <pathelement location="${build}/lib/openide.jar"/>
20.26 - <pathelement location="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
20.27 - <pathelement location="${build}/modules/autoload/openidex.jar"/>
20.28 - <pathelement location="${build}/modules/autoload/vcscore.jar"/>
20.29 - <pathelement location="${build}/modules/vcsgen.jar"/>
20.30 + <pathelement location="${nbroot}/openide/netbeans/lib/openide.jar"/>
20.31 + <pathelement location="${nbroot}/openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
20.32 + <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
20.33 + <pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
20.34 + <pathelement location="${nbroot}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
20.35 </classpath>
20.36 </javac>
20.37 </target>
20.38 @@ -76,10 +71,10 @@
20.39 <include name="org/netbeans/modules/vcs/profiles/pvcs/list/*.java"/>
20.40 <include name="org/netbeans/modules/vcs/profiles/pvcs/list/*.properties"/>
20.41 </makelayer>
20.42 - <mkdir dir="${build}/modules"/>
20.43 + <mkdir dir="netbeans/modules"/>
20.44 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
20.45 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
20.46 - <locjar jarfile="${build}/modules/pvcs-profile.jar"
20.47 + <locjar jarfile="netbeans/modules/pvcs-profile.jar"
20.48 manifest="manifest-subst.mf"
20.49 basedir="src"
20.50 excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
20.51 @@ -98,17 +93,13 @@
20.52 </target>
20.53
20.54 <target name="netbeans" depends="jars">
20.55 - <genlist outputfiledir="${build}" module="modules/pvcs-profile.jar">
20.56 - <fileset dir="${build}">
20.57 - <patternset refID="vcsgeneric/profiles/pvcs.files"/>
20.58 - </fileset>
20.59 - </genlist>
20.60 + <genlist targetname="nbm" outputfiledir="netbeans"/>
20.61 </target>
20.62
20.63 <target name="nbm" depends="netbeans">
20.64 <makenbm file="pvcs-profile.nbm"
20.65 - productDir="${build}"
20.66 - module="modules/pvcs-profile.jar"
20.67 + topdir="."
20.68 + module="netbeans/modules/pvcs-profile.jar"
20.69 homepage="http://vcsgeneric.${homepage.base}/"
20.70 distribution="http://${dist.base}/pvcs-profile.nbm">
20.71 <license file="${license.file}"/>
20.72 @@ -123,12 +114,11 @@
20.73 <include name="**/*.jar"/>
20.74 <include name="org/netbeans/modules/vcs/profiles/pvcs/layer-include*.xml"/>
20.75 </fileset>
20.76 - <fileset dir="${build}">
20.77 - <patternset refID="vcsgeneric/profiles/pvcs.files"/>
20.78 - </fileset>
20.79 </delete>
20.80 <delete file="manifest-subst.mf"/>
20.81 <delete file="pvcs-profile.nbm"/>
20.82 + <delete dir="netbeans"/>
20.83 + <delete dir="Info"/>
20.84 </target>
20.85
20.86 </project>
21.1 --- a/vcs.profiles.starteam/build.xml Wed Dec 11 16:30:33 2002 +0000
21.2 +++ b/vcs.profiles.starteam/build.xml Wed Dec 11 17:06:49 2002 +0000
21.3 @@ -103,7 +103,7 @@
21.4 <target name="nbm" depends="netbeans">
21.5 <makenbm file="starteam-profile.nbm"
21.6 topdir="."
21.7 - module="modules/starteam-profile.jar"
21.8 + module="netbeans/modules/starteam-profile.jar"
21.9 homepage="http://vcsgeneric.${homepage.base}/"
21.10 distribution="http://${dist.base}/starteam-profile.nbm">
21.11 <license file="${license.file}"/>
22.1 --- a/vcs.profiles.vss/build.xml Wed Dec 11 16:30:33 2002 +0000
22.2 +++ b/vcs.profiles.vss/build.xml Wed Dec 11 17:06:49 2002 +0000
22.3 @@ -21,17 +21,12 @@
22.4 <property name="homepage.base" value="netbeans.org"/>
22.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
22.6 <property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
22.7 - <property name="build" location="../nbbuild/netbeans"/>
22.8
22.9 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbext}/nbantext.jar"/>
22.10 <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbext}/nbantext.jar"/>
22.11 <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar"/>
22.12 <taskdef name="makelayer" classname="org.netbeans.nbbuild.MakeLayer" classpath="${nbext}/nbantext.jar"/>
22.13
22.14 - <patternset id="vcsgeneric/profiles/vss.files">
22.15 - <include name="modules/vss-profile.jar"/>
22.16 - </patternset>
22.17 -
22.18 <target name="compile">
22.19 <!-- <echo message="basedir = ${basedir}, nbroot1 = ${nbroot1}"/> -->
22.20 <javac srcdir="src"
22.21 @@ -41,12 +36,12 @@
22.22 <classpath>
22.23 <pathelement location="${nbroot}/openide/openide-13javac-workaround.jar"/>
22.24 <!--<pathelement location="${nbroot1}/openide/netbeans/lib/openide.jar"/>-->
22.25 - <fileset dir="${build}/lib">
22.26 + <fileset dir="${nbroot}/openide/netbeans/lib">
22.27 <include name="openide*.jar" />
22.28 </fileset>
22.29 - <pathelement location="${build}/modules/autoload/openidex.jar"/>
22.30 - <pathelement location="${build}/modules/autoload/vcscore.jar"/>
22.31 - <pathelement location="${build}/modules/vcsgen.jar"/>
22.32 + <pathelement location="${nbroot}/openidex/netbeans/modules/autoload/openidex.jar"/>
22.33 + <pathelement location="${nbroot}/vcscore/netbeans/modules/autoload/vcscore.jar"/>
22.34 + <pathelement location="${nbroot}/vcsgeneric/netbeans/modules/vcsgen.jar"/>
22.35 </classpath>
22.36 </javac>
22.37 </target>
22.38 @@ -78,10 +73,10 @@
22.39 <include name="org/netbeans/modules/vcs/profiles/vss/list/*.java"/>
22.40 <include name="org/netbeans/modules/vcs/profiles/vss/list/*.properties"/>
22.41 </makelayer>
22.42 - <mkdir dir="${build}/modules"/>
22.43 + <mkdir dir="netbeans/modules"/>
22.44 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
22.45 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
22.46 - <locjar jarfile="${build}/modules/vss-profile.jar"
22.47 + <locjar jarfile="netbeans/modules/vss-profile.jar"
22.48 manifest="manifest-subst.mf"
22.49 basedir="src"
22.50 excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
22.51 @@ -100,17 +95,13 @@
22.52 </target>
22.53
22.54 <target name="netbeans" depends="jars">
22.55 - <genlist outputfiledir="${build}" module="modules/vss-profile.jar">
22.56 - <fileset dir="${build}">
22.57 - <patternset refID="vcsgeneric/profiles/vss.files"/>
22.58 - </fileset>
22.59 - </genlist>
22.60 + <genlist targetname="nbm" outputfiledir="netbeans"/>
22.61 </target>
22.62
22.63 <target name="nbm" depends="netbeans">
22.64 <makenbm file="vss-profile.nbm"
22.65 - productDir="${build}"
22.66 - module="modules/vss-profile.jar"
22.67 + topdir="."
22.68 + module="netbeans/modules/vss-profile.jar"
22.69 homepage="http://vcsgeneric.${homepage.base}/"
22.70 distribution="http://${dist.base}/vss-profile.nbm">
22.71 <license file="${license.file}"/>
22.72 @@ -125,12 +116,11 @@
22.73 <include name="**/*.jar"/>
22.74 <include name="org/netbeans/modules/vcs/profiles/vss/layer-include*.xml"/>
22.75 </fileset>
22.76 - <fileset dir="${build}">
22.77 - <patternset refID="vcsgeneric/profiles/vss.files"/>
22.78 - </fileset>
22.79 </delete>
22.80 <delete file="manifest-subst.mf"/>
22.81 <delete file="vss-profile.nbm"/>
22.82 + <delete dir="netbeans"/>
22.83 + <delete dir="Info"/>
22.84 </target>
22.85
22.86 </project>
23.1 --- a/vcscore/build.xml Wed Dec 11 16:30:33 2002 +0000
23.2 +++ b/vcscore/build.xml Wed Dec 11 17:06:49 2002 +0000
23.3 @@ -21,26 +21,21 @@
23.4 <property name="homepage.base" value="netbeans.org"/>
23.5 <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
23.6 <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
23.7 - <property name="build" location="../nbbuild/netbeans"/>
23.8
23.9 <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23.10 <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
23.11 <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
23.12
23.13 - <patternset id="vcscore.files">
23.14 - <include name="modules/autoload/vcscore.jar"/>
23.15 - </patternset>
23.16 -
23.17 <target name="compile">
23.18 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
23.19 <classpath>
23.20 - <pathelement location="${build}/modules/ext/nb-editor.jar"/>
23.21 - <pathelement location="${build}/modules/autoload/openidex.jar"/>
23.22 + <pathelement location="../editor/netbeans/modules/ext/nb-editor.jar"/>
23.23 + <pathelement location="../openidex/netbeans/modules/autoload/openidex.jar"/>
23.24 <pathelement location="../openide/openide-13javac-workaround.jar"/>
23.25 - <pathelement location="${build}/lib/openide.jar"/>
23.26 - <pathelement location="${build}/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
23.27 - <pathelement location="${build}/modules/autoload/openide-io.jar"/>
23.28 - <pathelement location="${build}/modules/autoload/openide-execution.jar"/>
23.29 + <pathelement location="../openide/netbeans/lib/openide.jar"/>
23.30 + <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
23.31 + <pathelement location="../openide/io/netbeans/modules/autoload/openide-io.jar"/>
23.32 + <pathelement location="../openide/execution/netbeans/modules/autoload/openide-execution.jar"/>
23.33 <fileset dir="../core/external">
23.34 <include name="regexp*.jar" />
23.35 </fileset>
23.36 @@ -49,10 +44,10 @@
23.37 </target>
23.38
23.39 <target name="jars" depends="compile">
23.40 - <mkdir dir="${build}/modules/autoload"/>
23.41 + <mkdir dir="netbeans/modules/autoload"/>
23.42 <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
23.43 <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
23.44 - <locjar jarfile="${build}/modules/autoload/vcscore.jar"
23.45 + <locjar jarfile="netbeans/modules/autoload/vcscore.jar"
23.46 manifest="manifest-subst.mf"
23.47 basedir="src"
23.48 excludesfile="../nbbuild/standard-jar-excludes.txt"
23.49 @@ -70,17 +65,13 @@
23.50 -->
23.51
23.52 <target name="netbeans" depends="jars">
23.53 - <genlist outputfiledir="${build}" module="modules/autoload/vcscore.jar">
23.54 - <fileset dir="${build}">
23.55 - <patternset refID="vcscore.files"/>
23.56 - </fileset>
23.57 - </genlist>
23.58 + <genlist targetname="nbm" outputfiledir="netbeans"/>
23.59 </target>
23.60
23.61 <target name="nbm" depends="netbeans">
23.62 <makenbm file="vcscore.nbm"
23.63 - productDir="${build}"
23.64 - module="modules/autoload/vcscore.jar"
23.65 + topdir="."
23.66 + module="netbeans/modules/autoload/vcscore.jar"
23.67 homepage="http://vcscore.${homepage.base}/"
23.68 distribution="http://${dist.base}/vcscore.nbm">
23.69 <license file="${license.file}"/>
23.70 @@ -134,15 +125,14 @@
23.71 <fileset dir="src">
23.72 <include name="**/*.class"/>
23.73 </fileset>
23.74 - <fileset dir="${build}">
23.75 - <patternset refID="vcscore.files"/>
23.76 - </fileset>
23.77 </delete>
23.78 <delete file="manifest-subst.mf"/>
23.79 <delete file="vcscore.nbm"/>
23.80 <delete file="VCSAPIs.zip"/>
23.81 <delete dir="VCSAPIs"/>
23.82 + <delete dir="netbeans"/>
23.83 <delete dir="javadoc"/>
23.84 + <delete dir="Info"/>
23.85 </target>
23.86
23.87 <target name="javadoc" description="Build vcscore module API documentation." depends="vcs-apis">