Skip to content

Commit 7282f68

Browse files
author
Eric Caspole
committed
8361216: Do not fork javac in J2DBench ant build
Reviewed-by: prr
1 parent 6e20338 commit 7282f68

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

src/demo/share/java2d/J2DBench/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232

3333
ifndef SOURCE
34-
export SOURCE := 7
34+
export SOURCE := 8
3535
endif
3636
ifndef TARGET
37-
export TARGET := 7
37+
export TARGET := 8
3838
endif
3939
ifndef JAVAC
4040
export JAVAC := javac

src/demo/share/java2d/J2DBench/build.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
<property name="dist" location="dist"/>
4040
<property name="resources" location="resources"/>
4141

42-
<condition property="source" value="7">
42+
<condition property="source" value="8">
4343
<not>
4444
<isset property="source"/>
4545
</not>
4646
</condition>
47-
<condition property="target" value="7">
47+
<condition property="target" value="8">
4848
<not>
4949
<isset property="target"/>
5050
</not>
@@ -54,11 +54,6 @@
5454
<isset property="java"/>
5555
</not>
5656
</condition>
57-
<condition property="javac" value="javac">
58-
<not>
59-
<isset property="javac"/>
60-
</not>
61-
</condition>
6257

6358
<target name="init">
6459
<!-- Create the time stamp -->
@@ -70,7 +65,7 @@
7065
<target name="compile" depends="init"
7166
description="compile the source " >
7267
<!-- Compile the java code from ${src} into ${build} -->
73-
<javac debug="off" source="${source}" target="${target}" srcdir="${src}" destdir="${build}" fork="true" executable="${javac}"/>
68+
<javac debug="off" source="${source}" target="${target}" srcdir="${src}" destdir="${build}"/>
7469
</target>
7570

7671
<target name="run" depends="dist"

0 commit comments

Comments
 (0)