Changeset 23970

Timestamp:

2011-04-29T13:22:22+12:00 (13 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:

• JAVA-TO-DEX.sh (modified) (1 diff)
• README.txt (modified) (3 diffs)
• WEBAPP-ROOT-TO-SDCARD.sh (modified) (4 diffs)
• setup.bash (modified) (3 diffs)

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

@@ -133 +133 @@
 
 echo ""
-echo "Run ./DEX-TO-SDCARD.sh to install the latest DEX files on the device"
+echo "####"
+echo "# Run ./DEX-TO-SDCARD.sh to install the latest DEX files on the device"
+echo "####"
 echo ""

gs3-extensions/i-jetty/trunk/src/README.txt

@@ -6 +6 @@
 
 It relies on the environment variable ANDROID_SDK_HOME to determine
-where Android's SDK lives on your file system (primarily to be able to
-run 'adb' and 'dex').  If this is not set prior to running the scripts
-this extension provides, it can be set explicitly in setup.bash/bat.
+where the Android SDK lives on your file system, in a similar way
+JAVA_HOME gets used by many programs to determin where Java is
+installed on a particular computer.  The key programs we need to run
+from the Android SDK are 'adb' and 'dex'.  The most straight forward
+way to control this variable is to:
+
+  cp setup-android.bash.in setup-android.bash
+
+and then edit 'setup-android.bash' the value of **ANDROID-SDK-HOME**
+to be the top-level directory of where the Android SDK was installed to.
+
+Having done this, source the main setup file:
+
+  source setup.bash
+
+which automatically sources setup-android.bash if the ANDROID_SDK_HOME
+environment variable isn't set.
 
 Having sourced the setup file the two main steps are:
@@ -19 +33 @@
 The first step typically only needs to be done once. The second step is
 composed of three sub-steps, and may require the last two sub-steps to
-be repeated if the Java code is changed.
+be repeated if the Java code has been modified.
 
 Step 1
@@ -32 +46 @@
 need to have enabled it's application 'Development' mode (under
 Settings->Application)
+
+*************
+**Important**
+*************
+
+Having installed i-jetty, find the application on the Android device
+and launch it (but you don't have to go as far as starting the i-jetty
+server from within this application).  Launching i-jetty completes the
+installation of the application by creating the 'jetty' folder on the
+Android's SD-card, and populating it with the default configuration
+files for i-jetty.  The 'jetty' folder is needed for your setup procedure
+as it is where Greenstone-3 will be installed to.
 
 

gs3-extensions/i-jetty/trunk/src/WEBAPP-ROOT-TO-SDCARD.sh

@@ -5 +5 @@
   echo "  => No valid directory to install to on Android device"
   echo "  => Did you run setup.bash before the Android device was in disk mode?"
-  echo "  => Alternatively, set the environment variable explicitly"
+  echo "  => Have you launched i-jetty at least once to create the 'jetty' directory on the sd-card?"
+  echo "  => If all else fails, you can set the environment variable SDCARD_WEBAPPS explicitly"
   exit -1
 fi
@@ -18 +19 @@
   mode="Updating"
 fi
+  echo "  => Have you launched i-jetty to create the 'jetty' directory on the sd-card?
 
 echo "#---"
@@ -41 +43 @@
   | xargs -I {} /bin/cp -u -v $GSDL3HOME/{} $SDCARD_GSDL3HOME/{}
 
+/bin/cp resources/index.html $SDCARD_GSDL3HOME/.
+/bin/cp resources/web.xml $SDCARD_GSDL3HOME/WEB-INF/.
 
 if [ ! -d $SDCARD_GSDL3HOME/sites/localsite ] ; then
@@ -54 +58 @@
 /bin/cp -u -v -r $GSDL3HOME/sites/localsite/collect/lucene-jdbm-demo $SDCARD_GSDL3HOME/sites/localsite/collect/.
 
+if [ ! -d $SDCARD_GSDL3HOME/sites/localsite/collect/lucene-jdbm-demo/index ] ; then
+  pushd $SDCARD_GSDL3HOME/sites/localsite/collect/lucene-jdbm-demo
+  unzip index.zip
+  popd
+fi
+
+echo ""
+echo "####"
+echo "# If not already done so, run: "
+echo "#   ./JAVA-TO-DEX.sh"
+echo "# to cross-compile the Greenstone code and supporting JAR files"
+echo "####"
+echo ""
 
 
 
-

gs3-extensions/i-jetty/trunk/src/setup.bash

@@ -57 +57 @@
   echo ""
   echo "  Using:"
+  echo ""
   echo "     $SDCARD_GSDL3HOME"
+  echo ""
   echo "  as the installation point for the Greenstone servlet"
   echo ""
@@ -78 +80 @@
 
 echo ""
+echo "======"
 echo "If this is the first time you have installed Greenstone on the Android device, "
 echo " run:"
+echo ""
+echo "   adb install i-jetty-2.2-signed.apk"
+echo ""
+echo "to install jetty on your device, followed by"
+echo ""
 echo "  ./WEBAPP-ROOT-TO-SDCARD.sh"
 echo ""
+echo "to set up tGreenstone's 'web' directory within the i-jetty webapps area."
 echo "Then:"
 echo ""
 echo "  ./JAVA-TO-DEX.sh"
+echo ""
+echo "to cross-compile Greenstone java code to the Android DEX format."
+echo ""
+echo "Finally run:"
+echo ""
+echo "  ./DEX-TO-SDCARD.sh"
+echo ""
+echo "to install the cross-compiled files on the Android device"
+echo "======"
 echo ""
 
@@ -90 +108 @@
 
 
+
+