svn commit: r1664379 - /jena/dist/dist.sh

[an...@apache.org]

Author: andy
Date: Thu Mar  5 15:33:32 2015
New Revision: 1664379

URL: http://svn.apache.org/r1664379
Log:
Update dist builder for Fuseki1 and Fuseki2

Modified:
    jena/dist/dist.sh

Modified: jena/dist/dist.sh
URL: http://svn.apache.org/viewvc/jena/dist/dist.sh?rev=1664379&r1=1664378&r2=1664379&view=diff
==============================================================================
--- jena/dist/dist.sh (original)
+++ jena/dist/dist.sh Thu Mar  5 15:33:32 2015
@@ -6,10 +6,11 @@
 usage()
 {
 cat << EOF
-usage: dist.sh DIST_VER FUSEKI_VER [echo]
+usage: dist.sh DIST_VER FUSEKI1_VER FUSEKI2_VER [echo]
 
-DIST_VER is the version of the overall distribution e.g. 2.7.3
-FUSEKI_VER is the version of the Fuseki distribution e.g. 0.2.4
+DIST_VER is the version of the overall distribution e.g. 2.13.0
+FUSEKI1_VER is the version of the Fuseki distribution e.g. 1.1.2
+FUSEKI2_VER is the version of the Fuseki distribution e.g. 2.0.0
 
 You may optionally specify echo as a third argument to just print
 what would be run without actually running it
@@ -27,22 +28,28 @@ OUT="dist-jena"
 # .../jena/KEYS
 # .../jena/source/jena-VER-source-release.zip
 # .../jena/binaries/apache-jena-VER.zip
-# .../jena/binaries/jena-fuseki-VER'-distribution.zip
+# .../jena/binaries/jena-fuseki1-VER-distribution.zip
 #   with .asc, .md5 and .sha1 files.
 #   (so not the .asc.md5, .asc.sha1 files)
 
 
 
 V_DIST=$1
-V_FUSEKI=$2
+V_FUSEKI1=$2
+V_FUSEKI2=$3
 
 if [ -z $V_DIST ]; then
     echo "No Distribution version specified"
     usage
     exit 1
 fi
-if [ -z $V_FUSEKI ]; then
-    echo "No Fuseki version specified"
+if [ -z $V_FUSEKI1 ]; then
+    echo "No Fuseki1 version specified"
+    usage
+    exit 1
+fi
+if [ -z $V_FUSEKI2 ]; then
+    echo "No Fuseki2 version specified"
     usage
     exit 1
 fi
@@ -90,9 +97,13 @@ cpfile "apache-jena/${V_DIST}/apache-jen
 cpfile "apache-jena/${V_DIST}/apache-jena-${V_DIST}.tar.gz" "binaries"
 #cpfile "apache-jena/${V_DIST}/apache-jena-${V_DIST}.tar.bz2" "binaries"
 
-echo "## Fuseki download"
-cpfile "jena-fuseki/${V_FUSEKI}/jena-fuseki-${V_FUSEKI}-distribution.zip" "binaries"
-cpfile "jena-fuseki/${V_FUSEKI}/jena-fuseki-${V_FUSEKI}-distribution.tar.gz" "binaries"
+echo "## Fuseki2 download"
+cpfile "apache-jena-fuseki/${V_FUSEKI2}/apache-jena-fuseki-${V_FUSEKI2}.zip" "binaries"
+cpfile "apache-jena-fuseki/${V_FUSEKI2}/apache-jena-fuseki-${V_FUSEKI2}.tar.gz" "binaries"
+
+echo "## Fuseki1 download"
+cpfile "jena-fuseki1/${V_FUSEKI1}/jena-fuseki-${V_FUSEKI1}-distribution.zip" "binaries"
+cpfile "jena-fuseki1/${V_FUSEKI1}/jena-fuseki-${V_FUSEKI1}-distribution.tar.gz" "binaries"
 
 echo "## Source release"
 cpfile "jena/${V_DIST}/jena-${V_DIST}-source-release.zip" "source"