Changeset 26840 for local/greenstone3

Timestamp:

2013-02-01T17:33:48+13:00 (11 years ago)

Author:

davidb

Message:

Dropping back to r8b version of NDK to work with cross compiling Perl

Location:

local/greenstone3/linux-android-ndk-cross

Files:

• PREPARE.sh (modified) (2 diffs)
• gs3-devel.bash (modified) (3 diffs)
• gs3-setup.bash (modified) (2 diffs)

local/greenstone3/linux-android-ndk-cross/PREPARE.sh

@@ -1 +1 @@
 
-if [ ! -d android-ndk-r8d ] ; then
+if [ ! -d android-ndk-r8b ] ; then
 
   echo "Untarring Android NDK tar ball"
 
-  tar xvjf android-ndk-r8d-linux-x86.tar.bz2
+  tar xvjf android-ndk-r8b-linux-x86.tar.bz2
 fi
 
@@ -13 +13 @@
 fi
 
-$NDK_HOME/android-ndk-r8d/build/tools/make-standalone-toolchain.sh \
+$NDK_HOME/android-ndk-r8b/build/tools/make-standalone-toolchain.sh \
   --platform=android-14 \
   --install-dir=$NDK_HOME/android_toolchain

local/greenstone3/linux-android-ndk-cross/gs3-devel.bash

@@ -2 +2 @@
 export crossOS=android
 echo "+ Setting crossOS=$crossOS"
+export GSDLOS=android
 
 export NDK_HOME=`pwd`
-export PATH=$NDK_HOME/android_toolchain/bin:$NDK_HOME/android-ndk-r8d:$PATH
+export PATH=$NDK_HOME/android_toolchain/bin:$NDK_HOME/android-ndk-r8b:$PATH
 
 echo "+ Setting NDK_HOME to $NDK_HOME"
@@ -16 +17 @@
 export RANLIB=arm-linux-androideabi-ranlib
 
+echo "+ Set export variables CPP, CC etc to arm-linux-androideabi-XXX"
 
 # Need to make sure crossOS is set before sourcing the gnome-lib ext
@@ -23 +25 @@
 # run on the build OS (linux) and the intented final host OS (android)
 
-pushd ../gs2build/ext/gnome-lib
-source ./devel.bash
-popd
+
+if [ ! -d ../gs2build/ext/gnome-lib ] ; then
+  echo "Warning: Failed to detect gnome-lib extension in gs2build:"
+  echo "  <gsdl3home>/gs2build/ext/gnome-lib"
+  sleep 5;
+else
+
+  pushd ../gs2build/ext/gnome-lib \
+    && source ./devel.bash \
+    && popd
+fi
 
 source ./gs3-setup.bash

local/greenstone3/linux-android-ndk-cross/gs3-setup.bash

@@ -1 @@
-
 
 
@@ -6 +5 @@
 if [ "x$JAVA_HOME" = "x" ] ; then
 
-  #export JAVA_HOME=/data/java/jdk1.6.0_21
-  export JAVA_HOME=/research/local/jdk-64bit-1.7
+  export JAVA_HOME=/data/java/jdk1.6.0_21
+  #export JAVA_HOME=/research/local/jdk-64bit-1.7
 
   export PATH=$JAVA_HOME/bin:$PATH