DrJava Legacy SVN Repository

This commit is hopefully close to a working framework for compiling scala programs. The scala compiler will not load because the
loader cannot find the file scala.tools.nsc.reporters.ConsoleReporter.java, which is in a jar file on the class path. I don't understand what is going wrong. The following files were modified or added (in some cases only trivial formatting changes were made):

M platform/classes/base-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler$1.class
M platform/classes/base-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler.class
M platform/src-scala/edu/rice/cs/drjava/model/compiler/descriptors/ScalaDescriptor.java
AM platform/src-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler.java
M platform/src-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler.java
M drjava/lib/platform.jar
M drjava/src/edu/rice/cs/drjava/model/JDKToolsLibrary.java
M drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
M drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
M drjava/src/edu/rice/cs/drjava/model/DefaultGlobalModel.java
M drjava/src/edu/rice/cs/util/swing/Utilities.java

fix build-dist to copy jar files to the appropriate place

Update jar list

As of this commit, the code looks close to working (at least loading the Scala compiler for potential invocation) but Windows 7 is
such an impediment to development that I am switching to Linux as of this commit.

The following files were modified:

M platform/src-scala/edu/rice/cs/drjava/model/compiler/descriptors/ScalaDescriptor.java
M drjava/lib/platform.jar
M drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
M drjava/src/edu/rice/cs/drjava/model/JDKToolsLibrary.java
A misc/drjava-hj/input/lib
AM misc/drjava-hj/input/lib/jl5.jar
AM misc/drjava-hj/input/lib/jasminclasses-2.3.0.jar
AM misc/drjava-hj/input/lib/hj-ant-task.jar
AM misc/drjava-hj/input/lib/hj.jar
AM misc/drjava-hj/input/lib/hjc-frontend.jar
AM misc/drjava-hj/input/lib/lpg.jar
AM misc/drjava-hj/input/lib/sootclasses-2.5.0.jar
AM misc/drjava-hj/input/lib/jsr166y.jar
AM misc/drjava-hj/input/lib/java_cup.jar
AM misc/drjava-hj/input/lib/hjc-backend.jar
AM misc/drjava-hj/input/lib/polyglot.jar
D misc/drjava-hj/input/jasminclasses-2.3.0.jar
D misc/drjava-hj/input/sootclasses-2.3.0.jar
D misc/drjava-hj/input/hj-ant-task.jar
D misc/drjava-hj/input/hj.jar
D misc/drjava-hj/input/lpg.jar
D misc/drjava-hj/input/hjc.jar
D misc/drjava-hj/input/java_cup.jar
D misc/drjava-hj/input/polyglot.jar
M misc/drscala/lib/scala-compiler.jar
M misc/drscala/lib/jline.jar
M misc/drscala/lib/scalap.jar
M misc/drscala/lib/scala-library.jar
M misc/drscala/lib/scala-swing.jar
M misc/drscala/lib/scala-dbc.jar

This commit contains the updated platform.jar including the Scala compiler adapter (which does not yet work) and a minor change to
DefaultGlobalModel.java concerning what predicates found compilers must satisfy.

The following files were modifiedP

M drjava/lib/platform.jar
M drjava/src/edu/rice/cs/drjava/model/DefaultGlobalModel.java

This commit contains a draft of the Scala compiler adapter which is not yet working.

The following files were added, modified, or deleted:

M platform/build.xml
AM platform/src-scala/edu/rice/cs/drjava/model/compiler/ScalacCompiler.java
AM platform/src-scala/edu/rice/cs/drjava/model/compiler/ScalacCompilerTest.java
A platform/src-scala/edu/rice/cs/drjava/model/compiler/descriptors
AM platform/src-scala/edu/rice/cs/drjava/model/compiler/descriptors/ScalaDescriptor.java
AM platform/src-scala/edu/rice/cs/drjava/model/compiler/DrJavaReporter.java
D platform/src-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler.java

modify build to automatically pick up any jar from either HJ_HOME or the pre-packaged hj distributed along with drhj

fix for the default hj distrib selection: if HJ_HOME is not set, then use the default input jar files otherwise, use HJ_HOME... no the opposite !

This commit only revises the comments in the file HjCompiler.java.
All references to "Mint" have been changed to "HJ".

Only the following file was updated:

M src-hj/edu/rice/cs/drjava/model/compiler/HjCompiler.java

This commit is an incremental step toward setting up the code for the
Scala compiler adapter (in platform) and the Scala tools library (in
misc)

The following files were added, deleted or modified:

A platform/src-scala/edu/rice/cs
A platform/src-scala/edu/rice/cs/drjava
A platform/src-scala/edu/rice/cs/drjava/model
A platform/src-scala/edu/rice/cs/drjava/model/compiler
AM platform/src-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler.java
D platform/src-scala/edu/rice/drjava
M drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
M drjava/src/edu/rice/cs/drjava/model/compiler/CompilerModel.java
A misc/drscala
A misc/drscala/lib
AM misc/drscala/lib/scala-library.jar
AM misc/drscala/lib/scala-swing.jar
AM misc/drscala/lib/scala-dbc.jar
AM misc/drscala/lib/scala-compiler.jar
AM misc/drscala/lib/jline.jar
AM misc/drscala/lib/scalap.jar
AM misc/drscala/build.xml

The directory platform/src-scala/edu/rice/drjava was created in error in an earlier
commit. The correct path name is platform/src-scala/edu/rice/cs/drjava.