Changeset 23919 for gs3-extensions/i-jetty

Timestamp:

2011-04-18T17:25:28+12:00 (13 years ago)

Author:

davidb

Message:

Extra error checking, remvoal of .svn folder, using modified-jars folder

File:

• gs3-extensions/i-jetty/trunk/src/JAVA-TO-DEX.sh (modified) (5 diffs)

gs3-extensions/i-jetty/trunk/src/JAVA-TO-DEX.sh

@@ -3 +3 @@
 
 
-JARS="LuceneWrapper.jar axis.jar commons-lang3-3.0-beta.jar cp.jar \
+JARS="axis.jar commons-lang3-3.0-beta.jar cp.jar \
   gsdl3.jar gutil.jar \
   jdbm.jar js.jar serializer.jar \
   xercesImpl.jar xml-apis.jar"
 
+# LuceneWrapper.jar and xalan.jar used to be in the list
 
 #---
@@ -23 +24 @@
 echo "# Copying Greenstone-3 classes to the I-Jetty extension"
 /bin/cp -rf "$GSDL3HOME/WEB-INF/classes" classes
+/bin/rm -rf classes/.svn
 
 echo "# Setting GSDL3HOME to match SD-Card on Android device"
@@ -68 +70 @@
 done
 
+echo "Overriding existings Greenstone jars with ones that needed tweaking for Android"
+/bin/cp -v modified-jars/* jars/.
+
+
 echo "Topping up 'jars' with Android specific jars"
-/bin/cp -r extra-jars/* jars/.
+/bin/cp -v extra-jars/* jars/.
 
 
@@ -84 +90 @@
 
 
-
 if [ "x$IJOS" = "xcygwin" ] ; then
   OUTPUT_DEX=`cygpath -w $OUTPUT_DEX`
@@ -91 +96 @@
 
 # add --verbose for more information
-dx.bat  --dex --core-library --positions=lines --output=$OUTPUT_DEX $INPUT_DIR
+dx.bat --dex --core-library --positions=lines --output=$OUTPUT_DEX $INPUT_DIR
+
+if [ $? != 0 ] ; then
+  echo "Error(s) encountered when running 'dx'"
+  exit 
+fi
 
 #---