Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/bin/exports.sh b/bin/exports.sh
- index d0ced6f..f23c43d 100644
- --- a/bin/exports.sh
- +++ b/bin/exports.sh
- @@ -37,13 +37,13 @@ if [ `uname` == "FreeBSD" ]; then
- export PATH="$JAVA_HOME/bin:$SCALA_HOME/bin:/usr/local/mysql/bin:$PATH"
- export MYSQL_CONNECTOR_JAR="/usr/local/share/java/classes/mysql-connector-java.jar"
- else
- - [ -e "/usr/lib/jvm/java-6-openjdk" ] && export JAVA_HOME="/usr/lib/jvm/java-6-openjdk"
- + [ -e "/usr/lib/jvm/java-1.6.0-openjdk" ] && export JAVA_HOME="/usr/lib/jvm/java-1.6.0-openjdk"
- [ -e "/usr/lib/jvm/java-6-sun" ] && export JAVA_HOME="/usr/lib/jvm/java-6-sun"
- export SCALA_HOME="/usr/share/java"
- - export SCALA_LIBRARY_JAR="/usr/share/java/scala-library.jar"
- + export SCALA_LIBRARY_JAR="/usr/share/java/scala27/scala-library.jar"
- export MYSQL_CONNECTOR_JAR="/usr/share/java/mysql-connector-java.jar"
- export JAVA="$JAVA_HOME/bin/java"
- - export SCALA="/usr/bin/scala"
- + export SCALA="/usr/bin/scala27"
- export PATH="$JAVA_HOME/bin:$PATH"
- fi
- diff --git a/etherpad/bin/run-local.sh b/etherpad/bin/run-local.sh
- index be33fa5..8228d52 100755
- --- a/etherpad/bin/run-local.sh
- +++ b/etherpad/bin/run-local.sh
- @@ -16,6 +16,8 @@
- mkdir -p data/appjet
- +. /home/computercolin/src/pad/bin/exports.sh
- +
- # JVM heap memory limit (actually reserved during startup)
- MXRAM="1G"
- # maximum thread count for etherpad (should be roughly memory in MB / 4)
- diff --git a/infrastructure/ace/bin/make b/infrastructure/ace/bin/make
- index 98a48f4..0066d54 100755
- --- a/infrastructure/ace/bin/make
- +++ b/infrastructure/ace/bin/make
- @@ -1,7 +1,7 @@
- #!/bin/sh
- mkdir -p ../../etherpad/src/etherpad/collab/ace
- mkdir -p ../../etherpad/src/static/js
- -exec scala -classpath lib/yuicompressor-2.4-appjet.jar:lib/rhino-js-1.7r1.jar $0 $@
- +exec ${SCALA} -classpath lib/yuicompressor-2.4-appjet.jar:lib/rhino-js-1.7r1.jar $0 $@
- !#
- import java.io._;
- diff --git a/infrastructure/bin/comp.sh b/infrastructure/bin/comp.sh
- index 5f65c2f..6f3ca69 100755
- --- a/infrastructure/bin/comp.sh
- +++ b/infrastructure/bin/comp.sh
- @@ -27,7 +27,7 @@ if [ "$1" == "clearcache" ]; then
- fi
- if [ -z "$CC" ]; then
- - CC=fsc
- + CC=fsc27
- fi
- echo compiling with \'$CC\'...
- @@ -183,7 +183,7 @@ echo "copying files..."
- cp net.appjet.ajstdlib/streaming-client.js build/net/appjet/ajstdlib/
- if [ $OBFUSC ] ; then
- echo obfuscating...
- - scala -classpath $CP:. net.appjet.bodylock.compressor \
- + ${SCALA} -classpath $CP:. net.appjet.bodylock.compressor \
- build/net/appjet/ajstdlib/streaming-client.js
- fi
- @@ -191,7 +191,7 @@ cp net.appjet.ajstdlib/streaming-iframe.html build/net/appjet/ajstdlib/
- mkdir -p build/net/appjet/ajstdlib/modules
- echo "building javascript classfiles..."
- -scala -classpath $CP net.appjet.bodylock.Compiler \
- +${SCALA} -classpath $CP net.appjet.bodylock.Compiler \
- -destination=build/net/appjet/ajstdlib/ \
- -cutPrefix=framework-src \
- `find framework-src -name '*.js'`
Add Comment
Please, Sign In to add comment