Skip to content

Commit f09079b

Browse files
author
mgricken
committed
Bugfix: ConcJUnit was included in boot classpath even when
it was disabled. Bugfix: finding short file name on Windows Mint support: added drjava.jar itself as possible Mint JDK location M src/edu/rice/cs/drjava/DrJava.java M src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java M src/edu/rice/cs/drjava/model/repl/newjvm/MainJVM.java M src/edu/rice/cs/util/FileOps.java M build.xml git-svn-id: file:///tmp/test-svn/trunk@5104 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent cd3fdc4 commit f09079b

File tree

5 files changed

+621
-595
lines changed

5 files changed

+621
-595
lines changed

‎drjava/build.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,8 @@
517517
<attribute name="Main-Class" value="${main-class}" />
518518
<attribute name="Built-By" value="${user.name}" />
519519
<attribute name="Build-Version" value="${version-tag}" />
520+
<!-- put the right version stamp into the jar file -->
521+
<attribute name="Created-By" value="${java.version}"/>
520522
</manifest>
521523
<fileset dir="classes/lib" />
522524
<fileset dir="classes/base" />
@@ -531,6 +533,8 @@
531533
<attribute name="Main-Class" value="${main-class}" />
532534
<attribute name="Built-By" value="${user.name}" />
533535
<attribute name="Build-Version" value="${version-tag}" />
536+
<!-- put the right version stamp into the jar file -->
537+
<attribute name="Created-By" value="${java.version}"/>
534538
</manifest>
535539
<fileset dir="classes/base" />
536540
</jar>

‎drjava/src/edu/rice/cs/drjava/DrJava.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public static void configureAndLoadDrJavaRoot(String[] args) {
205205
// extend classpath if JUnit/ConcJUnit location specified
206206
_log.log("JVMBuilder: classPath = "+jvmb.classPath());
207207
ArrayList<File> extendedClassPath = new ArrayList<File>();
208-
if (DrJava.getConfig().getSetting(OptionConstants.RT_CONCJUNIT_LOCATION_ENABLED) &&
208+
if (DrJava.getConfig().getSetting(OptionConstants.JUNIT_LOCATION_ENABLED) &&
209209
junitLocationConfigured) {
210210
extendedClassPath.add(junitLocation);
211211
}

0 commit comments

Comments
 (0)