Changeset 11989

Timestamp:

04/16/12 12:06:29 (13 years ago)

Author:

glperez

Message:

Made modifications to Triangle's makefile. Added and exported several Android specific environment variables. Added a install script to Triangle for Android.

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• etc/environment_variables.sh (modified) (1 diff)
• externalpackages/android-dev-dir (added)
• externalpackages/android-dev-dir/android-emulators (added)
• externalpackages/android-emulators (deleted)
• externalpackages/android-ndk/install.sh (modified) (2 diffs)
• externalpackages/android-sdk/install.sh (modified) (4 diffs)
• externalpackages/matlab/install.sh (modified) (1 diff)
• externalpackages/triangle/configs/android/android-4.0 (added)
• externalpackages/triangle/configs/android/android-4.0/configure.make (added)
• externalpackages/triangle/configs/android/configure.make (deleted)
• externalpackages/triangle/install-android-4.0.sh (added)
• externalpackages/triangle/makefile (modified) (2 diffs)

issm/trunk-jpl/etc/environment.sh

@@ -239 +239 @@
 
 #ANDROID_NDK:
+export ANDROID_NDK_DIR
 export PATH="$PATH:$ANDROID_NDK_DIR/"
+
+#ANDROID_DEV_DIR
+export ANDROID_DEV_DIR
 
 #ANDROID_SDK

issm/trunk-jpl/etc/environment_variables.sh

@@ -176 +176 @@
 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"

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

@@ -8 +8 @@
 #Cleanup the install
 rm -rf install
+rm -rf $ANROID_DEV_DIR/tmp
 
 # Install Android SDK and NDK.
@@ -17 +18 @@
 #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

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

@@ -11 +11 @@
 
 present_dir=`pwd`;
-default_droid="Android-4.0.3"
+default_droid="Android-4.0"
 
 if [[ $step == "1" ]]; then
@@ -49 +49 @@
         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 +58 @@
         #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 +67 @@
 
         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

issm/trunk-jpl/externalpackages/matlab/install.sh

@@ -15 +15 @@
 #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

issm/trunk-jpl/externalpackages/triangle/makefile

@@ -4 +4 @@
 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 +23 @@
 
 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