Skip to content

Commit a6f6025

Browse files
ponderosaTXponderosaTX
committed
Replaced references to JAVA8_HOME and java8-home by JAVA_HOME and java-home, respectively.
1 parent 578dd8d commit a6f6025

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

‎drjava/build.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<property name="drjava.test.config" value="testFiles/drjava.basic.config" />
3737

3838
<property environment="env" />
39-
<property name="java8-home" value="${env.JAVA8_HOME}" />
39+
<property name="java-home" value="${env.JAVA_HOME}" />
4040
<property name="findbugs-home" value="${env.FINDBUGS_HOME}" />
4141

4242
<property name="is-development" value="yes" /> <!-- Development or stable release -->
@@ -197,7 +197,7 @@
197197
<echo message="jrelibs=${toString:jrelibs}" />
198198
<javac srcdir="src" destdir="classes/base" source="1.7" target="1.7"
199199
bootclasspath="${java8-runtime}" sourcepath="" includeAntRuntime="no"
200-
executable="${java8-home}/bin/javac" fork="yes" memoryMaximumSize="1024M"
200+
executable="${java-home}/bin/javac" fork="yes" memoryMaximumSize="1024M"
201201
debug="on" optimize="off" deprecation="on" >
202202
<classpath>
203203
<!-- TODO: Remove this dependency on tools.jar by refactoring and moving all the dependent
@@ -848,48 +848,48 @@
848848
<!-- We rely on "location" to generate a platform-specific path; note that properties
849849
are immutable and so java8-runtime will only be set the *first* time. -->
850850

851-
<property name="java8-runtime-1" location="${java8-home}/lib/rt.jar" />
851+
<property name="java8-runtime-1" location="${java-home}/lib/rt.jar" />
852852
<available property="java8-runtime" value="${java8-runtime-1}" file="${java8-runtime-1}" />
853853

854-
<property name="java8-runtime-2" location="${java8-home}/jre/lib/rt.jar" />
854+
<property name="java8-runtime-2" location="${java-home}/jre/lib/rt.jar" />
855855
<available property="java8-runtime" value="${java8-runtime-2}" file="${java8-runtime-2}" />
856856

857-
<property name="java8-runtime-3" location="${java8-home}/../Classes/classes.jar" />
857+
<property name="java8-runtime-3" location="${java-home}/../Classes/classes.jar" />
858858
<available property="java8-runtime" value="${java8-runtime-3}" file="${java8-runtime-3}" />
859859

860860
<echo message="java8-runtime = ${java8-runtime}" />
861861

862-
<fail message="Can't find rt.jar in the Java 8 home: ${java8-home}" unless="java8-runtime" />
862+
<fail message="Can't find rt.jar in the Java 8 home: ${java-home}" unless="java8-runtime" />
863863
</target>
864864

865865
<target name="resolve-java8-exec">
866866
<!-- We rely on "location" to generate a platform-specific path -->
867867

868-
<property name="java8-exec-1" location="${java8-home}/bin/java.exe" />
868+
<property name="java8-exec-1" location="${java-home}/bin/java.exe" />
869869
<condition property="java8-exec" value="${java8-exec-1}">
870870
<and>
871871
<available file="${java8-exec-1}" />
872872
<os family="windows" />
873873
</and>
874874
</condition>
875875

876-
<property name="java8-exec-2" location="${java8-home}/bin/java" />
876+
<property name="java8-exec-2" location="${java-home}/bin/java" />
877877
<available property="java8-exec" value="${java8-exec-2}" file="${java8-exec-2}" />
878878

879-
<fail message="Can't find the java executable in the Java 8 home: ${java8-home}" unless="java8-exec" />
879+
<fail message="Can't find the java executable in the Java 8 home: ${java-home}" unless="java8-exec" />
880880
</target>
881881

882882
<target name="resolve-java8-tools">
883-
<property name="java8-tools-1" location="${java8-home}/lib/tools.jar" />
883+
<property name="java8-tools-1" location="${java-home}/lib/tools.jar" />
884884
<available property="java8-tools" value="${java8-tools-1}" file="${java8-tools-1}" />
885885

886-
<property name="java8-tools-2" location="${java8-home}/../lib/tools.jar" />
886+
<property name="java8-tools-2" location="${java-home}/../lib/tools.jar" />
887887
<available property="java8-tools" value="${java8-tools-2}" file="${java8-tools-2}" />
888888

889-
<property name="java8-tools-3" location="${java8-home}/../Classes/classes.jar" />
889+
<property name="java8-tools-3" location="${java-home}/../Classes/classes.jar" />
890890
<available property="java8-tools" value="${java8-tools-3}" file="${java8-tools-3}" />
891891

892-
<fail message="Can't find tools.jar in the Java 8 home: ${java8-home}" unless="java8-tools" />
892+
<fail message="Can't find tools.jar in the Java 8 home: ${java-home}" unless="java8-tools" />
893893
</target>
894894

895895
<target name="resolve-current-tools">

0 commit comments

Comments
 (0)