Attachment #1252 for bug #11175

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 11175
Collapse All | Expand All




      <license name="ant-license.txt">
        For the Ant module itself:
        <file location="${license.file}"/>
        For the Ant runtime and manual:
        <file location="Ant_License"/>
      </license>
      <description>
        Support for Ant build scripts.
      </description>
      <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
    </makenbm>
  </target>

    <mkdir dir="test"/>
    <filter token="BUILD_NUMBER_SUBST" value="testing"/>
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
    <mkdir dir="test/xtra-ant"/>
    <unzip src="release/modules/ext/ant.jar" dest="test/xtra-ant"/>
    <mkdir dir="test/xtra-optional"/>
    <unzip src="release/modules/ext/ant-optional.jar" dest="test/xtra-optional"/>
    <jar jarfile="test/ant.jar" manifest="manifest-subst.mf" compress="false">
      <fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
      <fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
      <!-- Wait for Ant 1.3 to be standard:
      <zipfileset src="release/modules/ext/ant.jar" excludes="META-INF/MANIFEST.MF"/>
      <zipfileset src="release/modules/ext/ant-optional.jar" excludes="META-INF/MANIFEST.MF"/>
      -->
      <fileset dir="test/xtra-ant" excludes="META-INF/MANIFEST.MF"/>
      <fileset dir="test/xtra-optional" excludes="META-INF/MANIFEST.MF"/>
    </jar>
    <nbinstaller module="test/ant.jar" action="reinstall"/>
  </target>

    <delete dir="Info"/>
    <delete dir="javahelp/org/apache/tools/ant/module/docs/JavaHelpSearch2"/>
    <delete dir="javahelp/org/apache/tools/ant/module/docs/ant-docs"/>
  </target>

  <target name="real-clean" depends="clean">
    <delete dir="test"/>
  </target>


Lines 43-49 Link Here

(-)apisupport/build.xml (-13 / +24 lines)
43	<classpath>	43	<classpath>
44	<pathelement location="../ant/netbeans/modules/ant.jar"/>	44	<pathelement location="../ant/netbeans/modules/ant.jar"/>
45	<!-- Currently automatically in classpath, but a future Ant may change that: -->	45	<!-- Currently automatically in classpath, but a future Ant may change that: -->
46	<pathelement location="${binroot}/ant/release/modules/ext/ant.jar"/>	46	<pathelement location="../ant/release/modules/ext/ant.jar"/>
47	<fileset dir="../openide/netbeans/lib">	47	<fileset dir="../openide/netbeans/lib">
48	<include name="openide*.jar" />	48	<include name="openide*.jar" />
49	</fileset>	49	</fileset>
Lines 110-120 Link Here
110	</makenbm>	110	</makenbm>
111	</target>	111	</target>
112		112
113	<target name="test" depends="compile,javahelp">	113	<target name="test-lite">
114	<ant dir="lite" target="compile"/>	114	<ant dir="lite" target="compile"/>
		115	<filter token="BUILD_NUMBER_SUBST" value="testing"/>
		116	<copy file="apisupport-lite.mf" tofile="apisupport-lite-subst.mf" filtering="on"/>
115	<mkdir dir="test"/>	117	<mkdir dir="test"/>
		118	<jar jarfile="test/apisupport-lite.jar"
		119	manifest="apisupport-lite-subst.mf"
		120	compress="false">
		121	<fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt">
		122	<include name="org/netbeans/modules/apisupport/lite/"/>
		123	</fileset>
		124	</jar>
		125	<nbinstaller module="test/apisupport-lite.jar" action="reinstall"/>
		126	</target>
		127	<target name="test-main" depends="compile,javahelp">
116	<filter token="BUILD_NUMBER_SUBST" value="testing"/>	128	<filter token="BUILD_NUMBER_SUBST" value="testing"/>
117	<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>	129	<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
		130	<mkdir dir="test"/>
118	<jar jarfile="test/apisupport.jar"	131	<jar jarfile="test/apisupport.jar"
119	manifest="manifest-subst.mf"	132	manifest="manifest-subst.mf"
120	compress="false">	133	compress="false">
Lines 125-131 Link Here
125	</fileset>	138	</fileset>
126	<fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt"/>	139	<fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
127	</jar>	140	</jar>
		141	<nbinstaller module="test/apisupport.jar" action="reinstall"/>
		142	</target>
		143	<target name="test-ant" depends="compile">
		144	<filter token="BUILD_NUMBER_SUBST" value="testing"/>
128	<copy file="apisupport-ant.mf" tofile="apisupport-ant-subst.mf" filtering="on"/>	145	<copy file="apisupport-ant.mf" tofile="apisupport-ant-subst.mf" filtering="on"/>
		146	<mkdir dir="test"/>
129	<jar jarfile="test/apisupport-ant.jar"	147	<jar jarfile="test/apisupport-ant.jar"
130	manifest="apisupport-ant-subst.mf"	148	manifest="apisupport-ant-subst.mf"
131	compress="false">	149	compress="false">
Lines 133-151 Link Here
133	<include name="org/netbeans/modules/apisupport/ant/"/>	151	<include name="org/netbeans/modules/apisupport/ant/"/>
134	</fileset>	152	</fileset>
135	</jar>	153	</jar>
136	<copy file="apisupport-lite.mf" tofile="apisupport-lite-subst.mf" filtering="on"/>
137	<jar jarfile="test/apisupport-lite.jar"
138	manifest="apisupport-lite-subst.mf"
139	compress="false">
140	<fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt">
141	<include name="org/netbeans/modules/apisupport/lite/"/>
142	</fileset>
143	</jar>
144	<!-- Will not work the first time, must be manually primed. Bummer. -->
145	<nbinstaller module="test/apisupport-lite.jar" action="reinstall"/>
146	<nbinstaller module="test/apisupport.jar" action="reinstall"/>
147	<nbinstaller module="test/apisupport-ant.jar" action="reinstall"/>	154	<nbinstaller module="test/apisupport-ant.jar" action="reinstall"/>
148	</target>	155	</target>
		156	<target name="test-everything" depends="test-lite,test-main,test-ant"/>
149		157
150	<target name="clean">	158	<target name="clean">
151	<delete>	159	<delete>
Lines 160-165 Link Here
160	<delete file="apisupport.nbm"/>	168	<delete file="apisupport.nbm"/>
161	<delete dir="netbeans"/>	169	<delete dir="netbeans"/>
162	<delete dir="Info"/>	170	<delete dir="Info"/>
		171	</target>
		172
		173	<target name="real-clean" depends="clean">
163	<delete dir="test"/>	174	<delete dir="test"/>
164	</target>	175	</target>
165		176

Lines 17-22 Link Here

(-)autoupdate/build.xml (+2 lines)
17	<property name="homepage.base" value="netbeans.org"/>	17	<property name="homepage.base" value="netbeans.org"/>
18	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>	18	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
19	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>	19	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
		20	<property name="binroot" location=".."/>
20		21
21	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>	22	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
22	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>	23	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
Lines 29-34 Link Here
29	<include name="openide*.jar" />	30	<include name="openide*.jar" />
30	</fileset>	31	</fileset>
31	<pathelement location="../core/netbeans/lib/core.jar"/>	32	<pathelement location="../core/netbeans/lib/core.jar"/>
		33	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
32	</classpath>	34	</classpath>
33	</javac>	35	</javac>
34	<javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	36	<javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">

Lines 60-66 Link Here

(-)core/build.xml (-1 / +1 lines)
60		60
61	<target name="netbeans" depends="jars,release">	61	<target name="netbeans" depends="jars,release">
62	<mkdir dir="netbeans/lib/patches"/>	62	<mkdir dir="netbeans/lib/patches"/>
63	<!-- <mkdir dir="netbeans/modules/patches"/> -->	63	<mkdir dir="netbeans/modules"/>
64	</target>	64	</target>
65		65
66	<target name="clean">	66	<target name="clean">

Lines 26-31 Link Here

(-)debuggercore/build.xml (+2 lines)
26	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	26	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
27	<classpath>	27	<classpath>
28	<pathelement location="../openide/openide-13javac-workaround.jar"/>	28	<pathelement location="../openide/openide-13javac-workaround.jar"/>
		29	<!-- Hopefully set up by nbbuild/build.xml: -->
		30	<pathelement location="${jdkhome}/lib/tools.jar"/>
29	<fileset dir="../openide/netbeans/lib">	31	<fileset dir="../openide/netbeans/lib">
30	<include name="openide*.jar" />	32	<include name="openide*.jar" />
31	</fileset>	33	</fileset>

Lines 25-31 Link Here

(-)debuggerjpda/build.xml (-1 / +7 lines)
25		25
26	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>	26	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
27	<target name="check">	27	<target name="check">
28	<available property="jpda" classname="com.sun.jdi.ObjectReference"/>	28	<available property="jpda" classname="com.sun.jdi.ObjectReference">
		29	<classpath>
		30	<pathelement location="${jdkhome}/lib/tools.jar"/>
		31	</classpath>
		32	</available>
29	</target>	33	</target>
30	<target name="no-such-luck" depends="check" unless="jpda">	34	<target name="no-such-luck" depends="check" unless="jpda">
31	<echo message="Sorry, JPDA module will not be built unless you are running JDK 1.3"/>	35	<echo message="Sorry, JPDA module will not be built unless you are running JDK 1.3"/>
Lines 39-44 Link Here
39	<include name="openide*.jar" />	43	<include name="openide*.jar" />
40	</fileset>	44	</fileset>
41	<pathelement location="../debuggercore/netbeans/modules/debuggerCore.jar"/>	45	<pathelement location="../debuggercore/netbeans/modules/debuggerCore.jar"/>
		46	<!-- Hopefully set up by nbbuild/build.xml: -->
		47	<pathelement location="${jdkhome}/lib/tools.jar"/>
42	</classpath>	48	</classpath>
43	</javac>	49	</javac>
44	</target>	50	</target>

Lines 28-33 Link Here

(-)debuggertools/build.xml (+2 lines)
28	<include name="openide*.jar" />	28	<include name="openide*.jar" />
29	</fileset>	29	</fileset>
30	<pathelement location="../debuggercore/netbeans/modules/debuggerCore.jar"/>	30	<pathelement location="../debuggercore/netbeans/modules/debuggerCore.jar"/>
		31	<!-- Hopefully set up by nbbuild/build.xml: -->
		32	<pathelement location="${jdkhome}/lib/tools.jar"/>
31	</classpath>	33	</classpath>
32	</javac>	34	</javac>
33	</target>	35	</target>

Lines 20-25 Link Here

(-)form/build.xml (+2 lines)
20	<property name="homepage.base" value="netbeans.org"/>	20	<property name="homepage.base" value="netbeans.org"/>
21	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>	21	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
22	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>	22	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
		23	<property name="binroot" location=".."/>
23		24
24	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>	25	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
25	<taskdef name="tojar" classname="org.netbeans.nbbuild.ToJar" classpath="../nbbuild/nbantext.jar"/>	26	<taskdef name="tojar" classname="org.netbeans.nbbuild.ToJar" classpath="../nbbuild/nbantext.jar"/>
Lines 36-41 Link Here
36	<include name="openide*.jar" />	37	<include name="openide*.jar" />
37	</fileset>	38	</fileset>
38	<pathelement location="../java/netbeans/modules/java.jar"/>	39	<pathelement location="../java/netbeans/modules/java.jar"/>
		40	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
39	</classpath>	41	</classpath>
40	</javac>	42	</javac>
41	</target>	43	</target>




  <property name="homepage.base" value="netbeans.org"/>
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
  <property name="binroot" location=".."/>

  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>

        <pathelement location="../core/netbeans/lib/core.jar"/>
        <pathelement location="../properties/netbeans/modules/properties.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
      </classpath>
    </javac>
    <javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">

        <pathelement location="../properties/netbeans/modules/properties.jar"/>
        <pathelement location="../form/netbeans/modules/form.jar"/>
        <pathelement location="../java/netbeans/modules/java.jar"/>
        <pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
      </classpath>
    </javac>


Lines 17-23 Link Here

(-)java/build.xml (-3 / +4 lines)
17	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>	17	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
18	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>	18	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
19		19
20	<property name="binroot" value=".."/>	20	<property name="binroot" location=".."/>
21	<property name="homepage.base" value="netbeans.org"/>	21	<property name="homepage.base" value="netbeans.org"/>
22	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>	22	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
23	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>	23	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
Lines 32-37 Link Here
32	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	32	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
33	<pathelement location="${binroot}/java/release/modules/ext/javac.jar"/>	33	<pathelement location="${binroot}/java/release/modules/ext/javac.jar"/>
34	<pathelement location="${binroot}/java/release/modules/ext/java-gj.jar"/>	34	<pathelement location="${binroot}/java/release/modules/ext/java-gj.jar"/>
		35	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
		36	<!-- Hopefully set up by nbbuild/build.xml: -->
		37	<pathelement location="${jdkhome}/lib/tools.jar"/>
35	</classpath>	38	</classpath>
36	</javac>	39	</javac>
37	</target>	40	</target>
Lines 84-88 Link Here
84	</target>	87	</target>
85		88
86	</project>	89	</project>
87
88

Lines 17-22 Link Here

(-)javadoc/build.xml (+4 lines)
17	<property name="homepage.base" value="netbeans.org"/>	17	<property name="homepage.base" value="netbeans.org"/>
18	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>	18	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
19	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>	19	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
		20	<property name="binroot" location=".."/>
20		21
21	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>	22	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
22	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>	23	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
Lines 29-34 Link Here
29	<include name="openide*.jar" />	30	<include name="openide*.jar" />
30	</fileset>	31	</fileset>
31	<pathelement location="../java/netbeans/modules/java.jar"/>	32	<pathelement location="../java/netbeans/modules/java.jar"/>
		33	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
		34	<!-- Hopefully set up by nbbuild/build.xml: -->
		35	<pathelement location="${jdkhome}/lib/tools.jar"/>
32	</classpath>	36	</classpath>
33	</javac>	37	</javac>
34	</target>	38	</target>

Lines 39-44 Link Here

(-)nbbuild/build.xml (+2 lines)
39	<classpath>	39	<classpath>
40	<!-- Needed for CheckLinks: -->	40	<!-- Needed for CheckLinks: -->
41	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	41	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
		42	<!-- For running inside the IDE, to pick up ant.jar: -->
		43	<pathelement path="${netbeans.library.path}"/>
42	</classpath>	44	</classpath>
43	</javac>	45	</javac>
44	<jar jarfile="nbantext.jar" basedir="antsrc">	46	<jar jarfile="nbantext.jar" basedir="antsrc">

Lines 87-92 Link Here

(-)openide/build.xml (+1 lines)
87	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	87	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
88	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	88	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
89	<!-- <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->	89	<!-- <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->
		90	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
90	</classpath>	91	</classpath>
91	</javac>	92	</javac>
92	<postprocess file="compatkit-work/org/openide/util/actions/SystemAction.class"	93	<postprocess file="compatkit-work/org/openide/util/actions/SystemAction.class"

Lines 17-22 Link Here

(-)projects/build.xml (-1 / +3 lines)
17	<property name="homepage.base" value="netbeans.org"/>	17	<property name="homepage.base" value="netbeans.org"/>
18	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>	18	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
19	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>	19	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
		20	<property name="binroot" location=".."/>
20		21
21	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>	22	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
22	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>	23	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
Lines 29-35 Link Here
29	<include name="openide*.jar" />	30	<include name="openide*.jar" />
30	</fileset>	31	</fileset>
31	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>	32	<pathelement location="${binroot}/core/release/lib/ext/jaxp.jar"/>
32	<pathelement location="${binroot}/core/release/lib/ext/parser.jar"/>	33	<!-- <pathelement location="${binroot}/core/release/lib/ext/parser.jar"/> -->
		34	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
33	</classpath>	35	</classpath>
34	</javac>	36	</javac>
35	</target>	37	</target>

Lines 17-23 Link Here

(-)utilities/build.xml (-1 / +2 lines)
17	<property name="homepage.base" value="netbeans.org"/>	17	<property name="homepage.base" value="netbeans.org"/>
18	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>	18	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
19	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>	19	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
20	<property name="binroot" value=".."/>	20	<property name="binroot" location=".."/>
21		21
22	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>	22	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>	23	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
Lines 31-36 Link Here
31	</fileset>	31	</fileset>
32	<pathelement location="../openidex/netbeans/modules/openidex.jar"/>	32	<pathelement location="../openidex/netbeans/modules/openidex.jar"/>
33	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	33	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
		34	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
34	</classpath>	35	</classpath>
35	</javac>	36	</javac>
36	</target>	37	</target>

Lines 37-42 Link Here

(-)vcsgeneric/build.xml (+1 lines)
37	</fileset>	37	</fileset>
38	<pathelement location="${nbroot}/openidex/netbeans/modules/openidex.jar"/>	38	<pathelement location="${nbroot}/openidex/netbeans/modules/openidex.jar"/>
39	<pathelement location="${nbroot}/vcscore/netbeans/modules/vcscore.jar"/>	39	<pathelement location="${nbroot}/vcscore/netbeans/modules/vcscore.jar"/>
		40	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
40	</classpath>	41	</classpath>
41	</javac>	42	</javac>
42	<javac srcdir="src/org/netbeans/modules/vcs/advanced/config"	43	<javac srcdir="src/org/netbeans/modules/vcs/advanced/config"

Lines 37-42 Link Here

(-)web/build.xml (+3 lines)
37	</fileset>	37	</fileset>
38	<pathelement location="../openidex/netbeans/modules/openidex.jar"/>	38	<pathelement location="../openidex/netbeans/modules/openidex.jar"/>
39	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	39	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
		40	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
		41	<!-- Hopefully set up by nbbuild/build.xml: -->
		42	<pathelement location="${jdkhome}/lib/tools.jar"/>
40	</classpath>	43	</classpath>
41	</javac>	44	</javac>
42	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	45	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">

Return to bug 11175

Lines 84-95 Link Here

(-)ant/build.xml (-12 / +4 lines)
84	<license name="ant-license.txt">	84	<license name="ant-license.txt">
85	For the Ant module itself:	85	For the Ant module itself:
86	<file location="${license.file}"/>	86	<file location="${license.file}"/>
87	For the Ant runtime:	87	For the Ant runtime and manual:
88	<file location="Ant_License"/>	88	<file location="Ant_License"/>
89	</license>	89	</license>
90	<description>
91	Support for Ant build scripts.
92	</description>
93	<signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>	90	<signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
94	</makenbm>	91	</makenbm>
95	</target>	92	</target>
Lines 98-116 Link Here
98	<mkdir dir="test"/>	95	<mkdir dir="test"/>
99	<filter token="BUILD_NUMBER_SUBST" value="testing"/>	96	<filter token="BUILD_NUMBER_SUBST" value="testing"/>
100	<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>	97	<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
101	<mkdir dir="test/xtra-ant"/>
102	<unzip src="release/modules/ext/ant.jar" dest="test/xtra-ant"/>
103	<mkdir dir="test/xtra-optional"/>
104	<unzip src="release/modules/ext/ant-optional.jar" dest="test/xtra-optional"/>
105	<jar jarfile="test/ant.jar" manifest="manifest-subst.mf" compress="false">	98	<jar jarfile="test/ant.jar" manifest="manifest-subst.mf" compress="false">
106	<fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>	99	<fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
107	<fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt"/>	100	<fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
108	<!-- Wait for Ant 1.3 to be standard:
109	<zipfileset src="release/modules/ext/ant.jar" excludes="META-INF/MANIFEST.MF"/>	101	<zipfileset src="release/modules/ext/ant.jar" excludes="META-INF/MANIFEST.MF"/>
110	<zipfileset src="release/modules/ext/ant-optional.jar" excludes="META-INF/MANIFEST.MF"/>	102	<zipfileset src="release/modules/ext/ant-optional.jar" excludes="META-INF/MANIFEST.MF"/>
111	-->
112	<fileset dir="test/xtra-ant" excludes="META-INF/MANIFEST.MF"/>
113	<fileset dir="test/xtra-optional" excludes="META-INF/MANIFEST.MF"/>
114	</jar>	103	</jar>
115	<nbinstaller module="test/ant.jar" action="reinstall"/>	104	<nbinstaller module="test/ant.jar" action="reinstall"/>
116	</target>	105	</target>
Lines 127-132 Link Here
127	<delete dir="Info"/>	116	<delete dir="Info"/>
128	<delete dir="javahelp/org/apache/tools/ant/module/docs/JavaHelpSearch2"/>	117	<delete dir="javahelp/org/apache/tools/ant/module/docs/JavaHelpSearch2"/>
129	<delete dir="javahelp/org/apache/tools/ant/module/docs/ant-docs"/>	118	<delete dir="javahelp/org/apache/tools/ant/module/docs/ant-docs"/>
		119	</target>
		120
		121	<target name="real-clean" depends="clean">
130	<delete dir="test"/>	122	<delete dir="test"/>
131	</target>	123	</target>
132		124

Lines 17-23 Link Here

(-)i18n/build.xml (-1 / +3 lines)
17	<property name="homepage.base" value="netbeans.org"/>	17	<property name="homepage.base" value="netbeans.org"/>
18	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>	18	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
19	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>	19	<property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
20	<property name="binroot" value=".."/>	20	<property name="binroot" location=".."/>
21		21
22	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>	22	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
23	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>	23	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
Lines 33-38 Link Here
33	<pathelement location="../core/netbeans/lib/core.jar"/>	33	<pathelement location="../core/netbeans/lib/core.jar"/>
34	<pathelement location="../properties/netbeans/modules/properties.jar"/>	34	<pathelement location="../properties/netbeans/modules/properties.jar"/>
35	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>	35	<pathelement location="${binroot}/core/release/lib/ext/regexp.jar"/>
		36	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
36	</classpath>	37	</classpath>
37	</javac>	38	</javac>
38	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	39	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Lines 45-50 Link Here
45	<pathelement location="../properties/netbeans/modules/properties.jar"/>	46	<pathelement location="../properties/netbeans/modules/properties.jar"/>
46	<pathelement location="../form/netbeans/modules/form.jar"/>	47	<pathelement location="../form/netbeans/modules/form.jar"/>
47	<pathelement location="../java/netbeans/modules/java.jar"/>	48	<pathelement location="../java/netbeans/modules/java.jar"/>
		49	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
48	</classpath>	50	</classpath>
49	</javac>	51	</javac>
50		52