Changeset 23925 for gs3-extensions/i-jetty/trunk/src

Timestamp:

2011-04-18T20:27:34+12:00 (13 years ago)

Author:

davidb

Message:

Test added to direct user to configure their setup-android.bash if not already done so

File:

• gs3-extensions/i-jetty/trunk/src/setup.bash (modified) (1 diff)

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

@@ +1 @@
+
 if [ "x$ANDROID_SDK_HOME" = "x" ] ; then
-  export ANDROID_SDK_HOME=**ANDROID-SDK-HOME**
-  export PATH=$ANDROID_SDK_HOME/tools:$ANDROID_SDK_HOME/platform-tools:$PATH
-
-  echo "+ Your environment has now been set up to run the Android SDK"
+  if [ ! -e setup-android.bash ] ; then
+    echo "Unable to find 'setup-android.bash'.  You either need to:"
+    echo "  1) copy setup-android.bash.in to setup-android.bash and"
+    echo "     edit **ANDROID_SDK_HOME** to point to where this is located"
+    echo "     on your file system, or"
+    echo "  2) Explicitly set the environment variable ANDROID_SDK_HOME"
+    echo "     and make sure 'dx' is on your PATH"
+    exit
+  else 
+    source setup-android.bash
+  fi
 fi
-
 
 export IJETTY_HOME=`pwd`