svn commit: r1577121 - in /jena/trunk/jena-arq/bin: arq_path make_classpath_mvn

[rv...@apache.org]

Author: rvesse
Date: Thu Mar 13 11:51:43 2014
New Revision: 1577121

URL: http://svn.apache.org/r1577121
Log:
Improve scripts to cache generated classpath and use the cached classpath where available, further improve maven output pattern filter

Modified:
    jena/trunk/jena-arq/bin/arq_path
    jena/trunk/jena-arq/bin/make_classpath_mvn

Modified: jena/trunk/jena-arq/bin/arq_path
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/bin/arq_path?rev=1577121&r1=1577120&r2=1577121&view=diff
==============================================================================
--- jena/trunk/jena-arq/bin/arq_path (original)
+++ jena/trunk/jena-arq/bin/arq_path Thu Mar 13 11:51:43 2014
@@ -1,18 +1,16 @@
 #!/bin/sh
 ## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
 
-if [ "$ARQROOT" = "" ]
-then
+if [ "$ARQROOT" = "" ]; then
     echo "ARQROOT not set" 1>&2
     exit 1
-    fi
+fi
 
-if [ -e "$ARQROOT/.classpath" ]
-then
+if [ -e "$ARQROOT/arq.classpath" ]; then
+	cat "$ARQROOT/arq.classpath"
+elif [ -e "$ARQROOT/.classpath" ]; then
     # Development area
-    exec "$ARQROOT/bin/make_classpath_mvn" "$ARQROOT"
-    fi
-
-# CP=$(make_classpath "$ARQROOT")
-# echo $CP
-exec "$ARQROOT/bin/make_classpath" "$ARQROOT"
+    exec "$ARQROOT/bin/make_classpath_mvn" "$ARQROOT" | tee "$ARQROOT/arq.classpath"
+else
+    exec "$ARQROOT/bin/make_classpath" "$ARQROOT" | tee "$ARQROOT/arq.classpth"
+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=1577121&r1=1577120&r2=1577121&view=diff
==============================================================================
--- jena/trunk/jena-arq/bin/make_classpath_mvn (original)
+++ jena/trunk/jena-arq/bin/make_classpath_mvn Thu Mar 13 11:51:43 2014
@@ -33,7 +33,7 @@ if [ -e "$DIRROOT/pom.xml" ] && [ $HAS_M
     # 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)"
+    MVN_OUTPUT_PATTERN="(^\[?(INFO|WARNING)|Download)"
     
     # Switch up to the root directory and run maven
     CURR_DIR=$PWD