etherpad-git/variable-scala-exe.patch

   1 diff --git a/infrastructure/bin/comp.sh b/infrastructure/bin/comp.sh
   2 index 5f65c2f..63378d4 100755
   3 --- a/infrastructure/bin/comp.sh
   4 +++ b/infrastructure/bin/comp.sh
   5 @@ -183,7 +183,7 @@ echo "copying files..."
   6  cp net.appjet.ajstdlib/streaming-client.js build/net/appjet/ajstdlib/
   7  if [ $OBFUSC ] ; then
   8      echo obfuscating...
   9 -    scala -classpath $CP:. net.appjet.bodylock.compressor \
  10 +    $SCALA -classpath $CP:. net.appjet.bodylock.compressor \
  11         build/net/appjet/ajstdlib/streaming-client.js
  12  fi
  13
  14 @@ -191,7 +191,7 @@ cp net.appjet.ajstdlib/streaming-iframe.html build/net/appjet/ajstdlib/
  15  mkdir -p build/net/appjet/ajstdlib/modules
  16
  17  echo "building javascript classfiles..."
  18 -scala -classpath $CP net.appjet.bodylock.Compiler \
  19 +$SCALA -classpath $CP net.appjet.bodylock.Compiler \
  20      -destination=build/net/appjet/ajstdlib/ \
  21      -cutPrefix=framework-src \
  22      `find framework-src -name '*.js'`
  23 diff --git a/infrastructure/ace/bin/make b/infrastructure/ace/bin/make
  24 index 98a48f4..c667fb4 100755
  25 --- a/infrastructure/ace/bin/make
  26 +++ b/infrastructure/ace/bin/make
  27 @@ -1,7 +1,7 @@
  28  #!/bin/sh
  29  mkdir -p ../../etherpad/src/etherpad/collab/ace
  30  mkdir -p ../../etherpad/src/static/js
  31 -exec scala -classpath lib/yuicompressor-2.4-appjet.jar:lib/rhino-js-1.7r1.jar $0 $@
  32 +exec $SCALA -classpath lib/yuicompressor-2.4-appjet.jar:lib/rhino-js-1.7r1.jar $0 $@
  33  !#
  34
  35  import java.io._;
  36 diff --git a/infrastructure/ace/bin/serve b/infrastructure/ace/bin/serve
  37 index e02e042..59d4fc1 100755
  38 --- a/infrastructure/ace/bin/serve
  39 +++ b/infrastructure/ace/bin/serve
  40 @@ -1,5 +1,5 @@
  41  #!/bin/bash
  42 -scala -nocompdaemon -Dlog4j.mortbay.loglevel=WARN -classpath lib/jetty-6.1.7.jar:lib/jetty-util-6.1.7.jar:lib/servlet-api-2.5-6.1.3.jar $0 $@ &
  43 +$SCALA -nocompdaemon -Dlog4j.mortbay.loglevel=WARN -classpath lib/jetty-6.1.7.jar:lib/jetty-util-6.1.7.jar:lib/servlet-api-2.5-6.1.3.jar $0 $@ &
  44  exit
  45  !#
  46