Index: /issm/trunk-jpl/etc/environment.sh =================================================================== --- /issm/trunk-jpl/etc/environment.sh (revision 11988) +++ /issm/trunk-jpl/etc/environment.sh (revision 11989) @@ -239,5 +239,9 @@ #ANDROID_NDK: +export ANDROID_NDK_DIR export PATH="$PATH:$ANDROID_NDK_DIR/" + +#ANDROID_DEV_DIR +export ANDROID_DEV_DIR #ANDROID_SDK Index: /issm/trunk-jpl/etc/environment_variables.sh =================================================================== --- /issm/trunk-jpl/etc/environment_variables.sh (revision 11988) +++ /issm/trunk-jpl/etc/environment_variables.sh (revision 11989) @@ -176,4 +176,7 @@ ANDROID_NDK_DIR="$ISSM_TIER/externalpackages/android-ndk/install" +#android-dev-dir +ANDROID_DEV_DIR="$ISSM_TIER/externalpackages/android-dev-dir" + #android-sdk ANDROID_SDK_DIR="$ISSM_TIER/externalpackages/android-sdk/install-sdk" Index: /issm/trunk-jpl/externalpackages/android-ndk/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/android-ndk/install.sh (revision 11988) +++ /issm/trunk-jpl/externalpackages/android-ndk/install.sh (revision 11989) @@ -8,4 +8,5 @@ #Cleanup the install rm -rf install +rm -rf $ANROID_DEV_DIR/tmp # Install Android SDK and NDK. @@ -17,2 +18,5 @@ #Move to install mv android-ndk-r7b install + +#Create Standalone Development Directory +$ANDROID_NDK_DIR/build/tools/make-standalone-toolchain.sh --platform=android-5 --install-dir=$ANDROID_DEV_DIR/tmp/android-linux-4.0 Index: /issm/trunk-jpl/externalpackages/android-sdk/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/android-sdk/install.sh (revision 11988) +++ /issm/trunk-jpl/externalpackages/android-sdk/install.sh (revision 11989) @@ -11,5 +11,5 @@ present_dir=`pwd`; -default_droid="Android-4.0.3" +default_droid="Android-4.0" if [[ $step == "1" ]]; then @@ -49,5 +49,5 @@ cd $present_dir/install-sdk/tools - if [ -e $ISSM_TIER/externalpackages/android-emulators/$default_droid ] + if [ -e $ANDROID_DEV_DIR/android-emulators/$default_droid ] then echo "Deleting previously created device: $default_droid" @@ -58,5 +58,5 @@ #default settings will suffice. Press 'enter' to take default settings or enter 'no'. - ./android create avd -f -n $default_droid -t 1 -p $ISSM_TIER/externalpackages/android-emulators/$default_droid --abi armeabi-v7a + ./android create avd -f -n $default_droid -t 2 -p $ANDROID_DEV_DIR/android-emulators/$default_droid --abi armeabi-v7a fi @@ -67,5 +67,5 @@ cd $present_dir/install-sdk/tools - ./emulator -avd $default_droid -sdcard ~/issm/trunk-jpl/externalpackages/android-emulators/test & + ./emulator -avd $default_droid -sdcard $ANDROID_DEV_DIR/android-emulators/test & cd ../platform-tools Index: /issm/trunk-jpl/externalpackages/matlab/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/matlab/install.sh (revision 11988) +++ /issm/trunk-jpl/externalpackages/matlab/install.sh (revision 11989) @@ -15,4 +15,4 @@ #ln -s /Applications/MATLAB_R2009a.app/ install #ln -s /Applications/MATLAB_R2010a.app/ install -ln -s /Applications/MATLAB_R2012a.app/ install -#ln -s /Applications/MATLAB*.app/ install +#ln -s /Applications/MATLAB_R2012a.app/ install +ln -s /Applications/MATLAB*.app/ install Index: /issm/trunk-jpl/externalpackages/triangle/configs/android/android-4.0/configure.make =================================================================== --- /issm/trunk-jpl/externalpackages/triangle/configs/android/android-4.0/configure.make (revision 11989) +++ /issm/trunk-jpl/externalpackages/triangle/configs/android/android-4.0/configure.make (revision 11989) @@ -0,0 +1,19 @@ +# This makefile configures build process to cross-compile to the android platform. +# The binary tools referenced below are specifically configuered to target armeabi-v7a. +# Furthermore, the compilers (which are simply wrappers around GNU GCC) are set to +# produce binaries that are EABI complient. +# +# Note that the AAPCS standard defines 'EABI' as a moniker used to specify +# a _family_ of similar but distinct ABIs. Android follows the little-endian +# ARM GNU/Linux ABI as documented in the following document: +# +# 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_DEV_DIR)/tmp/android-linux-4.0/bin/arm-linux-androideabi-gcc +AR=$(ANDROID_DEV_DIR)/tmp/android-linux-4.0/bin/arm-linux-androideabi-ar +RANLIB=$(ANDROID_DEV_DIR)/tmp/android-linux-4.0/bin/arm-linux-androideabi-ranlib +CSWITCHES = $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -I$(MATLAB_DIR)/extern/include -fPIC -I$(MATLAB_DIR)/include +TRILIBDEFS = -DTRILIBRARY +OBJ_EXT=o +LIB_EXT=a Index: sm/trunk-jpl/externalpackages/triangle/configs/android/configure.make =================================================================== --- /issm/trunk-jpl/externalpackages/triangle/configs/android/configure.make (revision 11988) +++ (revision ) @@ -1,19 +1,0 @@ -# This makefile configures build process to cross-compile to the android platform. -# The binary tools referenced below are specifically configuered to target armeabi-v7a. -# Furthermore, the compilers (which are simply wrappers around GNU GCC) are set to -# produce binaries that are EABI complient. -# -# Note that the AAPCS standard defines 'EABI' as a moniker used to specify -# a _family_ of similar but distinct ABIs. Android follows the little-endian -# ARM GNU/Linux ABI as documented in the following document: -# -# 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_BIN)/arm-linux-androideabi-gcc -AR=$(ANDROID_BIN)/arm-linux-androideabi-ar -RANLIB=$(ANDROID_BIN)/arm-linux-androideabi-ranlib -CSWITCHES = $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -I$(MATLAB_DIR)/extern/include -fPIC -I$(MATLAB_DIR)/include -TRILIBDEFS = -DTRILIBRARY -OBJ_EXT=o -LIB_EXT=a Index: /issm/trunk-jpl/externalpackages/triangle/install-android-4.0.sh =================================================================== --- /issm/trunk-jpl/externalpackages/triangle/install-android-4.0.sh (revision 11989) +++ /issm/trunk-jpl/externalpackages/triangle/install-android-4.0.sh (revision 11989) @@ -0,0 +1,31 @@ +#!/bin/bash + +#use matlab? +matlab=0 + + +#Some cleanup +rm -rf install triangle +mkdir install + +#Untar +cd install +cp ../triangle.zip ./ +unzip triangle.zip + +#copy new makefile +cp ../configs/android/android-4.0/configure.make ./ +cp ../makefile ./ + +#Patch triangle.c +if [[ $matlab == "1" ]];then + patch triangle.c ../triangle.c.patch.matlab +else + patch triangle.c ../triangle.c.patch.python +fi + +#Compile triangle +make + +#Patch triangle.h +patch triangle.h ../triangle.h.patch Index: /issm/trunk-jpl/externalpackages/triangle/makefile =================================================================== --- /issm/trunk-jpl/externalpackages/triangle/makefile (revision 11988) +++ /issm/trunk-jpl/externalpackages/triangle/makefile (revision 11989) @@ -4,5 +4,15 @@ include ./configure.make -AR = ar +ifeq "$(origin CC)" "undefined" + CC = cc +endif + +ifeq "$(origin AR)" "undefined" + AR = ar +endif + +ifeq "$(origin RANLIB)" "undefined" + RANLIB = ranlib +endif TRILIBDEFS = -DTRILIBRARY @@ -13,6 +23,6 @@ triangle.$(LIB_EXT): $(OBJECTS) - ar cr triangle.$(LIB_EXT) $(OBJECTS) - ranlib triangle.$(LIB_EXT) + $(AR) cr triangle.$(LIB_EXT) $(OBJECTS) + $(RANLIB) triangle.$(LIB_EXT) triangle.$(OBJ_EXT): triangle.c triangle.h