Cleaning up openide/build.xml a fair amount. Removing
openide-13javac-workaround.jar since it no longer seems to be
necessary when building with JDK 1.4.2.
1.1 --- a/javacvs/build.xml Wed Apr 07 13:32:00 2004 +0000
1.2 +++ b/javacvs/build.xml Wed Apr 07 19:26:45 2004 +0000
1.3 @@ -31,7 +31,6 @@
1.4 <fileset dir="../libs/external">
1.5 <include name="regexp*.jar"/>
1.6 </fileset>
1.7 - <pathelement location="../openide/openide-13javac-workaround.jar"/>
1.8 <pathelement location="../openide/netbeans/lib/openide.jar"/>
1.9 <pathelement location="../openide/loaders/netbeans/lib/openide-loaders.jar"/>
1.10 </classpath>
1.11 @@ -87,7 +86,6 @@
1.12 <classpath>
1.13 <pathelement location="../openide/netbeans/lib/openide-fs.jar"/>
1.14 <pathelement location="../openide/netbeans/lib/openide-util.jar"/>
1.15 - <pathelement location="../openide/openide-13javac-workaround.jar"/>
1.16 <fileset dir="../libs/external">
1.17 <include name="regexp*.jar"/>
1.18 </fileset>
1.19 @@ -102,7 +100,6 @@
1.20 </fileset>
1.21 <pathelement location="../openide/netbeans/lib/openide-fs.jar"/>
1.22 <pathelement location="../openide/netbeans/lib/openide-util.jar"/>
1.23 - <pathelement location="../openide/openide-13javac-workaround.jar"/>
1.24 </classpath>
1.25 </javac>
1.26 </target>
1.27 @@ -180,7 +177,6 @@
1.28 <fileset dir="../libs/external">
1.29 <include name="regexp*.jar"/>
1.30 </fileset>
1.31 - <pathelement location="../openide/openide-13javac-workaround.jar"/>
1.32 <fileset dir="../openide/netbeans/lib">
1.33 <include name="openide*.jar"/>
1.34 </fileset>
2.1 --- a/javacvs/changelog/build.xml Wed Apr 07 13:32:00 2004 +0000
2.2 +++ b/javacvs/changelog/build.xml Wed Apr 07 19:26:45 2004 +0000
2.3 @@ -30,7 +30,6 @@
2.4 <fileset dir="../../libs/external">
2.5 <include name="regexp*.jar"/>
2.6 </fileset>
2.7 - <pathelement location="../../openide/openide-13javac-workaround.jar"/>
2.8 <pathelement location="../../openide/netbeans/lib/openide.jar"/>
2.9 <pathelement location="../../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
2.10 </classpath>
3.1 --- a/vcscvs/build.xml Wed Apr 07 13:32:00 2004 +0000
3.2 +++ b/vcscvs/build.xml Wed Apr 07 19:26:45 2004 +0000
3.3 @@ -27,7 +27,6 @@
3.4 <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
3.5 <classpath>
3.6 <pathelement location="../vcscore/netbeans/modules/org-netbeans-modules-vcscore.jar"/>
3.7 - <pathelement location="../openide/openide-13javac-workaround.jar"/>
3.8 <pathelement location="../openide/netbeans/lib/openide.jar"/>
3.9 <pathelement location="../openide/deprecated/netbeans/modules/autoload/openide-deprecated.jar"/> <!-- XXX -->
3.10 <fileset dir="../libs/external">
3.11 @@ -99,13 +98,9 @@
3.12 </sourcepath>
3.13 <classpath>
3.14 <pathelement location="../vcscore/netbeans/modules/org-netbeans-modules-vcscore.jar"/>
3.15 - <pathelement location="../openide/openide-13javac-workaround.jar"/>
3.16 <fileset dir="../openide/netbeans/lib">
3.17 <include name="openide*.jar" />
3.18 </fileset>
3.19 - <fileset dir="../libs/external">
3.20 - <include name="regexp*.jar"/>
3.21 - </fileset>
3.22 </classpath>
3.23 </javadoc>
3.24 </target>
4.1 --- a/vcscvs/compat/build.xml Wed Apr 07 13:32:00 2004 +0000
4.2 +++ b/vcscvs/compat/build.xml Wed Apr 07 19:26:45 2004 +0000
4.3 @@ -20,14 +20,10 @@
4.4 <include name="${nb.modules.dir}/cvscompat.jar"/>
4.5 </patternset>
4.6 <path id="cp">
4.7 - <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
4.8 <pathelement location="${openide.dir}/${nb.lib.dir}/openide.jar"/>
4.9 <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
4.10 <pathelement location="${vcsgeneric.dir}/${nb.modules.dir}/vcsgen.jar"/>
4.11 <pathelement location="${vcscore.dir}/${nb.modules.dir}/org-netbeans-modules-vcscore.jar"/>
4.12 - <fileset dir="${nb_all}/libs/external">
4.13 - <include name="regexp*.jar" />
4.14 - </fileset>
4.15 </path>
4.16 </target>
4.17