From f303bc43437e2fa6ccc8d3f8facd2e5dc7c55069 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 7 Mar 2012 02:19:56 +0100
Subject: android build/test fixes and refinement

remote test fix:
  - run targetcommand w/ explicit root via 'su'
  - rsync: more excludes, only use '-rt'
  - explicit chmod 644 on results
  - adb commands include naming of remote machine: -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT}

GlueGen-cpptasks-android-armv7:
  - use unique project name (warning)
  - gcc +
     -fpic
     -D__unix__
  - ld +
     -fpic
     -nostdlib
     -Bdynamic
     -Wl,-dynamic-linker,/system/bin/linker
     -Wl,-z,nocopyreloc
     explicit add 'dl' to list of libs
---
 make/build-test.xml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'make/build-test.xml')

diff --git a/make/build-test.xml b/make/build-test.xml
index 8c45031..48b8734 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -282,12 +282,21 @@ ${line.separator}
         </exec>
     </target>
 
+<!--
+rsync:
+    -a == -rlptgoD
+    -rt 
+-->
+
     <target name="junit.run.remote.adb" if="isAndroidARMv7">
         <echo message="#! /system/bin/sh${line.separator}" append="false" file="${build_t}/targetcommand.sh" />
         <echo message="${line.separator}
-rsync -av --delete --delete-after --delete-excluded \${line.separator}
+rsync -rtv --delete --delete-after --delete-excluded \${line.separator}
       --exclude 'build-x86*/' --exclude 'build-linux*/' --exclude 'build-win*/' --exclude 'build-mac*/' \${line.separator}
       --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'gluegen-java-src.zip' \${line.separator}
+      --exclude 'gensrc/' --exclude 'doc/' --exclude 'jnlp-files' --exclude 'archive/' \${line.separator}
+      --exclude 'android-sdk/' --exclude 'resources/' --exclude 'scripts/' \${line.separator}
+      --exclude 'stub_includes/' --exclude 'nbproject/' --exclude '*.log' --exclude '*.zip' --exclude '*.7z' \${line.separator}
       ${env.HOST_UID}@${env.HOST_IP}::${env.HOST_RSYNC_ROOT}/${gluegen.basename} ${env.TARGET_ROOT} ${line.separator}
 cd ${env.TARGET_ROOT}/${gluegen.basename}/${env.NODE_LABEL}/make ${line.separator}
 export ${system.env.library.path}=/system/lib:${env.TARGET_ROOT}/${gluegen.basename}/${env.NODE_LABEL}/${rootrel.build}/obj:${env.TARGET_ROOT}/${gluegen.basename}/${env.NODE_LABEL}/${rootrel.build}/test/build/natives ${line.separator}
@@ -335,12 +344,17 @@ ${line.separator}
 " append="true" file="${build_t}/targetcommand.sh" />
           </sequential>
         </for>
+
+        <echo message="${line.separator}
+chmod 644 ${results}/* \${line.separator}
+" append="true" file="${build_t}/targetcommand.sh" />
+
         <exec dir="." executable="sh" logError="true" failonerror="true" failifexecutionfails="true">
             <arg line='-x -c "
             chmod 0755 ${build_t}/targetcommand.sh ;
-            adb push ${build_t}/targetcommand.sh ${env.TARGET_ROOT}/gluegen-targetcommand.sh ;
-            adb shell ${env.TARGET_ROOT}/gluegen-targetcommand.sh ;
-            adb pull ${env.TARGET_ROOT}/${gluegen.basename}/${env.NODE_LABEL}/make/${results}/ ${results}/ "'/>
+            adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} push ${build_t}/targetcommand.sh ${env.TARGET_ROOT}/gluegen-targetcommand.sh ;
+            adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} shell su -c ${env.TARGET_ROOT}/gluegen-targetcommand.sh ;
+            adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} pull ${env.TARGET_ROOT}/${gluegen.basename}/${env.NODE_LABEL}/make/${results}/ ${results}/ "'/>
         </exec>
     </target>
 
-- 
cgit v1.2.3