stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8016213: Convert j2se NetBeans project to use top-level make targets

Browse Source 
Reviewed-by: chegar
This commit is contained in:
Mike Duigou 2013-06-11 15:39:20 -07:00
parent 2ea5ec5419
commit 0df3d2fa1a
2 changed files with 6 additions and 6 deletions
jdk/make/netbeans
common
shared.xml
j2se
build.xml

8
jdk/make/netbeans/common/shared.xml

@ -77,7 +77,7 @@
<echo level="verbose">System configuration claims architecture is ${platform}-${arch}</echo>
<property name="build.dir" location="${root}/build/${platform}-${arch}"/>
<property name="bin.dir" location="${build.dir}/bin"/>
<property name="make.dir" location="${root}/make"/>
<property name="make.dir" location="${root}/make"/> <!-- this is old build make files! -->
<property name="gensrc.dir" location="${build.dir}/gensrc"/>
<property name="classes.dir" location="${build.dir}/classes"/>
<property name="jtreg.dir" location="${build.dir}/jtreg/${ant.project.name}"/>
@ -126,7 +126,7 @@
<attribute name="classesdir" default="${classes.dir}"/>
<sequential>
<mkdir dir="@{classesdir}"/>
<javac srcdir="@{srcdir}" includes="@{includes}" excludes="@{excludes}" sourcepath=""
<javac srcdir="@{srcdir}" includes="@{includes}" excludes="@{excludes}" sourcepath=""
destdir="@{classesdir}" fork="true" executable="${bootstrap.javac}"
debug="${javac.debug}" debuglevel="${javac.debuglevel}">
<!-- Mandatory for compiling partial JDK sources against a snapshot; should NEVER be used for any other purpose: -->
@ -146,7 +146,7 @@
<!-- Empty placeholder for easier customization. -->
<!-- You can override this target in the ../build.xml file. -->
</target>
<target name="build" depends="-init,-pre-compile,-build-ant,-build-make,-post-compile" description="Build sources."/>
<target name="-do-build-ant">
<depend srcdir="${share.src.dir}:${platform.src.dir}:${root}/src/closed/share/classes:${gensrc.dir}" destdir="${classes.dir}" cache="${build.dir}/depcache" includes="${includes}" excludes="${excludes}"/>
@ -312,7 +312,7 @@
<param name="jtreg.vm.options" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
</antcall>
</target>
<target name="debug" depends="-init" if="netbeans.home">
<!-- No package decls -> "source root" is immediately containing dir -->
<dirname file="${root}/test/${jtreg.tests}" property="test.dir"/>

4
jdk/make/netbeans/j2se/build.xml

@ -37,11 +37,11 @@
<import file="../common/shared.xml"/>
<target name="-build-make" depends="-make.init" if="use.make">
<make-run target="all" dir="${make.dir}"/>
<make-run target="jdk" dir="${root}/.."/>
</target>
<target name="-clean-make" depends="-make.init" if="use.make">
<make-run target="clean" dir="${make.dir}"/>
<make-run target="clean-jdk" dir="${root}/.."/>
</target>
</project>