svn commit: r1355077 - in /jena/trunk: jena-arq/bin/make_classpath jena-core/bin/make_classpath jena-sdb/bin/make_classpath

[an...@apache.org]

Author: andy
Date: Thu Jun 28 17:16:24 2012
New Revision: 1355077

URL: http://svn.apache.org/viewvc?rev=1355077&view=rev
Log:
make-classpath -- cope with many possible setups

Modified:
    jena/trunk/jena-arq/bin/make_classpath
    jena/trunk/jena-core/bin/make_classpath
    jena/trunk/jena-sdb/bin/make_classpath

Modified: jena/trunk/jena-arq/bin/make_classpath
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/bin/make_classpath?rev=1355077&r1=1355076&r2=1355077&view=diff
==============================================================================
--- jena/trunk/jena-arq/bin/make_classpath (original)
+++ jena/trunk/jena-arq/bin/make_classpath Thu Jun 28 17:16:24 2012
@@ -34,7 +34,7 @@ LIBDIR="$DIRROOT/lib"
 # List
 CPDIR1="$DIRROOT/classes"
 CPDIR2="$DIRROOT/target/classes"
-#CPDIR3="$DIRROOT/build/classes"
+CPDIR3="$DIRROOT/target/classes-eclipse"
 ETCDIR="$DIRROOT/etc"
 
 # Cygwin - on Windows, the Java separator is ;
@@ -78,7 +78,7 @@ done
 
 # Prepend any classes/ directory
 # As it's "prepend", we need to do it in reverse.
-for dir in "$CPDIR2" "$CPDIR1"
+for dir in "$CPDIR3" "$CPDIR2" "$CPDIR1"
 do
   if [ -e "$dir" ]
       then

Modified: jena/trunk/jena-core/bin/make_classpath
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/bin/make_classpath?rev=1355077&r1=1355076&r2=1355077&view=diff
==============================================================================
Binary files - no diff available.

Modified: jena/trunk/jena-sdb/bin/make_classpath
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/bin/make_classpath?rev=1355077&r1=1355076&r2=1355077&view=diff
==============================================================================
--- jena/trunk/jena-sdb/bin/make_classpath (original)
+++ jena/trunk/jena-sdb/bin/make_classpath Thu Jun 28 17:16:24 2012
@@ -1,4 +1,19 @@
-#!/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
+# 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.
 
 # Usage: make_classpath DIR
 # Finds jars in lib/, and class files in classes/ and build/classes
@@ -19,7 +34,7 @@ LIBDIR="$DIRROOT/lib"
 # List
 CPDIR1="$DIRROOT/classes"
 CPDIR2="$DIRROOT/target/classes"
-#CPDIR3="$DIRROOT/build/classes"
+CPDIR3="$DIRROOT/target/classes-eclipse"
 ETCDIR="$DIRROOT/etc"
 
 # Cygwin - on Windows, the Java separator is ;
@@ -63,7 +78,7 @@ done
 
 # Prepend any classes/ directory
 # As it's "prepend", we need to do it in reverse.
-for dir in "$CPDIR2" "$CPDIR1"
+for dir in "$CPDIR3" "$CPDIR2" "$CPDIR1"
 do
   if [ -e "$dir" ]
       then