diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2008-08-04 16:47:24 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2008-08-04 16:47:24 +0000 |
| commit | 928575966029f6f76911ccd239fc00f76fb690bc (patch) | |
| tree | cbd8042b2ab3f7b8a39d43620aa5feae415b8b43 /OMakefile | |
| parent | 89cdad5e4f0619bed2ba5532e0349b5d88c0ad33 (diff) | |
| download | scala-928575966029f6f76911ccd239fc00f76fb690bc.tar.gz scala-928575966029f6f76911ccd239fc00f76fb690bc.tar.bz2 scala-928575966029f6f76911ccd239fc00f76fb690bc.zip | |
Changed default java to use JAVA_HOME and added...
Changed default java to use JAVA_HOME and added quick classpath to the
partest target
Diffstat (limited to 'OMakefile')
| -rw-r--r-- | OMakefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3,7 +3,7 @@ # If you aren't running on a LAMP system, you need to make sure you # have JAVA_HOME and JAVACMD (and optionally JAVAC) set correctly. JAVA_HOME = $(getenv JAVA_HOME, /home/linuxsoft/apps/java-1.6/) -JAVACMD = $(getenv JAVACMD, /home/linuxsoft/apps/java-1.6/bin/java) +JAVACMD = $(getenv JAVACMD, $(JAVA_HOME)$(DIRSEP)bin$(DIRSEP)/java) JAVAC = $(getenv JAVAC, $(JAVA_HOME)$(DIRSEP)bin$(DIRSEP)javac) # Default options for the JVM @@ -117,7 +117,7 @@ buildscala(classpath, outdir) = partest(classpath) = # println(testing) $(JAVACMD) -cp $(topath $(classpath)) $(JAVA_OPTS) \ - $(PARTEST_CLASS) --show-diff $(PARTEST_ARGS) + $(PARTEST_CLASS) --classpath $(QUICK_CLASS_DIR) --show-diff $(PARTEST_ARGS) ###################################################################### |