From 2b00a2580c15575378ee65a6894d6803bc4d3061 Mon Sep 17 00:00:00 2001
From: Lex Spoon <lex@lexspoon.org>
Date: Wed, 18 Apr 2007 14:19:55 +0000
Subject: Added the JAVA_OPTS variable, so that java opti...

Added the JAVA_OPTS variable, so that java options can be specified
without changing JAVACMD.
---
 debian/command-scripts/fsc      | 2 +-
 debian/command-scripts/scala    | 2 +-
 debian/command-scripts/scalac   | 2 +-
 debian/command-scripts/scaladoc | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'debian')

diff --git a/debian/command-scripts/fsc b/debian/command-scripts/fsc
index 16e85c62be..3d619854fb 100644
--- a/debian/command-scripts/fsc
+++ b/debian/command-scripts/fsc
@@ -2,6 +2,6 @@
 JAVA_DIR=/usr/share/java
 SCALAC_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar
 
-exec ${JAVACMD:=java} -Xmx256M -Xms16M \
+exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \
   -classpath $SCALAC_CLASSPATH -Dscala.boot.class.path=$SCALAC_CLASSPATH \
  scala.tools.nsc.CompileClient "$@"
diff --git a/debian/command-scripts/scala b/debian/command-scripts/scala
index a020eb6562..72dfa49dbd 100755
--- a/debian/command-scripts/scala
+++ b/debian/command-scripts/scala
@@ -3,7 +3,7 @@
 JAVA_DIR=/usr/share/java
 LIB_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar
 
-exec ${JAVACMD:=java} -Xmx256M -Xms16M \
+exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \
   -Xbootclasspath/a:$LIB_CLASSPATH \
   -classpath $LIB_CLASSPATH \
   scala.tools.nsc.MainGenericRunner \
diff --git a/debian/command-scripts/scalac b/debian/command-scripts/scalac
index 97c3069bb6..89c424a6e6 100755
--- a/debian/command-scripts/scalac
+++ b/debian/command-scripts/scalac
@@ -2,7 +2,7 @@
 JAVA_DIR=/usr/share/java
 SCALAC_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar
 
-exec ${JAVACMD:=java} -Xmx256M -Xms16M \
+exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \
   -Xbootclasspath/a:$SCALAC_CLASSPATH \
   -classpath $SCALAC_CLASSPATH -Dscala.boot.class.path=$SCALAC_CLASSPATH \
   scala.tools.nsc.Main "$@"
diff --git a/debian/command-scripts/scaladoc b/debian/command-scripts/scaladoc
index bd74c529ca..318829da92 100755
--- a/debian/command-scripts/scaladoc
+++ b/debian/command-scripts/scaladoc
@@ -2,4 +2,4 @@
 JAVA_DIR=/usr/share/java
 SCALAC_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar
 
-exec ${JAVACMD:=java} -Xmx256M -Xms16M -classpath $SCALAC_CLASSPATH scala.tools.nsc.Main -doc "$@"
+exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M}  -classpath $SCALAC_CLASSPATH scala.tools.nsc.Main -doc "$@"
-- 
cgit v1.2.3