Skip to content

Commit 5a4dc27

Browse files
ponderosaTXponderosaTX
committed
This revision updates the default compiler (when no JDK is found) to the Eclipse Compiler 4.5.1. It also comments out debugging output that should not appear in a release and deletes some obsolete code (supporting Java 1.3, 1.4, 1.5).
The following files were deleted, added, or modified. modified: build.xml deleted: lib/ecj-4.9.jar deleted: lib/forms-1.2.1.jar new file: lib/jgoodies-common-1.8.1.jar deleted: lib/jgoodies-common.jar new file: lib/jgoodies-forms-1.9.0.jar new file: lib/jgoodies-looks-2.7.0.jar deleted: lib/jgoodies-looks.jar modified: lib/platform.jar modified: lib/readme.txt deleted: lib/tools6.jar modified: src/edu/rice/cs/drjava/CommandLineTest.java modified: src/edu/rice/cs/drjava/DrJava.java modified: src/edu/rice/cs/drjava/config/ForcedChoiceOption.java modified: src/edu/rice/cs/drjava/config/OptionConstants.java modified: src/edu/rice/cs/drjava/model/DJError.java modified: src/edu/rice/cs/drjava/model/DefaultGlobalModel.java modified: src/edu/rice/cs/drjava/model/DocumentRegion.java modified: src/edu/rice/cs/drjava/model/FileRegion.java modified: src/edu/rice/cs/drjava/model/GlobalModelIOTest.java modified: src/edu/rice/cs/drjava/model/GlobalModelJUnitTest.java modified: src/edu/rice/cs/drjava/model/GlobalModelTestCase.java modified: src/edu/rice/cs/drjava/model/IDocumentRegion.java modified: src/edu/rice/cs/drjava/model/JDKDescriptor.java modified: src/edu/rice/cs/drjava/model/JDKToolsLibrary.java modified: src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java modified: src/edu/rice/cs/drjava/model/RegionManager.java modified: src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java modified: src/edu/rice/cs/drjava/model/debug/jpda/JPDABreakpoint.java modified: src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.java modified: src/edu/rice/cs/drjava/model/javadoc/NoJavadocAvailable.java modified: src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java modified: src/edu/rice/cs/drjava/model/junit/JUnitTestRunner.java modified: src/edu/rice/cs/drjava/model/repl/DefaultInteractionsModel.java modified: src/edu/rice/cs/drjava/model/repl/RMIInteractionsModel.java modified: src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java modified: src/edu/rice/cs/drjava/ui/ClipboardHistoryFrame.java modified: src/edu/rice/cs/drjava/ui/MainFrame.java modified: src/edu/rice/cs/drjava/ui/MainFrameTest.java modified: src/edu/rice/cs/drjava/ui/config/ConfigDescriptions.java modified: src/edu/rice/cs/drjava/ui/config/ConfigFrame.java modified: src/edu/rice/cs/drjava/ui/predictive/PredictiveInputModelTest.java modified: src/edu/rice/cs/util/UnexpectedException.java modified: ../platform/build.xml modified: ../platform/classes/base-eclipse/edu/rice/cs/drjava/model/compiler/EclipseCompiler$1.class deleted: ../platform/classes/base-eclipse/edu/rice/cs/drjava/model/compiler/EclipseCompiler$2.class deleted: ../platform/classes/base-eclipse/edu/rice/cs/drjava/model/compiler/EclipseCompiler$CompilerErrorListener.class modified: ../platform/classes/base-eclipse/edu/rice/cs/drjava/model/compiler/EclipseCompiler.class modified: ../platform/classes/base-eclipse/edu/rice/cs/drjava/model/compiler/descriptors/EclipseDescriptor.class modified: ../platform/classes/base-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler$1.class modified: ../platform/classes/base-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler.class modified: ../platform/src-eclipse/edu/rice/cs/drjava/model/compiler/EclipseCompiler.java modified: ../platform/src-eclipse/edu/rice/cs/drjava/model/compiler/descriptors/EclipseDescriptor.java modified: ../platform/src-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler.java modified: ../plt/src/edu/rice/cs/plt/debug/DebugUtil.java modified: ../plt/src/edu/rice/cs/plt/reflect/JavaVersion.java
1 parent 99a07c4 commit 5a4dc27

File tree

56 files changed

+615
-805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+615
-805
lines changed

‎drjava/build.xml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<property name="java7-home" value="${env.JAVA7_HOME}" />
4444
<property name="java6-home" value="${env.JAVA6_HOME}" />
4545
<property name="java5-home" value="${env.JAVA5_HOME}" />
46+
<echo message = "java.home = ${java.home}" />
4647
<property name="launch4j-home" value="${env.LAUNCH4J_HOME}" />
4748
<property name="clover-jar" value="${env.CLOVER_JAR}" />
4849
<property name="findbugs-home" value="${env.FINDBUGS_HOME}" />
@@ -69,7 +70,9 @@
6970
<!-- <extendclasspath path="lib/buildlib/junit.jar" /> -->
7071

7172
<fileset id="libs" dir="lib" includes="*.jar" /> <!-- Only include jars that are at the top level (not in buildlib) -->
72-
73+
<fileset id="jrelibs" dir="${java.home}/lib" includes="*.jar" />
74+
<echo message="jrelibs = ${jrelibs}" />
75+
<fileset id="extlibs" dir="${java.home}/lib/ext" includes="*.jar" />
7376
<!-- Use ConcJUnit if use-concjunit is not defined and we are not running Java 7. -->
7477
<!-- ConcJUnit is currently incompatible with Java 7. -->
7578
<if>
@@ -213,7 +216,7 @@
213216
Compilation Targets
214217
******************* -->
215218

216-
<!-- The following target assumes that javac resolves a Java 7 compiler -->
219+
<!-- The following target assumes that javac resolves a Java 8 compiler -->
217220
<target name="compile" depends="generate-source, do-compile, copy-resources, unjar-libs"
218221
description="Compile all source files (after generating the source)">
219222
</target>
@@ -231,17 +234,19 @@
231234
</move>
232235

233236
<javac srcdir="src" destdir="classes/base" source="1.6" target="1.6"
234-
bootclasspath="${java7-runtime}" sourcepath="" includeAntRuntime="no"
235-
executable="javac" fork="yes" memoryMaximumSize="1024M"
236-
debug="on" optimize="off" deprecation="on" >
237+
bootclasspath="${java8-runtime}" sourcepath="" includeAntRuntime="no"
238+
executable="${java8-home}/bin/javac" fork="yes" memoryMaximumSize="1024M"
239+
debug="on" optimize="off" deprecation="on" >
237240
<classpath>
238241
<!-- TODO: Remove this dependency on tools.jar by refactoring and moving all the dependent
239242
debugger code into the "platform" module -->
240-
<pathelement location="${java7-tools}" />
243+
<pathelement location="${java8-tools}" />
241244
<fileset refid="libs" />
245+
<fileset refid="jrelibs" />
246+
<fileset refid="extlibs" />
242247
<pathelement location="lib/buildlib/junit.jar" />
243248
<pathelement location="lib/buildlib/netbeans-memory-leak-utils.jar" />
244-
<pathelement location="classes/base" />
249+
<!-- <pathelement location="classes/base" /> THIS directory is typically empty at the start of this step -->
245250
</classpath>
246251
<compilerarg value="-Xlint" />
247252
<!-- Ignore serial warnings, because they occur for every Throwable definition (among others) -->

‎drjava/lib/ecj-4.9.jar‎

-1.54 MB
Binary file not shown.

‎drjava/lib/forms-1.2.1.jar‎

-103 KB
Binary file not shown.

‎drjava/lib/jgoodies-common-1.8.1.jar‎

36.9 KB
Binary file not shown.

‎drjava/lib/jgoodies-common.jar‎

-30.7 KB
Binary file not shown.

‎drjava/lib/jgoodies-forms-1.9.0.jar‎

132 KB
Binary file not shown.

‎drjava/lib/jgoodies-looks-2.7.0.jar‎

391 KB
Binary file not shown.

‎drjava/lib/jgoodies-looks.jar‎

-383 KB
Binary file not shown.

‎drjava/lib/platform.jar‎

-2.73 KB
Binary file not shown.

‎drjava/lib/readme.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@ buildlib/*.jar: Binaries used in the build process, but that should not be part
55

66
VERSIONS:
77

8-
asm-3.1.jar: ASM 3.1 (http://asm.objectweb.org)
8+
asm-all-5.0.1.jar: ASM 5.0 (http://asm.objectweb.org)
99
docs.jar: docs-20060901-2010
1010
dynamicjava-base.jar: dynamicjava-20090813-r4987
11-
forms-1.2.1.jar: JGoodies Forms
11+
jgoodies-common-1.8.1.jar JGoodies Forms and Looks for Java 6 (later versions not yet available for distribution)
12+
jgoodies-forms-1.9.0.jar
13+
jgoodies-looks-2.7.0.jar
1214
javalanglevels-base.jar: javalanglevels-20090223-r4766
13-
junit.jar: JUnit 4.4
14-
looks-2.2.2.jar: JGoodies Looks
15+
junit.jar: JUnit 3.8.2 or Concutest based on JUnit 3.8.2
1516
platform.jar: platform-20090812-r4985
1617
plt.jar: plt-20090812-r4961
18+
tools.jar: from openjdk-8 as built by azul systems
1719

1820
buildlib/ant-contrib.jar: ANT Contrib 1.0b3
1921
buildlib/cenquatasks.jar: Distributed with Clover 1.3.9
2022
buildlib/findbugs-ant.jar: FindBugs 1.3.1
21-
buildlib/junit.jar: JUnit 3.8.1
23+
buildlib/junit.jar: JUnit 3.8.2
2224
buildlib/plt-ant.jar: plt-ant-20070212-2001

0 commit comments

Comments
 (0)