Changeset 23970

Show
Ignore:
Timestamp:
29.04.2011 13:22:22 (9 years ago)
Author:
davidb
Message:

Mod/improvement to scripts based on fresh round of installing Greenstone on an Android phone

Location:
gs3-extensions/i-jetty/trunk/src
Files:
4 modified

Legend:

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

    r23931 r23970  
    133133 
    134134echo "" 
    135 echo "Run ./DEX-TO-SDCARD.sh to install the latest DEX files on the device" 
     135echo "####" 
     136echo "# Run ./DEX-TO-SDCARD.sh to install the latest DEX files on the device" 
     137echo "####" 
    136138echo "" 
  • gs3-extensions/i-jetty/trunk/src/README.txt

    r23883 r23970  
    66 
    77It relies on the environment variable ANDROID_SDK_HOME to determine 
    8 where Android's SDK lives on your file system (primarily to be able to 
    9 run 'adb' and 'dex').  If this is not set prior to running the scripts 
    10 this extension provides, it can be set explicitly in setup.bash/bat. 
     8where the Android SDK lives on your file system, in a similar way 
     9JAVA_HOME gets used by many programs to determin where Java is 
     10installed on a particular computer.  The key programs we need to run 
     11from the Android SDK are 'adb' and 'dex'.  The most straight forward 
     12way to control this variable is to: 
     13 
     14  cp setup-android.bash.in setup-android.bash 
     15 
     16and then edit 'setup-android.bash' the value of **ANDROID-SDK-HOME** 
     17to be the top-level directory of where the Android SDK was installed to. 
     18 
     19Having done this, source the main setup file: 
     20 
     21  source setup.bash 
     22 
     23which automatically sources setup-android.bash if the ANDROID_SDK_HOME 
     24environment variable isn't set. 
    1125 
    1226Having sourced the setup file the two main steps are: 
     
    1933The first step typically only needs to be done once. The second step is 
    2034composed of three sub-steps, and may require the last two sub-steps to 
    21 be repeated if the Java code is changed. 
     35be repeated if the Java code has been modified. 
    2236 
    2337Step 1 
     
    3246need to have enabled it's application 'Development' mode (under 
    3347Settings->Application) 
     48 
     49************* 
     50**Important** 
     51************* 
     52 
     53Having installed i-jetty, find the application on the Android device 
     54and launch it (but you don't have to go as far as starting the i-jetty 
     55server from within this application).  Launching i-jetty completes the 
     56installation of the application by creating the 'jetty' folder on the 
     57Android's SD-card, and populating it with the default configuration 
     58files for i-jetty.  The 'jetty' folder is needed for your setup procedure 
     59as it is where Greenstone-3 will be installed to. 
    3460 
    3561 
  • gs3-extensions/i-jetty/trunk/src/WEBAPP-ROOT-TO-SDCARD.sh

    r23931 r23970  
    55  echo "  => No valid directory to install to on Android device" 
    66  echo "  => Did you run setup.bash before the Android device was in disk mode?" 
    7   echo "  => Alternatively, set the environment variable explicitly" 
     7  echo "  => Have you launched i-jetty at least once to create the 'jetty' directory on the sd-card?" 
     8  echo "  => If all else fails, you can set the environment variable SDCARD_WEBAPPS explicitly" 
    89  exit -1 
    910fi 
     
    1819  mode="Updating" 
    1920fi 
     21  echo "  => Have you launched i-jetty to create the 'jetty' directory on the sd-card? 
    2022 
    2123echo "#---" 
     
    4143  | xargs -I {} /bin/cp -u -v $GSDL3HOME/{} $SDCARD_GSDL3HOME/{} 
    4244 
     45/bin/cp resources/index.html $SDCARD_GSDL3HOME/. 
     46/bin/cp resources/web.xml $SDCARD_GSDL3HOME/WEB-INF/. 
    4347 
    4448if [ ! -d $SDCARD_GSDL3HOME/sites/localsite ] ; then 
     
    5458/bin/cp -u -v -r $GSDL3HOME/sites/localsite/collect/lucene-jdbm-demo $SDCARD_GSDL3HOME/sites/localsite/collect/. 
    5559 
     60if [ ! -d $SDCARD_GSDL3HOME/sites/localsite/collect/lucene-jdbm-demo/index ] ; then 
     61  pushd $SDCARD_GSDL3HOME/sites/localsite/collect/lucene-jdbm-demo 
     62  unzip index.zip 
     63  popd 
     64fi 
     65 
     66echo "" 
     67echo "####" 
     68echo "# If not already done so, run: " 
     69echo "#   ./JAVA-TO-DEX.sh" 
     70echo "# to cross-compile the Greenstone code and supporting JAR files" 
     71echo "####" 
     72echo "" 
    5673 
    5774 
    5875 
    59  
  • gs3-extensions/i-jetty/trunk/src/setup.bash

    r23931 r23970  
    5757  echo "" 
    5858  echo "  Using:" 
     59  echo "" 
    5960  echo "     $SDCARD_GSDL3HOME" 
     61  echo "" 
    6062  echo "  as the installation point for the Greenstone servlet" 
    6163  echo "" 
     
    7880 
    7981echo "" 
     82echo "======" 
    8083echo "If this is the first time you have installed Greenstone on the Android device, " 
    8184echo " run:" 
     85echo "" 
     86echo "   adb install i-jetty-2.2-signed.apk" 
     87echo "" 
     88echo "to install jetty on your device, followed by" 
     89echo "" 
    8290echo "  ./WEBAPP-ROOT-TO-SDCARD.sh" 
    8391echo "" 
     92echo "to set up tGreenstone's 'web' directory within the i-jetty webapps area." 
    8493echo "Then:" 
    8594echo "" 
    8695echo "  ./JAVA-TO-DEX.sh" 
     96echo "" 
     97echo "to cross-compile Greenstone java code to the Android DEX format." 
     98echo "" 
     99echo "Finally run:" 
     100echo "" 
     101echo "  ./DEX-TO-SDCARD.sh" 
     102echo "" 
     103echo "to install the cross-compiled files on the Android device" 
     104echo "======" 
    87105echo "" 
    88106 
     
    90108 
    91109 
     110 
     111