diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
commit | d1fa08fdc9cb11dccee76d668ff85df30458c295 (patch) | |
tree | 1d19df6405103577d872902486792e8c23bce711 /infrastructure/bin/makejar.sh | |
parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.xz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.zip |
Merge remote branch 'upstream/master'
Conflicts:
etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
etherpad/src/etherpad/control/pro/pro_main_control.js
etherpad/src/etherpad/control/pro_help_control.js
etherpad/src/etherpad/globals.js
etherpad/src/etherpad/legacy_urls.js
etherpad/src/etherpad/pne/pne_utils.js
etherpad/src/etherpad/pro/pro_utils.js
etherpad/src/main.js
etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
etherpad/src/plugins/testplugin/templates/page.ejs
etherpad/src/static/css/pad2_ejs.css
etherpad/src/static/css/pro-help.css
etherpad/src/static/img/jun09/pad/protop.gif
etherpad/src/static/js/store.js
etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
etherpad/src/themes/default/templates/main/home.ejs
etherpad/src/themes/default/templates/pro-help/main.ejs
etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
infrastructure/com.etherpad/licensing.scala
trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
trunk/etherpad/src/static/css/home-opensource.css
trunk/etherpad/src/static/js/ace.js
trunk/etherpad/src/static/js/linestylefilter_client.js
trunk/etherpad/src/templates/email/eepnet_license_info.ejs
trunk/etherpad/src/templates/pad/pad_body2.ejs
trunk/etherpad/src/templates/pad/pad_content.ejs
trunk/etherpad/src/templates/pad/padfull_body.ejs
trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
Diffstat (limited to 'infrastructure/bin/makejar.sh')
-rwxr-xr-x | infrastructure/bin/makejar.sh | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/infrastructure/bin/makejar.sh b/infrastructure/bin/makejar.sh new file mode 100755 index 0000000..46b4609 --- /dev/null +++ b/infrastructure/bin/makejar.sh @@ -0,0 +1,74 @@ +#!/bin/bash -e + +# Copyright 2009 Google Inc. +# +# 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. + +if [ -z "$JAR" ]; then + JAR=jar +else + echo "using JAR $JAR..." +fi + +cp ${MYSQL_CONNECTOR_JAR} lib/ + +source bin/compilecache.sh + +if [ "$1" == "clearcache" ]; then + echo "CLEARING BUILD CACHE" + rm -rf buildcache + shift; +fi + +TMPSTORE=/tmp/ajbuild-tmpstore-`date +%s` + +JARFILES=`echo $SCALA_LIBRARY_JAR lib/*.jar lib/manifest` +function genjar { + echo "unzipping JARs..." + pushd $1 >> /dev/null + $JAR xf $SCALA_LIBRARY_JAR + rm -rf META-INF + for a in ../../lib/*.jar; do + $JAR xf $a + rm -rf META-INF/{MANIFEST.MF,NOTICE{,.txt},LICENSE{,.txt},INDEX.LIST,SUN_MICR.{RSA,SF},maven} + done + + echo "making cached JAR...." + $JAR -cfm appjet.jar ../../lib/manifest . + mv appjet.jar /tmp/appjet.jar + rm -rf * + mv /tmp/appjet.jar ./ + + popd >> /dev/null +} +cacheonfiles JAR "$JARFILES" genjar 1 + +echo "compiling..." +bin/comp.sh $@ + +pushd build >> /dev/null + +echo "copying cached JAR..." +cp ../buildcache/JAR/appjet.jar ./ + +echo "making JAR..." +mv appjet.jar /tmp/appjet.jar +$JAR -uf /tmp/appjet.jar . #META-INF com javax org net uk v scala dojox +mv /tmp/appjet.jar ./ + +echo "cleaning up..." +rm -rf $TMPSTORE + +popd >> /dev/null + +echo "done." |