You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/02/28 13:46:57 UTC
svn commit: r1294627 - in /incubator/jena/Jena2/TDB/trunk: bin-test/bptree
bin-test/driver bin-test/exthash bin-test/repack dist/dist-tdb.sh
Author: andy
Date: Tue Feb 28 12:46:56 2012
New Revision: 1294627
URL: http://svn.apache.org/viewvc?rev=1294627&view=rev
Log:
More cleanup
Modified:
incubator/jena/Jena2/TDB/trunk/bin-test/bptree
incubator/jena/Jena2/TDB/trunk/bin-test/driver
incubator/jena/Jena2/TDB/trunk/bin-test/exthash
incubator/jena/Jena2/TDB/trunk/bin-test/repack
incubator/jena/Jena2/TDB/trunk/dist/dist-tdb.sh
Modified: incubator/jena/Jena2/TDB/trunk/bin-test/bptree
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/bin-test/bptree?rev=1294627&r1=1294626&r2=1294627&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/bin-test/bptree (original)
+++ incubator/jena/Jena2/TDB/trunk/bin-test/bptree Tue Feb 28 12:46:56 2012
@@ -1,4 +1,5 @@
#!/bin/bash
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
if [ "$TDBROOT" = "" ]
then
Modified: incubator/jena/Jena2/TDB/trunk/bin-test/driver
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/bin-test/driver?rev=1294627&r1=1294626&r2=1294627&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/bin-test/driver (original)
+++ incubator/jena/Jena2/TDB/trunk/bin-test/driver Tue Feb 28 12:46:56 2012
@@ -1,4 +1,19 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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 [ "$TDBROOT" = "" ]
## then
Modified: incubator/jena/Jena2/TDB/trunk/bin-test/exthash
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/bin-test/exthash?rev=1294627&r1=1294626&r2=1294627&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/bin-test/exthash (original)
+++ incubator/jena/Jena2/TDB/trunk/bin-test/exthash Tue Feb 28 12:46:56 2012
@@ -1,4 +1,5 @@
#!/bin/bash
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
if [ "$TDBROOT" = "" ]
then
Modified: incubator/jena/Jena2/TDB/trunk/bin-test/repack
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/bin-test/repack?rev=1294627&r1=1294626&r2=1294627&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/bin-test/repack (original)
+++ incubator/jena/Jena2/TDB/trunk/bin-test/repack Tue Feb 28 12:46:56 2012
@@ -1,4 +1,5 @@
#!/bin/bash
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
if [ "$TDBROOT" = "" ]
then
Modified: incubator/jena/Jena2/TDB/trunk/dist/dist-tdb.sh
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/dist/dist-tdb.sh?rev=1294627&r1=1294626&r2=1294627&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/dist/dist-tdb.sh (original)
+++ incubator/jena/Jena2/TDB/trunk/dist/dist-tdb.sh Tue Feb 28 12:46:56 2012
@@ -29,12 +29,28 @@
# /downloads or /.
# Easier to find distribution files.
-REPO=~/.m2/repo/org/apache/jena
+# Set the REPO, down to the
+# e.g. ~/.m2/repository
+REPO=${REPO:-}
+if [ -z "$REPO" ]
+then
+ echo "REPO not set" 1>&2
+ exit 1
+ fi
+REPO="$REPO/org/apache/jena"
OUT="dist"
-#DOWNLOAD="download"
-DOWNLOAD="."
+
+# IF there is a download area ...
+DOWNLOAD="download"
+#DOWNLOAD="."
BINARIES="binaries"
-SRC_REL="source-release"
+#SRC_REL="source-release"
+SRC_REL="sources"
+
+# Whether to include the useful stuff ...
+MAVEN_ARTIFACTS=0
+# Whether to put some copies in a more obvious place.
+DOWNLOAD_COPY=0
# This script collects everything for the incubator/dist/jena area
# for a TDB release. It write a script that will build dist/.
@@ -48,7 +64,7 @@ DELDIR="$ECHO rm -rf"
echo "## Initalize"
$DELDIR $OUT
$MKDIR $OUT
-$MKDIR $OUT/$DOWNLOAD
+[ $DOWNLOAD_COPY = 1 ] && $MKDIR $OUT/$DOWNLOAD
$MKDIR $OUT/$BINARIES
$MKDIR $OUT/$SRC_REL
@@ -124,15 +140,19 @@ cpallfiles()
#[ ! -e "$OUT/$D" ] || { echo "Directory exists: $OUT/$D" 2>&1 ; exit 1 ; }
$MKDIR $OUT/$D
- cpfile "$M/$V-$inc/$M-$V-$inc.jar" $D
- cpfile "$M/$V-$inc/$M-$V-$inc-sources.jar" $D
+ # Maven artifacts
+ if [ "$MAVEN_ARTIFACTS" = 1 ]
+ then
+ cpfile "$M/$V-$inc/$M-$V-$inc.jar" $D
+ cpfile "$M/$V-$inc/$M-$V-$inc-sources.jar" $D
+ cpfilemaybe "$M/$V-$inc/$M-$V-$inc-javadoc.jar" $D
+ fi
for ext in zip tar.gz tar.bz2
do
cpfilemaybe "$M/$V-$inc/$M-$V-$inc-distribution.${ext}" $D
done
- cpfilemaybe "$M/$V-$inc/$M-$V-$inc-javadoc.jar" $D
}
## ToDo: automate
@@ -151,26 +171,29 @@ echo
echo "## TDB"
cpallfiles jena-tdb "${V_TDB}"
-echo
-echo "## zip"
-M=jena-tdb
-V=${V_TDB}
-D="$M-$V-$inc"
-cpfile $M/$V-$inc/$D-distribution.zip $DOWNLOAD
-cpfilemaybe $M/$V-$inc/$D-distribution.tar.gz $DOWNLOAD
-cpfilemaybe $M/$V-$inc/$D-distribution.tar.bz2 $DOWNLOAD
-
-# Distribution
-echo
-echo "# Distribution"
-# Fix the name.
+if [ "$DOWNLOAD_COPY" = 1 ]
+then
+ # Distribution
+ echo
+ echo "## zip"
+ M=jena-tdb
+ V=${V_TDB}
+ D="$M-$V-$inc"
+ cpfile $M/$V-$inc/$D-distribution.zip $DOWNLOAD
+ cpfilemaybe $M/$V-$inc/$D-distribution.tar.gz $DOWNLOAD
+ cpfilemaybe $M/$V-$inc/$D-distribution.tar.bz2 $DOWNLOAD
+
+ echo
+ echo "# Distribution"
+ # Fix the name.
-for ext1 in zip tar.gz # tar.bz2
-do
- for ext2 in "" .asc .md5 .sha1
+ for ext1 in zip tar.gz # tar.bz2
do
- ext="$ext1$ext2"
- F=$OUT/$DOWNLOAD/$D-distribution.$ext
- $ECHO mv $F $OUT/$DOWNLOAD/apache-$D-distribution.$ext
+ for ext2 in "" .asc .md5 .sha1
+ do
+ ext="$ext1$ext2"
+ F=$OUT/$DOWNLOAD/$D-distribution.$ext
+ $ECHO mv $F $OUT/$DOWNLOAD/apache-$D-distribution.$ext
+ done
done
-done
+fi