Changeset 12579

Timestamp:

06/28/12 19:01:51 (13 years ago)

Author:

glperez

Message:

Revised installation scripts and added an android_variables.sh script.

Location:

issm/trunk-jpl/externalpackages

Files:

• android/android-ndk/install.sh (modified) (1 diff)
• android/android-sdk/install.sh (modified) (4 diffs)
• android/android_variables.sh (added)
• gsl/install-android.sh (moved) (moved from issm/trunk-jpl/externalpackages/gsl/install-android-4.0.sh ) (2 diffs)
• triangle/configs/android/android-4.0 (deleted)
• triangle/configs/android/configure.make (copied) (copied from issm/trunk-jpl/externalpackages/triangle/configs/android/android-4.0/configure.make ) (1 diff)
• triangle/install-android.sh (moved) (moved from issm/trunk-jpl/externalpackages/triangle/install-android-4.0.sh ) (2 diffs)

issm/trunk-jpl/externalpackages/android/android-ndk/install.sh

@@ -3 +3 @@
 #native architecture of the Android device.
 
-#The android-ndk-r7b-darwin-x86.tar.bz2 dummy.tar.bz2 file was downloaded 
+#The android-ndk-r8-darwin-x86.tar.bz2 ndk.tar.bz2 file was downloaded 
 #from the android developer website: 
+source $ANDROID_DIR/android_variables.sh
 
 #Cleanup the install
 rm -rf install
-rm -rf $ANDROID_DIR/arm-linux-android-4.0
+rm -rf $ANDROID_DIR/arm-linux-android-${default_droid}
 
 #Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/android-ndk-r7b-darwin-x86.tar.bz2' 'dummy.tar.bz2'
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/android-ndk-r'${ndk_rev}'-darwin-x86.tar.bz2' 'ndk.tar.bz2'
 
 # Install Android SDK and NDK.
-bunzip2 dummy.tar.bz2
-tar -xvf dummy.tar
-rm -rf dummy.tar dummy.tar.bz2
+bunzip2 ndk.tar.bz2
+tar -xvf ndk.tar
+rm -rf ndk.tar ndk.tar.bz2
 
 #Move to install
-mv android-ndk-r7b install
+mv android-ndk-r${ndk_rev} install
 
 #Create Standalone Development Directory
-$ANDROID_NDK_DIR/build/tools/make-standalone-toolchain.sh --platform=android-5 --install-dir=$ANDROID_DIR/arm-linux-android-4.0
+#Note: API-14 corresponds to Android 4.0 although we are
+#calling our toolchain 4.1 to agree with our device.
+$ANDROID_NDK_DIR/build/tools/make-standalone-toolchain.sh --platform=android-14 --install-dir=$ANDROID_DIR/arm-linux-${default_droid}

issm/trunk-jpl/externalpackages/android/android-sdk/install.sh

@@ -1 +1 @@
 #This installs the Android SDK (Software Development Kit)
 #which is needed for the compilation of the Java project. 
+source $ANDROID_DIR/android_variables.sh
 
 step=1;
@@ -11 +12 @@
 
 present_dir=`pwd`;
-default_droid="Android-4.0"
 sd_card="issm-sdcard"
+
+((tmp=$1- 3)) 
+
+if [[ $tmp -ge "-2" && $tmp -le "3" ]]; then
+    step=$1
+else
+    echo "Using default step: " $step
+fi
 
 if [[ $step == "1" ]]; then
@@ -20 +28 @@
 
         #Download from ISSM server
-        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/android-sdk_r18-macosx.zip' 'android-sdk_r18-macosx.zip'
+        $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/android-sdk_r'$sdk_rev'-macosx.zip' 'android-sdk_r'${sdk_rev}'-macosx.zip'
 
         # Install Android SDK and NDK.
-        unzip -o android-sdk_r18-macosx.zip
-        unzip -o apache-ant-1.8.2-bin.zip
+        unzip -o android-sdk_r${sdk_rev}-macosx.zip
 
         #Move to install
         mv -f android-sdk-macosx install-sdk
-        mv -f apache-ant-1.8.2 install-ant
 
         #Post_install configuration: 
@@ -36 +42 @@
         #For now, we need to install:  
         #android sdk platform tools  
-        #and a specific android api: API 15 and API 14
-        #Note: API 15 and 14 correspond to Android 4.0.3 and 4.0 respectively. 
+        #and a specific android api: API 16, API 15 and API 14
+        #Note: API 16, API 15 and 14 correspond to Android 4.1, 4.0.3 and 4.0 respectively. 
 
-        cd install-sdk/tools/ && source ./android update sdk -t platform-tools,android-15,android-14,system-image --no-ui
+        cd install-sdk/tools/ && source ./android update sdk -t platform-tool,${api_levels},system-image --no-ui
 
 fi

issm/trunk-jpl/externalpackages/gsl/install-android.sh

@@ -1 +1 @@
 #!/bin/bash
+source $ANDROID_DIR/android_variables.sh
 
 #Some cleanup
@@ -19 +20 @@
 
 ./configure \
-    CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc\
-    LD=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ld\
-    AR=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ar\
-    RANLIB=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ranlib\
-    NM=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-nm\
+    CC=${toolchain_path}-gcc\
+    LD=${toolchain_path}-ld\
+    AR=${toolchain_path}-ar\
+    RANLIB=${toolchain_path}-ranlib\
+    NM=${toolchain_path}-nm\
     OBJ_EXT=o\
     LIB_EXT=a\

issm/trunk-jpl/externalpackages/triangle/configs/android/configure.make

@@ -9 +9 @@
 #
 # http://www.codesourcery.com/gnu_toolchains/arm/arm_gnu_linux_abi.pdf
-
-ANDROID_BIN=$(ISSM_TIER)/src/android/tmp/android-14-toolchain/bin
-CC=$(ANDROID_DIR)/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
-AR=$(ANDROID_DIR)/arm-linux-android-4.0/bin/arm-linux-androideabi-ar
-RANLIB=$(ANDROID_DIR)/arm-linux-android-4.0/bin/arm-linux-androideabi-ranlib
+CC=${toolchain_path}-gcc
+AR=${toolchain_path}-ar
+RANLIB=${toolchain_path}-ranlib
 CSWITCHES = $(CFLAGS)
 TRILIBDEFS = -DTRILIBRARY

issm/trunk-jpl/externalpackages/triangle/install-android.sh

@@ -1 +1 @@
 #!/bin/bash
+source $ANDROID_DIR/android_variables.sh
+export toolchain_path
 
 #use matlab? 
@@ -17 +19 @@
 
 #copy new makefile
-cp ../configs/android/android-4.0/configure.make ./
+cp ../configs//android/configure.make ./
 cp ../makefile ./