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

[an...@apache.org]

Author: andy
Date: Sat Sep 29 09:43:08 2018
New Revision: 1842304

URL: http://svn.apache.org/viewvc?rev=1842304&view=rev
Log:
Update dist.sh to get bits from jena/target

Modified:
    jena/dist/dist.sh

Modified: jena/dist/dist.sh
URL: http://svn.apache.org/viewvc/jena/dist/dist.sh?rev=1842304&r1=1842303&r2=1842304&view=diff
==============================================================================
--- jena/dist/dist.sh (original)
+++ jena/dist/dist.sh Sat Sep 29 09:43:08 2018
@@ -47,7 +47,21 @@ MKDIR="$ECHO mkdir -v"
 DELDIR="$ECHO rm -rf"
 WGET="$ECHO wget"
 
-## ==== Fetch files
+## ==== Source setup
+
+## To get the .sha512, use the bytes in jena/target
+## Assume this runs in a directory next to the "jena" source
+SRC="../jena/target"
+SRC_ZIP="$SRC/jena-${V_DIST}-source-release.zip"
+SRC_SHA512="$SRC/jena-${V_DIST}-source-release.zip.sha512"
+SRC_ASC="$SRC/jena-${V_DIST}-source-release.zip.asc"
+
+[ -e "$SRC" ]        || { echo "Can't find '$SRC'" ; exit 1 ; }
+[ -e "$SRC_ZIP" ]    || { echo "Can't find '$SRC_ZIP'" ; exit 1 ; }
+[ -e "$SRC_SHA512" ] || { echo "Can't find '$SRC_SHA512'" ; exit 1 ; }
+[ -e "$SRC_ASC" ]    || { echo "Can't find '$SRC_ASC'" ; exit 1 ; }
+
+## ==== Fetch binary files
 
 BIN=BIN
 OUT="dist-jena"
@@ -61,7 +75,7 @@ FILES="$FILES $REPO/apache-jena/${V_DIST
 FILES="$FILES $REPO/apache-jena-fuseki/${V_FUSEKI2}/apache-jena-fuseki-${V_FUSEKI2}.zip"
 FILES="$FILES $REPO/apache-jena-fuseki/${V_FUSEKI2}/apache-jena-fuseki-${V_FUSEKI2}.tar.gz"
 
-FILES="$FILES $REPO/jena/${V_DIST}/jena-${V_DIST}-source-release.zip"
+#FILES="$FILES $REPO/jena/${V_DIST}/jena-${V_DIST}-source-release.zip"
 
 function fetch() {
     local F="$1"
@@ -112,8 +126,10 @@ function cpfile
 ## Top level directory
 
 echo "## Setup"
-$CPCMD KEYS "$OUT"
+$CPCMD KEYS        "$OUT"
 $CPCMD HEADER.html "$OUT"
+$CPCMD META        "$OUT"
+$CPCMD META.asc    "$OUT"
 
 echo "## Jena Download"
 cpfile "apache-jena-${V_DIST}.zip" "binaries"
@@ -125,4 +141,7 @@ cpfile "apache-jena-fuseki-${V_FUSEKI2}.
 cpfile "apache-jena-fuseki-${V_FUSEKI2}.tar.gz" "binaries"
 
 echo "## Source release"
-cpfile "jena-${V_DIST}-source-release.zip" "source"
+
+cp -v "$SRC_ZIP"     "$OUT/source"
+cp -v "$SRC_SHA512"  "$OUT/source"
+cp -v "$SRC_ASC"     "$OUT/source"