1.1 --- a/make/build.xml Thu Jan 17 18:15:20 2013 +0000
1.2 +++ b/make/build.xml Fri Jan 18 00:16:21 2013 +0100
1.3 @@ -241,15 +241,15 @@
1.4 </target>
1.5
1.6 <target name="build-bootstrap-tools"
1.7 - depends="build-bootstrap-javac,build-bootstrap-javadoc,build-bootstrap-doclets,build-bootstrap-javah"
1.8 + depends="build-bootstrap-javac,build-bootstrap-javadoc,build-bootstrap-doclets,build-bootstrap-javah,build-bootstrap-sjavac"
1.9 />
1.10
1.11 <target name="build-all-tools"
1.12 - depends="build-javac,build-javadoc,build-doclets,build-javah,build-javap"
1.13 + depends="build-javac,build-javadoc,build-doclets,build-javah,build-javap,build-sjavac"
1.14 />
1.15
1.16 <target name="build-all-classes" depends="build-bootstrap-javac,-create-import-jdk-stubs">
1.17 - <build-classes includes="${javac.includes} ${javadoc.includes} ${doclets.includes} ${javah.includes} ${javap.includes}"/>
1.18 + <build-classes includes="${javac.includes} ${javadoc.includes} ${doclets.includes} ${javah.includes} ${javap.includes} ${sjavac.includes}"/>
1.19 </target>
1.20
1.21 <!-- clean -->
1.22 @@ -656,6 +656,40 @@
1.23
1.24 <target name="javap" depends="build-javap,jtreg-javap,findbugs-javap"/>
1.25
1.26 + <!--
1.27 + **** sjavac targets.
1.28 + -->
1.29 +
1.30 + <target name="build-bootstrap-sjavac"
1.31 + depends="-def-build-bootstrap-classes,-def-build-bootstrap-jar,-def-build-bootstrap-tool">
1.32 + <build-bootstrap-classes includes="${sjavac.includes}"/>
1.33 + <build-bootstrap-jar name="sjavac" includes="${sjavac.includes}"
1.34 + jarmainclass="com.sun.tools.sjavac.Main"/>
1.35 + <build-bootstrap-tool name="sjavac"/>
1.36 + </target>
1.37 +
1.38 + <target name="build-classes-sjavac" depends="build-classes-javac">
1.39 + <build-classes includes="${sjavac.includes}"/>
1.40 + </target>
1.41 +
1.42 + <target name="build-sjavac" depends="build-classes-sjavac">
1.43 + <build-jar name="sjavac" includes="${sjavac.includes}"
1.44 + jarmainclass="com.sun.tools.sjavac.Main"
1.45 + jarclasspath="sjavac.jar"/>
1.46 + <build-tool name="sjavac"/>
1.47 + </target>
1.48 +
1.49 + <!-- (no javadoc for javap) -->
1.50 +
1.51 + <target name="jtreg-sjavac" depends="build-sjavac,-def-jtreg">
1.52 + <jtreg-tool name="sjavac" tests="${sjavac.tests}"/>
1.53 + </target>
1.54 +
1.55 + <target name="findbugs-sjavac" depends="build-sjavac,-def-findbugs">
1.56 + <findbugs-tool name="sjavac"/>
1.57 + </target>
1.58 +
1.59 + <target name="sjavac" depends="build-sjavac,jtreg-sjavac,findbugs-sjavac"/>
1.60
1.61 <!--
1.62 **** Create import JDK stubs.
