Attachment #96241 for bug #182984

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 182984
Collapse All | Expand All




        </autoupdate>
    </target>

    <macrodef name="javac-compile">
		<attribute name="src.dir" />
		<attribute name="build.classes.dir" />
		<attribute name="build.compiler.debug" />
		<attribute name="build.compiler.debuglevel" />
		<attribute name="build.compiler.deprecation" />
		<attribute name="build.compiler.optimize" />
		<attribute name="build.compiler.encoding" />
		<attribute name="javac.compilerargs" />
		<attribute name="javac.source" />
		<attribute name="javac.target" />
		<element name="before-compile" />
		<element name="after-compile" />
		<sequential>
			<mkdir dir="@{build.classes.dir}"/>
			<before-compile />
			<depend srcdir="@{src.dir}" destdir="@{build.classes.dir}" cache="build/depcache">
				<classpath refid="cp"/>
			</depend>
			<nb-javac srcdir="@{src.dir}" destdir="@{build.classes.dir}"
				debug="@{build.compiler.debug}" debuglevel="@{build.compiler.debuglevel}"
				encoding="@{build.compiler.encoding}"
				deprecation="@{build.compiler.deprecation}" optimize="@{build.compiler.optimize}"
				source="@{javac.source}" target="@{javac.target}"
				includeantruntime="false">
				<classpath refid="cp"/>
				<compilerarg line="@{javac.compilerargs}"/>
				<processorpath refid="processor.cp"/>
			</nb-javac>
			<after-compile />
		</sequential>
	</macrodef>

    <target name="compile" depends="init,up-to-date" unless="is.jar.uptodate">
		<javac-compile src.dir="${src.dir}"
			build.classes.dir="${build.classes.dir}"
			build.compiler.debug="${build.compiler.debug}"
			build.compiler.debuglevel="${build.compiler.debuglevel}"
			build.compiler.deprecation="${build.compiler.deprecation}"
			build.compiler.optimize="${build.compiler.optimize}"
			build.compiler.encoding="UTF-8"
			javac.compilerargs="${javac.compilerargs}"
			javac.source="${javac.source}"
			javac.target="${javac.target}">
			<before-compile />
			<after-compile>
				<copy todir="${build.classes.dir}">
					<fileset dir="${src.dir}" excludes="${jar-excludes}"/>
				</copy>
			</after-compile>
		</javac-compile>
	</target>

    <target name="compile-file-encoding" depends="init,up-to-date" unless="is.jar.uptodate">
		<javac-compile src.dir="${src.dir}"
			build.classes.dir="${build.classes.dir}"
			build.compiler.debug="${build.compiler.debug}"
			build.compiler.debuglevel="${build.compiler.debuglevel}"
			build.compiler.deprecation="${build.compiler.deprecation}"
			build.compiler.optimize="${build.compiler.optimize}"
			build.compiler.encoding="${file.encoding}"
			javac.compilerargs="${javac.compilerargs}"
			javac.source="${javac.source}"
			javac.target="${javac.target}">
			<before-compile />
			<after-compile>
				<copy todir="${build.classes.dir}">
					<fileset dir="${src.dir}" excludes="${jar-excludes}"/>
				</copy>
			</after-compile>
		</javac-compile>
	</target>

    <target name="compile-single" depends="init">
        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
		<javac-compile src.dir="${src.dir}"
			build.classes.dir="${build.classes.dir}"
			build.compiler.debug="${build.compiler.debug}"
			build.compiler.debuglevel="${build.compiler.debuglevel}"
			build.compiler.deprecation="${build.compiler.deprecation}"
			build.compiler.optimize="${build.compiler.optimize}"
			build.compiler.encoding="UTF-8"
			javac.compilerargs="${javac.compilerargs}"
			javac.source="${javac.source}"
			javac.target="${javac.target}">
			<before-compile>
				<!-- XXX consider forcing debug=true and deprecation=true -->
				<!-- XXX consider deleting the .class file first to force a rebuild -->
			</before-compile>
			<after-compile />
		</javac-compile>
	</target>

    <target name="compile-single-file-encoding" depends="init">
        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
		<javac-compile src.dir="${src.dir}"
			build.classes.dir="${build.classes.dir}"
			build.compiler.debug="${build.compiler.debug}"
			build.compiler.debuglevel="${build.compiler.debuglevel}"
			build.compiler.deprecation="${build.compiler.deprecation}"
			build.compiler.optimize="${build.compiler.optimize}"
			build.compiler.encoding="${file.encoding}"
			javac.compilerargs="${javac.compilerargs}"
			javac.source="${javac.source}"
			javac.target="${javac.target}">
			<before-compile>
				<!-- XXX consider forcing debug=true and deprecation=true -->
				<!-- XXX consider deleting the .class file first to force a rebuild -->
			</before-compile>
			<after-compile />
		</javac-compile>
	</target>

    <target name="jar-prep" depends="init">
        <mkdir dir="${cluster}/${module.jar.dir}"/>

Lines 86-92 Link Here

(-)a/websvc.saas.api/build.xml (-1 / +1 lines)
86	</xjc>	86	</xjc>
87	</target>	87	</target>
88		88
89	<target name="compile" depends="model-gen,projectized-common.compile"/>	89	<target name="compile" depends="model-gen,projectized-common.compile-file-encoding"/>
90		90
91	<target name="clean" depends="projectized-common.clean">	91	<target name="clean" depends="projectized-common.clean">
92	<delete dir="${saas.model.jaxb}"/>	92	<delete dir="${saas.model.jaxb}"/>

Return to bug 182984

Lines 190-227 Link Here

(-)a/nbbuild/templates/common.xml (-28 / +108 lines)
190	</autoupdate>	190	</autoupdate>
191	</target>	191	</target>
192		192
		193	<macrodef name="javac-compile">
		194	<attribute name="src.dir" />
		195	<attribute name="build.classes.dir" />
		196	<attribute name="build.compiler.debug" />
		197	<attribute name="build.compiler.debuglevel" />
		198	<attribute name="build.compiler.deprecation" />
		199	<attribute name="build.compiler.optimize" />
		200	<attribute name="build.compiler.encoding" />
		201	<attribute name="javac.compilerargs" />
		202	<attribute name="javac.source" />
		203	<attribute name="javac.target" />
		204	<element name="before-compile" />
		205	<element name="after-compile" />
		206	<sequential>
		207	<mkdir dir="@{build.classes.dir}"/>
		208	<before-compile />
		209	<depend srcdir="@{src.dir}" destdir="@{build.classes.dir}" cache="build/depcache">
		210	<classpath refid="cp"/>
		211	</depend>
		212	<nb-javac srcdir="@{src.dir}" destdir="@{build.classes.dir}"
		213	debug="@{build.compiler.debug}" debuglevel="@{build.compiler.debuglevel}"
		214	encoding="@{build.compiler.encoding}"
		215	deprecation="@{build.compiler.deprecation}" optimize="@{build.compiler.optimize}"
		216	source="@{javac.source}" target="@{javac.target}"
		217	includeantruntime="false">
		218	<classpath refid="cp"/>
		219	<compilerarg line="@{javac.compilerargs}"/>
		220	<processorpath refid="processor.cp"/>
		221	</nb-javac>
		222	<after-compile />
		223	</sequential>
		224	</macrodef>
		225
193	<target name="compile" depends="init,up-to-date" unless="is.jar.uptodate">	226	<target name="compile" depends="init,up-to-date" unless="is.jar.uptodate">
194	<mkdir dir="${build.classes.dir}"/>	227	<javac-compile src.dir="${src.dir}"
195	<depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="build/depcache">	228	build.classes.dir="${build.classes.dir}"
196	<classpath refid="cp"/>	229	build.compiler.debug="${build.compiler.debug}"
197	</depend>	230	build.compiler.debuglevel="${build.compiler.debuglevel}"
198	<nb-javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="${build.compiler.debug}" debuglevel="${build.compiler.debuglevel}" encoding="UTF-8"	231	build.compiler.deprecation="${build.compiler.deprecation}"
199	deprecation="${build.compiler.deprecation}" optimize="${build.compiler.optimize}" source="${javac.source}" target="${javac.target}" includeantruntime="false">	232	build.compiler.optimize="${build.compiler.optimize}"
200	<classpath refid="cp"/>	233	build.compiler.encoding="UTF-8"
201	<compilerarg line="${javac.compilerargs}"/>	234	javac.compilerargs="${javac.compilerargs}"
202	<processorpath refid="processor.cp"/>	235	javac.source="${javac.source}"
203	</nb-javac>	236	javac.target="${javac.target}">
204	<copy todir="${build.classes.dir}">	237	<before-compile />
205	<fileset dir="${src.dir}" excludes="${jar-excludes}"/>	238	<after-compile>
206	</copy>	239	<copy todir="${build.classes.dir}">
207	</target>	240	<fileset dir="${src.dir}" excludes="${jar-excludes}"/>
		241	</copy>
		242	</after-compile>
		243	</javac-compile>
		244	</target>
		245
		246	<target name="compile-file-encoding" depends="init,up-to-date" unless="is.jar.uptodate">
		247	<javac-compile src.dir="${src.dir}"
		248	build.classes.dir="${build.classes.dir}"
		249	build.compiler.debug="${build.compiler.debug}"
		250	build.compiler.debuglevel="${build.compiler.debuglevel}"
		251	build.compiler.deprecation="${build.compiler.deprecation}"
		252	build.compiler.optimize="${build.compiler.optimize}"
		253	build.compiler.encoding="${file.encoding}"
		254	javac.compilerargs="${javac.compilerargs}"
		255	javac.source="${javac.source}"
		256	javac.target="${javac.target}">
		257	<before-compile />
		258	<after-compile>
		259	<copy todir="${build.classes.dir}">
		260	<fileset dir="${src.dir}" excludes="${jar-excludes}"/>
		261	</copy>
		262	</after-compile>
		263	</javac-compile>
		264	</target>
208		265
209	<target name="compile-single" depends="init">	266	<target name="compile-single" depends="init">
210	<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>	267	<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
211	<mkdir dir="${build.classes.dir}"/>	268	<javac-compile src.dir="${src.dir}"
212	<!-- XXX consider forcing debug=true and deprecation=true -->	269	build.classes.dir="${build.classes.dir}"
213	<!-- XXX consider deleting the .class file first to force a rebuild -->	270	build.compiler.debug="${build.compiler.debug}"
214	<depend srcdir="${src.dir}" destdir="${build.classes.dir}" cache="build/depcache">	271	build.compiler.debuglevel="${build.compiler.debuglevel}"
215	<classpath refid="cp"/>	272	build.compiler.deprecation="${build.compiler.deprecation}"
216	</depend>	273	build.compiler.optimize="${build.compiler.optimize}"
217	<nb-javac srcdir="${src.dir}" destdir="${build.classes.dir}"	274	build.compiler.encoding="UTF-8"
218	debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}" encoding="UTF-8"	275	javac.compilerargs="${javac.compilerargs}"
219	source="${javac.source}" target="${javac.target}" includes="${javac.includes}" optimize="${build.compiler.optimize}" includeantruntime="false">	276	javac.source="${javac.source}"
220	<classpath refid="cp"/>	277	javac.target="${javac.target}">
221	<compilerarg line="${javac.compilerargs}"/>	278	<before-compile>
222	<processorpath refid="processor.cp"/>	279	<!-- XXX consider forcing debug=true and deprecation=true -->
223	</nb-javac>	280	<!-- XXX consider deleting the .class file first to force a rebuild -->
224	</target>	281	</before-compile>
		282	<after-compile />
		283	</javac-compile>
		284	</target>
		285
		286	<target name="compile-single-file-encoding" depends="init">
		287	<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
		288	<javac-compile src.dir="${src.dir}"
		289	build.classes.dir="${build.classes.dir}"
		290	build.compiler.debug="${build.compiler.debug}"
		291	build.compiler.debuglevel="${build.compiler.debuglevel}"
		292	build.compiler.deprecation="${build.compiler.deprecation}"
		293	build.compiler.optimize="${build.compiler.optimize}"
		294	build.compiler.encoding="${file.encoding}"
		295	javac.compilerargs="${javac.compilerargs}"
		296	javac.source="${javac.source}"
		297	javac.target="${javac.target}">
		298	<before-compile>
		299	<!-- XXX consider forcing debug=true and deprecation=true -->
		300	<!-- XXX consider deleting the .class file first to force a rebuild -->
		301	</before-compile>
		302	<after-compile />
		303	</javac-compile>
		304	</target>
225		305
226	<target name="jar-prep" depends="init">	306	<target name="jar-prep" depends="init">
227	<mkdir dir="${cluster}/${module.jar.dir}"/>	307	<mkdir dir="${cluster}/${module.jar.dir}"/>