From c6c9281b939ca20b351a9c178254f05e69ced28b Mon Sep 17 00:00:00 2001
From: Egil Moeller <egil.moller@freecode.no>
Date: Wed, 28 Apr 2010 22:14:31 +0200
Subject: git-buildpackage-converted debian packaging

---
 bin/build.sh | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100755 bin/build.sh

(limited to 'bin/build.sh')

diff --git a/bin/build.sh b/bin/build.sh
new file mode 100755
index 0000000..3e42c96
--- /dev/null
+++ b/bin/build.sh
@@ -0,0 +1,39 @@
+#! /bin/bash
+
+################################################################################
+#
+# Copyright (c) 2010 penSec.IT UG (haftungsbeschränkt)
+#        http://www.pensec.it
+#        mail@pensec.it
+# Copyright (c) 2010 Egil Möller <egil.moller@piratpartiet.se>
+# 
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+# 
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License. 
+#
+################################################################################
+
+#####
+# You have to change following lines to your requirements:
+#
+export JAVA_HOME="/usr/lib/jvm/java-6-sun/"
+export SCALA_HOME=/usr/share/java
+export MYSQL_CONNECTOR_JAR=/usr/share/java/mysql-connector-java.jar
+export JAVA="/usr/lib/jvm/java-6-sun/bin/java"
+export SCALA="/usr/bin/scala"
+export PATH="/usr/lib/jvm/java-6-sun/bin:$PATH"
+#####
+
+# Rebuild jar
+( cd infrastructure; ./bin/makejar.sh; )
+( cd infrastructure/ace; bin/make normal etherpad; )
+cp infrastructure/build/appjet.jar etherpad/appjet-eth-dev.jar
+rm -rf infrastructure/{appjet,build,buildjs,buildcache}
-- 
cgit v1.2.3


From 7951bb92074d58feef3682e9ee89237b0dc8440f Mon Sep 17 00:00:00 2001
From: Mikko Rantalainen <mikko.rantalainen@peda.net>
Date: Wed, 5 May 2010 16:51:40 +0300
Subject: Make scala library JAR location configurable

scala-library.jar may be in $SCALA_HOME/lib or in $SCALA_HOME.
Make it possible to point directly to scala-library.jar anywhere.
---
 bin/build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bin/build.sh')

diff --git a/bin/build.sh b/bin/build.sh
index 3e42c96..7aa70e3 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -25,8 +25,9 @@
 # You have to change following lines to your requirements:
 #
 export JAVA_HOME="/usr/lib/jvm/java-6-sun/"
-export SCALA_HOME=/usr/share/java
-export MYSQL_CONNECTOR_JAR=/usr/share/java/mysql-connector-java.jar
+export SCALA_HOME="/usr/share/java"
+export SCALA_LIBRARY_JAR="/usr/share/java/scala-library.jar"
+export MYSQL_CONNECTOR_JAR="/usr/share/java/mysql-connector-java.jar"
 export JAVA="/usr/lib/jvm/java-6-sun/bin/java"
 export SCALA="/usr/bin/scala"
 export PATH="/usr/lib/jvm/java-6-sun/bin:$PATH"
-- 
cgit v1.2.3