summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2013-03-04 19:03:05 (GMT)
committer mconway <michael.c.conway@gmail.com>2013-03-04 19:03:05 (GMT)
commit2230f1b167d95929d31b6f38c3e4c64f4bbbfc91 (patch)
tree443c4c786cca5cf59ff7f8648b14d212941eb4c0
parent415e780e48eab6ad5fd43beaa846c1169cf52e81 (diff)
parent2e521dace10479fae9aa7c3597c295573896b53b (diff)
downloadQCG-Data-2230f1b167d95929d31b6f38c3e4c64f4bbbfc91.zip
QCG-Data-2230f1b167d95929d31b6f38c3e4c64f4bbbfc91.tar.gz
QCG-Data-2230f1b167d95929d31b6f38c3e4c64f4bbbfc91.tar.bz2
Merge branch 'master' into development
-rwxr-xr-xpackaging/build.sh8
-rw-r--r--packaging/idrop-web-config.groovy2
2 files changed, 5 insertions, 5 deletions
diff --git a/packaging/build.sh b/packaging/build.sh
index 8845935..21860f3 100755
--- a/packaging/build.sh
+++ b/packaging/build.sh
@@ -9,7 +9,7 @@
SCRIPTNAME=`basename $0`
# define which idrop-lite applet to use
-IDROP_LITE_APPLET=idrop-lite-1.0.2-SNAPSHOT-jar-with-dependencies.jar
+IDROP_LITE_APPLET=idrop-lite-1.0.3-SNAPSHOT-jar-with-dependencies.jar
# in case we need to download maven
MAVENVER=3.0.4
@@ -17,7 +17,7 @@ MAVENFILE=apache-maven-$MAVENVER
MAVENDOWNLOAD=http://apache.cs.utah.edu/maven/maven-3/$MAVENVER/binaries/$MAVENFILE-bin.zip
# in case we need to download grails
-GRAILSVER=2.1.0
+GRAILSVER=2.1.1
GRAILSFILE=grails-$GRAILSVER
GRAILSDOWNLOAD=http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/$GRAILSFILE.zip
@@ -121,7 +121,7 @@ fi
RENCIEPM="epm42-renci.tar.gz"
rm -rf epm
rm -f $RENCIEPM
-wget ftp://ftp.renci.org/pub/e-irods/build/$RENCIEPM
+wget ftp://ftp.renci.org/pub/eirods/build/$RENCIEPM
tar -xf $RENCIEPM
cd $BUILDDIR/epm
echo "Configuring EPM"
@@ -198,7 +198,7 @@ cp -r ../../idrop-swing/target/jnlp/* idrop-web-extras
rm -f idrop-web.war
cd ..
-mkepmlist -u idropweb -g idropweb --prefix /var/lib/idrop-web idrop-web > idrop-web.list
+./epm/mkepmlist -u idropweb -g idropweb --prefix /var/lib/idrop-web idrop-web > idrop-web.list
sed 's/\$/$$/g' idrop-web.list > tmp.list
cat idrop-web.list.template tmp.list > idrop-web.list
rm tmp.list
diff --git a/packaging/idrop-web-config.groovy b/packaging/idrop-web-config.groovy
index adad995..25de7df 100644
--- a/packaging/idrop-web-config.groovy
+++ b/packaging/idrop-web-config.groovy
@@ -31,7 +31,7 @@ environments {
*
*/
-idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.2-SNAPSHOT-jar-with-dependencies.jar"
+idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.3-SNAPSHOT-jar-with-dependencies.jar"
idrop.config.idrop.lite.codebase="http://127.0.0.1:8080/idrop-web/idrop-web-extras"
idrop.config.idrop.lite.use.applet.dir=false