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 2014/07/04 19:30:02 UTC
svn commit: r1607895 - in /jena/trunk: jena-arq/bin/make_classpath
jena-arq/bin/make_classpath_mvn jena-sdb/bin/make_classpath
jena-sdb/bin/make_classpath_mvn jena-tdb/bin/make_classpath
jena-tdb/bin/make_classpath_mvn
Author: andy
Date: Fri Jul 4 17:30:02 2014
New Revision: 1607895
URL: http://svn.apache.org/r1607895
Log:
Improve classpath builders
Modified:
jena/trunk/jena-arq/bin/make_classpath
jena/trunk/jena-arq/bin/make_classpath_mvn
jena/trunk/jena-sdb/bin/make_classpath
jena/trunk/jena-sdb/bin/make_classpath_mvn
jena/trunk/jena-tdb/bin/make_classpath
jena/trunk/jena-tdb/bin/make_classpath_mvn
Modified: jena/trunk/jena-arq/bin/make_classpath
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/bin/make_classpath?rev=1607895&r1=1607894&r2=1607895&view=diff
==============================================================================
--- jena/trunk/jena-arq/bin/make_classpath (original)
+++ jena/trunk/jena-arq/bin/make_classpath Fri Jul 4 17:30:02 2014
@@ -81,7 +81,7 @@ done
for dir in "$CPDIR3" "$CPDIR2" "$CPDIR1"
do
if [ -e "$dir" ]
- then
+ then
[ "$CP" != "" ] && CP="${SEP}${CP}"
CP="${dir}$CP"
fi
Modified: jena/trunk/jena-arq/bin/make_classpath_mvn
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/bin/make_classpath_mvn?rev=1607895&r1=1607894&r2=1607895&view=diff
==============================================================================
--- jena/trunk/jena-arq/bin/make_classpath_mvn (original)
+++ jena/trunk/jena-arq/bin/make_classpath_mvn Fri Jul 4 17:30:02 2014
@@ -56,11 +56,13 @@ else
done
fi
-if [ -e "$DIRROOT/classes" ]; then
- CP="$DIRROOT/../jena-core/classes${SEP}$CP"
- CP="$DIRROOT/classes${SEP}$CP"
-elif [ -e "$DIRROOT/target/classes" ]; then
- CP="$DIRROOT/target/classes{SEP}$CP"
-fi
+for D in "$DIRROOT/../jena-core" "$DIRROOT/../jena-arq" "$DIRROOT"
+do
+ if [ -e "$D/classes" ]; then
+ CP="$D/classes${SEP}$CP"
+ elif [ -e "$D/target/classes" ]; then
+ CP="$DIRROOT/target/classes${SEP}$CP"
+ fi
+done
echo "$CP"
Modified: jena/trunk/jena-sdb/bin/make_classpath
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/bin/make_classpath?rev=1607895&r1=1607894&r2=1607895&view=diff
==============================================================================
--- jena/trunk/jena-sdb/bin/make_classpath (original)
+++ jena/trunk/jena-sdb/bin/make_classpath Fri Jul 4 17:30:02 2014
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# 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
@@ -31,6 +31,11 @@ then
DIRROOT=${DIRROOT%/}
LIBDIR="$DIRROOT/lib"
+# List
+CPDIR1="$DIRROOT/classes"
+CPDIR2="$DIRROOT/target/classes"
+CPDIR3="$DIRROOT/target/classes-eclipse"
+ETCDIR="$DIRROOT/etc"
# Cygwin - on Windows, the Java separator is ;
# Alternative: Form in UNIX style, turn into windows form at the end.
@@ -71,6 +76,17 @@ for jar in "$LIBDIR"/*.jar
##
done
+# Prepend any classes/ directory
+# As it's "prepend", we need to do it in reverse.
+for dir in "$CPDIR3" "$CPDIR2" "$CPDIR1"
+do
+ if [ -e "$dir" ]
+ then
+ [ "$CP" != "" ] && CP="${SEP}${CP}"
+ CP="${dir}$CP"
+ fi
+done
+
# Add DIRROOT
#CP="${CP}${SEP}${DIRROOT}"
Modified: jena/trunk/jena-sdb/bin/make_classpath_mvn
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/bin/make_classpath_mvn?rev=1607895&r1=1607894&r2=1607895&view=diff
==============================================================================
--- jena/trunk/jena-sdb/bin/make_classpath_mvn (original)
+++ jena/trunk/jena-sdb/bin/make_classpath_mvn Fri Jul 4 17:30:02 2014
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# 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
@@ -17,34 +17,52 @@
DIRROOT="$1"
-if [ "$DIRROOT" = "" ]
-then
+if [ "$DIRROOT" = "" ]; then
echo "No directory given" 1>&2
exit 1
- fi
-
-M2_REPO="${M2_REPO:-$HOME/.m2/repository}" ;
-X=$(perl -ne 'next unless /\spath="M2_REPO([^"]*)"/s ; print "$1","\n"' $DIRROOT/.classpath)
-
-CP=
-for x in $X
-do
- [ -n "$CP" ] && CP="$CP:"
- CP="${CP}$M2_REPO$x"
-done
+fi
-# Add development systems
+SEP=':'
+CP=${CP:-}
-[ -e "$DIRROOT/classes" ] && CP="$DIRROOT/classes:$CP"
-[ -e "$DIRROOT/target/classes" ] && CP="$DIRROOT/target/classes:$CP"
+which mvn > /dev/null
+HAS_MAVEN=$?
+if [ -e "$DIRROOT/pom.xml" ] && [ $HAS_MAVEN -eq 0 ]; then
+ # Take advantage of maven dependency plugin
+
+ # We want to filter out maven's INFO, WARNING and dependency download messages
+ # We leave ERROR messages alone even though they'll break the classpath we don't want
+ # to suppress them
+ MVN_OUTPUT_PATTERN="(^\[?(INFO|WARNING)|Download)"
+
+ # Switch up to the root directory and run maven
+ CURR_DIR=$PWD
+ cd $DIRROOT
+ MVN_CP=`mvn dependency:build-classpath -U | egrep -v ${MVN_OUTPUT_PATTERN}`
+ cd $CURR_DIR
+
+ # Append the result to any user defined classpath
+ [ "$CP" != "" ] && CP="${CP}${SEP}"
+ CP="${CP}${MVN_CP}"
+else
+ # Use the crude method
+ M2_REPO="${M2_REPO:-$HOME/.m2/repository/}" ;
+ X=$(perl -ne 'next unless /\spath="$M2_REPO([^"]*)"/s ; print "$1","\n"' $DIRROOT/.classpath)
+
+ for x in $X
+ do
+ [ "$CP" != "" ] && CP="${CP}${SEP}"
+ CP="$CP$M2_REPO$x"
+ done
+fi
-for P in jena-core jena-arq
+for D in "$DIRROOT/../jena-core" "$DIRROOT/../jena-arq" "$DIRROOT"
do
- [ -e "$DIRROOT/../$P/classes" ] && CP="$DIRROOT/../$P/classes:$CP"
- [ -e "$DIRROOT/../$P/target/classes" ] && CP="$DIRROOT/../$P/target/classes:$CP"
+ if [ -e "$D/classes" ]; then
+ CP="$D/classes${SEP}$CP"
+ elif [ -e "$D/target/classes" ]; then
+ CP="$DIRROOT/target/classes${SEP}$CP"
+ fi
done
-
-
-
echo "$CP"
Modified: jena/trunk/jena-tdb/bin/make_classpath
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/bin/make_classpath?rev=1607895&r1=1607894&r2=1607895&view=diff
==============================================================================
--- jena/trunk/jena-tdb/bin/make_classpath (original)
+++ jena/trunk/jena-tdb/bin/make_classpath Fri Jul 4 17:30:02 2014
@@ -81,7 +81,7 @@ done
for dir in "$CPDIR3" "$CPDIR2" "$CPDIR1"
do
if [ -e "$dir" ]
- then
+ then
[ "$CP" != "" ] && CP="${SEP}${CP}"
CP="${dir}$CP"
fi
Modified: jena/trunk/jena-tdb/bin/make_classpath_mvn
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/bin/make_classpath_mvn?rev=1607895&r1=1607894&r2=1607895&view=diff
==============================================================================
--- jena/trunk/jena-tdb/bin/make_classpath_mvn (original)
+++ jena/trunk/jena-tdb/bin/make_classpath_mvn Fri Jul 4 17:30:02 2014
@@ -56,11 +56,13 @@ else
done
fi
-if [ -e "$DIRROOT/classes" ]; then
- CP="$DIRROOT/../jena-core/classes${SEP}$CP"
- CP="$DIRROOT/classes${SEP}$CP"
-elif [ -e "$DIRROOT/target/classes" ]; then
- CP="$DIRROOT/target/classes{SEP}$CP"
-fi
+for D in "$DIRROOT/../jena-core" "$DIRROOT/../jena-arq" "$DIRROOT"
+do
+ if [ -e "$D/classes" ]; then
+ CP="$D/classes${SEP}$CP"
+ elif [ -e "$D/target/classes" ]; then
+ CP="$DIRROOT/target/classes${SEP}$CP"
+ fi
+done
echo "$CP"