Changeset 23919

Show
Ignore:
Timestamp:
18.04.2011 17:25:28 (9 years ago)
Author:
davidb
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/i-jetty/trunk/src/JAVA-TO-DEX.sh

    r23888 r23919  
    33 
    44 
    5 JARS="LuceneWrapper.jar axis.jar commons-lang3-3.0-beta.jar cp.jar \ 
     5JARS="axis.jar commons-lang3-3.0-beta.jar cp.jar \ 
    66  gsdl3.jar gutil.jar \ 
    77  jdbm.jar js.jar serializer.jar \ 
    88  xercesImpl.jar xml-apis.jar" 
    99 
     10# LuceneWrapper.jar and xalan.jar used to be in the list 
    1011 
    1112#--- 
     
    2324echo "# Copying Greenstone-3 classes to the I-Jetty extension" 
    2425/bin/cp -rf "$GSDL3HOME/WEB-INF/classes" classes 
     26/bin/rm -rf classes/.svn 
    2527 
    2628echo "# Setting GSDL3HOME to match SD-Card on Android device" 
     
    6870done 
    6971 
     72echo "Overriding existings Greenstone jars with ones that needed tweaking for Android" 
     73/bin/cp -v modified-jars/* jars/. 
     74 
     75 
    7076echo "Topping up 'jars' with Android specific jars" 
    71 /bin/cp -r extra-jars/* jars/. 
     77/bin/cp -v extra-jars/* jars/. 
    7278 
    7379 
     
    8490 
    8591 
    86  
    8792if [ "x$IJOS" = "xcygwin" ] ; then 
    8893  OUTPUT_DEX=`cygpath -w $OUTPUT_DEX` 
     
    9196 
    9297# add --verbose for more information 
    93 dx.bat  --dex --core-library --positions=lines --output=$OUTPUT_DEX $INPUT_DIR 
     98dx.bat --dex --core-library --positions=lines --output=$OUTPUT_DEX $INPUT_DIR 
     99 
     100if [ $? != 0 ] ; then 
     101  echo "Error(s) encountered when running 'dx'" 
     102  exit  
     103fi 
    94104 
    95105#---