Skip to content

Commit 79e1969

Browse files
ponderosaTXponderosaTX
committed
This revision updates the jar files for java 8 tools (javac, javadoc), asm, and jacoco so that they are consistent and compatible with Java Open JDK 8. It also patches some bugs in buid.xml.
The following files were modified, added, or deleted: modified: build.xml new file: lib/asm-commons-6.0.jar new file: lib/asm-tree-6.0.jar deleted: lib/hamcrest-core.jar deleted: lib/jacocoagent.jar deleted: lib/jacocoant.jar modified: lib/junit.jar deleted: lib/org.jacoco.agent-0.7.10.201707180856.jar deleted: lib/org.jacoco.ant-0.7.10.201707180856.jar renamed: lib/org.jacoco.core-0.7.10.201707180856.jar -> lib/org.jacoco.core-0.8.0.201801022044.jar renamed: lib/org.jacoco.report-0.7.10.201707180856.jar -> lib/org.jacoco.report-0.8.0.201801022044.jar modified: src/edu/rice/cs/drjava/ui/MainFrame.java modified: src/edu/rice/cs/util/newjvm/AbstractSlaveJVM.java
1 parent 7e72720 commit 79e1969

13 files changed

Lines changed: 12 additions & 8 deletions

‎drjava/build.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
<!-- For code coverage report -->
6060
<taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
61-
<classpath path="lib/jacocoant.jar"/>
61+
<classpath path="lib/buildlib/jacocoant.jar"/>
6262
</taskdef>
6363
<property name="coverage-report-dir" value="coverage_report"/>
6464
<property name="coverage-exec" value="jacoco.exec"/>
@@ -755,7 +755,7 @@
755755
</target>
756756

757757
<target name="release"
758-
depends="build, jar-app, mac-app, windows-app, javadoc-zip"
758+
depends="build, jar-app, javadoc-zip"
759759
description="Make a development release">
760760
<delete dir="${version-tag}" />
761761
</target>
@@ -765,6 +765,7 @@
765765
<copy file="${ant.project.name}.jar" tofile="${version-tag}.jar" />
766766
</target>
767767

768+
<!--
768769
<target name="mac-app" depends="jar, assert-jar-exists, resolve-version-tag">
769770
<echo message="Creating ${version-tag}-osx.zip" />
770771
<taskdef name="bundleapp"
@@ -789,7 +790,9 @@
789790
includes="${readable-project-name}.app/Contents/MacOS/JavaAppLauncher" />
790791
</zip>
791792
</target>
793+
-->
792794

795+
<!--
793796
<target name="windows-app" depends="assert-launch4j-exists, jar, assert-jar-exists, resolve-version-tag">
794797
<echo message="Creating ${version-tag}.exe" />
795798
<taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask">
@@ -815,8 +818,9 @@
815818
<copy file="${ant.project.name}.jar" todir="${windows-app-dir}" />
816819
<launch4j configfile="${windows-app-dir}/launch4j-config.xml" />
817820
</target>
821+
-->
818822

819-
<target name="javadoc-zip" depends="javadoc, resolve-version-tag" unless="skip-javadoc">
823+
<target name="javadoc-zip" depends="javadoc, resolve-version-tag" unless="skip-javadoc">
820824
<echo message="Creating ${version-tag}-javadoc.zip" />
821825
<zip destfile="${version-tag}-javadoc.zip">
822826
<zipfileset dir="docs/javadoc" prefix="${version-tag}/javadoc" />

‎drjava/lib/asm-commons-6.0.jar‎

75.6 KB
Binary file not shown.

‎drjava/lib/asm-tree-6.0.jar‎

47 KB
Binary file not shown.

‎drjava/lib/hamcrest-core.jar‎

-44 KB
Binary file not shown.

‎drjava/lib/jacocoagent.jar‎

-253 KB
Binary file not shown.

‎drjava/lib/jacocoant.jar‎

-655 KB
Binary file not shown.

‎drjava/lib/junit.jar‎

65.3 KB
Binary file not shown.

‎drjava/lib/org.jacoco.agent-0.7.10.201707180856.jar‎

-231 KB
Binary file not shown.

‎drjava/lib/org.jacoco.ant-0.7.10.201707180856.jar‎

-31.1 KB
Binary file not shown.

drjava/lib/org.jacoco.core-0.7.10.201707180856.jar renamed to drjava/lib/org.jacoco.core-0.8.0.201801022044.jar

143 KB
Binary file not shown.

0 commit comments

Comments
 (0)