Skip to content

Commit f749f6b

Browse files
dapanghudapanghu
committed
Enable compile src code in drjava and platform in java10
1 parent 7e49f3e commit f749f6b

File tree

15 files changed

+200
-42
lines changed

15 files changed

+200
-42
lines changed

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@
99
*.new
1010
*.mine
1111
*.alt
12+
*.DS_Store
13+
*.backup
1214
codecoverage
1315
drjava/classes
1416
drjava/drjava.jar
1517
drjava/build.xml.*
1618
drjava/coverage_report
17-
scratch
19+
platform/classes/lib/
20+
platform/classes/test-mac/
21+
scratch

‎drjava/build.xml‎

Lines changed: 57 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<echo message="libs = ${toString:libs}" level="verbose" />
7272
<echo message="jrelibs = ${toString:jrelibs}" level="verbose"/>
7373
<fileset id="extlibs" dir="${java.home}/lib/ext" includes="*.jar" />
74-
<echo message="extlibs = ${toString:extlibs}" level="verbose"/>
74+
<!--echo message="extlibs = ${toString:extlibs}" level="verbose"/-->
7575
<!-- ************
7676
Help Targets
7777
************ -->
@@ -187,10 +187,64 @@
187187
******************* -->
188188

189189
<!-- The following target assumes that javac resolves to a Java 8 compiler -->
190-
<target name="compile" depends="generate-source, do-compile, copy-resources, unjar-libs"
190+
<target name="compile" depends="generate-source, do-compile-7-to-10, copy-resources, unjar-libs"
191191
description="Compile all source files (after generating the source)">
192192
</target>
193193

194+
195+
<!--target name="do-compile-7-to-10" depends="resolve-java8-runtime, resolve-java8-tools"-->
196+
<target name="do-compile-7-to-10">
197+
198+
<echo message="Compiling src directory to classes/base and classes/test with command 'javac'" />
199+
200+
<mkdir dir="classes/base" />
201+
<mkdir dir="classes/test" />
202+
203+
<!-- Move any test classes back to base to prevent recompilation -->
204+
<move todir="classes/base">
205+
<fileset dir="classes/test" includes="**/*" />
206+
</move>
207+
<echo message="jrelibs=${toString:jrelibs}" />
208+
<echo message="libs=${toString:libs}" />
209+
<javac srcdir="src" destdir="classes/base" release="10"
210+
sourcepath="" includeAntRuntime="no"
211+
fork="yes" memoryMaximumSize="1024M"
212+
debug="on" optimize="off" deprecation="on" >
213+
<classpath>
214+
<!-- TODO: Remove this dependency on tools.jar by refactoring and moving all the dependent
215+
debugger code into the "platform" module -->
216+
<pathelement location="lib/buildlib/junit.jar" />
217+
<fileset refid="libs" />
218+
<fileset refid="jrelibs" />
219+
<pathelement location="lib/buildlib/netbeans-memory-leak-utils.jar" />
220+
<!-- <pathelement location="classes/base" /> THIS directory is typically empty at the start of this step -->
221+
</classpath>
222+
<compilerarg value="-Xlint" />
223+
<!-- Ignore serial warnings, because they occur for every Throwable definition (among others) -->
224+
<compilerarg value="-Xlint:-serial" />
225+
<!-- Use the next line to compile against other sources, ignoring any unneeded classes.
226+
This can be useful in creating a pruned version of a jar file for the lib directory.
227+
(You must also clear the sourcepath="" option.)
228+
<include name="${src-working-dir}/**/*.java" /> -->
229+
</javac>
230+
231+
<mkdir dir="classes/test" /> <!-- May be deleted by the previous move -->
232+
<move todir="classes/test">
233+
<fileset dir="classes/base">
234+
<include name="**/*Test.class" />
235+
<include name="**/*Test$*.class" />
236+
<include name="**/*TestCase.class" />
237+
<include name="**/*TestCase$*.class" />
238+
<!-- Additional test classes should be listed here -->
239+
</fileset>
240+
</move>
241+
242+
</target>
243+
244+
245+
246+
247+
194248
<target name="do-compile" depends="resolve-java8-runtime, resolve-java8-tools">
195249

196250
<echo message="Compiling src directory to classes/base and classes/test with command 'javac'" />
@@ -330,7 +384,7 @@
330384
Testing Targets
331385
*************** -->
332386

333-
<target name="test" depends="compile, resolve-current-tools" unless="skip-test"
387+
<target name="test" depends="compile" unless="skip-test"
334388
description="Run all tests (after compiling); use -Dtest-spec=... to filter">
335389
<antcall target="iterate-tests">
336390
<param name="test-jvm" value="java" />

‎drjava/lib/jacocoant.jar‎

-6.92 KB
Binary file not shown.

‎drjava/src/edu/rice/cs/drjava/ui/RegionsTreePanel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ public void addRegion(final R r) {
794794
// }
795795
// else {
796796
@SuppressWarnings("unchecked")
797-
Enumeration<DefaultMutableTreeNode> regionNodes = docNode.children();
797+
Enumeration<TreeNode> regionNodes = docNode.children();
798798

799799
// Create a new region node in this document node list, where regions are sorted by start offset.
800800
int startOffset = r.getStartOffset();
@@ -809,7 +809,7 @@ public void addRegion(final R r) {
809809
// _cachedStartOffset = startOffset;
810810
break;
811811
}
812-
DefaultMutableTreeNode node = regionNodes.nextElement();
812+
DefaultMutableTreeNode node = (DefaultMutableTreeNode)regionNodes.nextElement();
813813

814814
@SuppressWarnings("unchecked")
815815
RegionTreeUserObj<R> userObject = (RegionTreeUserObj<R>) node.getUserObject();

‎platform/.bash_profile‎

Whitespace-only changes.

‎platform/build.xml‎

Lines changed: 63 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@
3131
<property name="error" value="stderr" />
3232
<property name="plt.error.log" value="${error}" />
3333
<property name="clean-can-fail" value="yes" />
34-
<property name="drjava-jar" value="${env.DRJAVA_JAR}" />
3534

3635
<!-- *** Environment properties that are not needed may be removed *** -->
3736
<property environment="env" />
37+
<echo message="DRJAVA_JAR = ${env.DRJAVA_JAR}"/>
38+
<property name="drjava-jar" value="${env.DRJAVA_JAR}" />
3839
<property name="java5-home" value="${env.JAVA5_HOME}" />
3940
<property name="java6-home" value="${env.JAVA6_HOME}" />
4041
<property name="java7-home" value="${env.JAVA7_HOME}" />
@@ -231,13 +232,13 @@
231232
</antcall>
232233
</target>
233234

234-
<target name="compile-mac" depends="resolve-java5-runtime"
235+
<target name="compile-mac" depends=""
235236
description="Compile the 'mac' sources">
236-
<antcall target="do-compile">
237+
<antcall target="do-compile-10">
237238
<param name="platform-tag" value="mac" />
238-
<param name="source-version" value="1.5" />
239-
<param name="runtime-jar" value="${java5-runtime}" />
240-
<param name="extra-classpath" value="${java5-runtime}/../ui.jar" />
239+
<!--param name="source-version" value="1.5" /-->
240+
<!--param name="runtime-jar" value="${java5-runtime}" /-->
241+
<!--param name="extra-classpath" value="${java5-runtime}/../ui.jar" /-->
241242
</antcall>
242243
</target>
243244

@@ -251,8 +252,8 @@
251252
</antcall>
252253
</target>
253254

254-
255-
<!-- Requires that the properties 'platform-tag', 'source-version', 'runtime-jar', and
255+
256+
<!-- Requires that the properties 'platform-tag', 'source-version', 'runtime-jar', and
256257
'extra-classpath' be set -->
257258
<target name="do-compile" depends="assert-drjava-jar-exists">
258259

@@ -272,6 +273,59 @@
272273
source="${source-version}" target="${source-version}"
273274
bootclasspath="${runtime-jar}" sourcepath="" includeAntRuntime="no"
274275
executable="javac" fork="yes" memoryMaximumSize="512M"
276+
verbose = 'true' debug="on" optimize="off" deprecation="on">
277+
<classpath>
278+
<pathelement path="${extra-classpath}" />
279+
<fileset refid="libs" />
280+
<pathelement location="lib/buildlib/junit.jar" />
281+
<pathelement location="classes/base-${platform-tag}" />
282+
<pathelement location="${drjava-jar}" />
283+
</classpath>
284+
<compilerarg value="-Xlint" />
285+
<!-- Ignore serial warnings, because they occur for every Throwable definition (among others) -->
286+
<compilerarg value="-Xlint:-serial" />
287+
<!-- Use the next line to compile against other sources, ignoring any unneeded classes.
288+
This can be useful in creating a pruned version of a jar file for the lib directory.
289+
(You must also clear the sourcepath="" option.)
290+
<include name="${src-working-dir}/**/*.java" /> -->
291+
</javac>
292+
293+
<move todir="classes/test-${platform-tag}">
294+
<fileset dir="classes/base-${platform-tag}">
295+
<include name="**/*Test.class" />
296+
<include name="**/*Test$*.class" />
297+
<include name="**/*TestCase.class" />
298+
<include name="**/*TestCase$*.class" />
299+
<!-- Additional test classes should be listed here -->
300+
</fileset>
301+
</move>
302+
303+
<antcall target="copy-resources" />
304+
<antcall target="unjar-libs" />
305+
306+
</target>
307+
308+
309+
<!-- Requires that the properties 'platform-tag', 'source-version', 'runtime-jar', and
310+
'extra-classpath' be set -->
311+
<target name="do-compile-10" depends="">
312+
313+
<echo message="Compiling src-${platform-tag} directory to classes/base-${platform-tag} and classes/test-${platform-tag}" />
314+
<echo message="with command 'javac'" />
315+
316+
<!-- Make the directories if they don't already exist -->
317+
<mkdir dir="classes/base-${platform-tag}" />
318+
<mkdir dir="classes/test-${platform-tag}" />
319+
<!-- To eliminate confusion, we force recompilation whenever this is invoked -->
320+
<delete>
321+
<fileset dir="classes/base-${platform-tag}" includes="**/*" />
322+
<fileset dir="classes/test-${platform-tag}" includes="**/*" />
323+
</delete>
324+
325+
<javac srcdir="src-${platform-tag}" destdir="classes/base-${platform-tag}"
326+
source="${source-version}" target="${source-version}" release="10"
327+
sourcepath="" includeAntRuntime="no"
328+
executable="javac" fork="yes" memoryMaximumSize="512M"
275329
debug="on" optimize="off" deprecation="on">
276330
<classpath>
277331
<pathelement path="${extra-classpath}" />
@@ -1067,7 +1121,7 @@
10671121

10681122
<target name="assert-drjava-jar-exists">
10691123
<available property="drjava-jar-exists" file="${drjava-jar}" />
1070-
<fail message="${drjava-jar} does not exist" unless="drjava-jar-exists" />
1124+
<fail message="${drjava-jar} does not exist, env is ${env} enviroment is ${environment}" unless="drjava-jar-exists" />
10711125
</target>
10721126

10731127
<target name="resolve-development-value">

‎platform/classes/base-mac/edu/rice/cs/drjava/model/compiler/descriptors/SoyLatteDescriptor.class‎

390 Bytes
Binary file not shown.

‎platform/classes/base-mac/edu/rice/cs/drjava/platform/MacPlatform$1.class‎

10 Bytes
Binary file not shown.

‎platform/classes/base-mac/edu/rice/cs/drjava/platform/MacPlatform$2$1.class‎

-1.12 KB
Binary file not shown.

‎platform/classes/base-mac/edu/rice/cs/drjava/platform/MacPlatform$2.class‎

-655 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)