[scala-2.10] 85/166: Take JAVA_HOME into account if it is set.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Nov 15 12:43:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository scala-2.10.
commit e58ed8391046bd5757b7837d0b0d28efd2f60cbd
Author: Frank S. Thomas <fst at debian.org>
Date: Fri Sep 2 22:33:29 2011 +0200
Take JAVA_HOME into account if it is set.
---
debian/changelog | 2 ++
debian/command-scripts/fsc | 10 ++++++++--
debian/command-scripts/scala | 7 +++++--
debian/command-scripts/scalac | 8 +++++++-
debian/command-scripts/scaladoc | 8 +++++++-
5 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 74fd7b6..aca8e59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ scala (2.9.1.dfsg-1) UNRELEASED; urgency=low
* Let scala suggest scala-doc (Closes: #632820).
* Bump standards version to 3.9.2.
* Added myself to Uploaders.
+ * debian/command-scripts/*: Take the environement variable JAVA_HOME
+ into account if it is set.
[ Mehdi Dogguy ]
* New upstream release (Closes: #639960).
diff --git a/debian/command-scripts/fsc b/debian/command-scripts/fsc
index 3d61985..cb488b2 100644
--- a/debian/command-scripts/fsc
+++ b/debian/command-scripts/fsc
@@ -1,7 +1,13 @@
#!/bin/sh
+
JAVA_DIR=/usr/share/java
SCALAC_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar
+if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
+ JAVACMD="$JAVA_HOME/bin/java"
+fi
+
exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \
- -classpath $SCALAC_CLASSPATH -Dscala.boot.class.path=$SCALAC_CLASSPATH \
- scala.tools.nsc.CompileClient "$@"
+ -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 cfa4407..decbc81 100644
--- a/debian/command-scripts/scala
+++ b/debian/command-scripts/scala
@@ -3,8 +3,11 @@
JAVA_DIR=/usr/share/java
LIB_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar:$JAVA_DIR/scala/jline.jar
+if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
+ JAVACMD="$JAVA_HOME/bin/java"
+fi
+
exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \
-Xbootclasspath/a:$LIB_CLASSPATH \
-classpath .:$CLASSPATH:$LIB_CLASSPATH \
- scala.tools.nsc.MainGenericRunner \
- "$@"
+ scala.tools.nsc.MainGenericRunner "$@"
diff --git a/debian/command-scripts/scalac b/debian/command-scripts/scalac
index 7cc07ce..14bc94f 100644
--- a/debian/command-scripts/scalac
+++ b/debian/command-scripts/scalac
@@ -1,8 +1,14 @@
#!/bin/sh
+
JAVA_DIR=/usr/share/java
SCALAC_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar
+if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
+ JAVACMD="$JAVA_HOME/bin/java"
+fi
+
exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \
-Xbootclasspath/a:$SCALAC_CLASSPATH \
- -classpath .:$CLASSPATH:$SCALAC_CLASSPATH -Dscala.boot.class.path=$SCALAC_CLASSPATH \
+ -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 084747d..eb5f8d6 100644
--- a/debian/command-scripts/scaladoc
+++ b/debian/command-scripts/scaladoc
@@ -1,6 +1,12 @@
#!/bin/sh
+
JAVA_DIR=/usr/share/java
SCALAC_CLASSPATH=$JAVA_DIR/scala-library.jar:$JAVA_DIR/scala-compiler.jar
+if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
+ JAVACMD="$JAVA_HOME/bin/java"
+fi
+
exec ${JAVACMD:=java} ${JAVA_OPTS:=-Xmx256M -Xms16M} \
- -classpath .:$CLASSPATH:$SCALAC_CLASSPATH scala.tools.nsc.ScalaDoc "$@"
+ -classpath .:$CLASSPATH:$SCALAC_CLASSPATH \
+ scala.tools.nsc.ScalaDoc "$@"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git
More information about the pkg-java-commits
mailing list