diff options
| author | Sven Gothel <[email protected]> | 2012-02-24 04:46:03 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-02-24 04:46:03 +0100 |
| commit | e018064a70c53cd1c7b61861c43a869661e77ed2 (patch) | |
| tree | cc79174031850a354ff27976facd340e6e4cbbd5 /make/build-test.xml | |
| parent | e69bfdd3d3fb9a5b3c2f925457aabbeff5e25ecf (diff) | |
fix targetcommand.sh name on target ; Use GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv7.xml
make.jogl.all.linux-armv7-cross.sh:
Use GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv7.xml
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index deb9109a5..642f9a08c 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -525,7 +525,7 @@ <echo message="${line.separator} rsync -av --delete --delete-after --delete-excluded \${line.separator} --exclude 'build-x86*/' --exclude 'build-linux-x*/' --exclude 'build-android*/' --exclude 'build-win*/' --exclude 'build-mac*/' \${line.separator} - --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'jogl-java-src.zip' \${line.separator} + --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude '*-java-src.zip' \${line.separator} ${env.HOST_UID}@${env.HOST_IP}::${env.HOST_RSYNC_ROOT}/jogl ${env.TARGET_ROOT} ${line.separator} cd ${env.TARGET_ROOT}/jogl/make ${line.separator} " append="true" file="${build.test}/targetcommand.sh" /> @@ -576,8 +576,8 @@ ${line.separator} <exec dir="." executable="sh" logError="true" failonerror="true" failifexecutionfails="true"> <arg line='-x -c " chmod 0755 ${build.test}/targetcommand.sh ; - scp ${build.test}/targetcommand.sh ${env.TARGET_UID}@${env.TARGET_IP}:${env.TARGET_ROOT}/targetcommand.sh ; - ssh -x ${env.TARGET_UID}@${env.TARGET_IP} ${env.TARGET_ROOT}/targetcommand.sh ; + scp ${build.test}/targetcommand.sh ${env.TARGET_UID}@${env.TARGET_IP}:${env.TARGET_ROOT}/jogl-targetcommand.sh ; + ssh -x ${env.TARGET_UID}@${env.TARGET_IP} ${env.TARGET_ROOT}/jogl-targetcommand.sh ; scp -pr ${env.TARGET_UID}@${env.TARGET_IP}:${env.TARGET_ROOT}/jogl/make/${results.test}/* ${results.test}/ "'/> </exec> </target> @@ -587,9 +587,9 @@ ${line.separator} <echo message="${line.separator} rsync -av --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} - ${env.HOST_UID}@${env.HOST_IP}::${env.HOST_RSYNC_ROOT}/gluegen ${env.TARGET_ROOT} ${line.separator} -cd ${env.TARGET_ROOT}/gluegen/make ${line.separator} + --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude '*-java-src.zip' \${line.separator} + ${env.HOST_UID}@${env.HOST_IP}::${env.HOST_RSYNC_ROOT}/jogl ${env.TARGET_ROOT} ${line.separator} +cd ${env.TARGET_ROOT}/jogl/make ${line.separator} export ${system.env.library.path}=/system/lib:${env.TARGET_ROOT}/gluegen/${rootrel.build}/obj:${env.TARGET_ROOT}/gluegen/${rootrel.build}/test/build/natives ${line.separator} export BOOTCLASSPATH=/system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar ${line.separator} " append="true" file="${build.test}/targetcommand.sh" /> @@ -638,9 +638,9 @@ ${line.separator} <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}/targetcommand.sh ; - adb shell ${env.TARGET_ROOT}/targetcommand.sh ; - adb pull ${env.TARGET_ROOT}/gluegen/make/${results}/ ${results}/ "'/> + adb push ${build_t}/targetcommand.sh ${env.TARGET_ROOT}/jogl-targetcommand.sh ; + adb shell ${env.TARGET_ROOT}/jogl-targetcommand.sh ; + adb pull ${env.TARGET_ROOT}/jogl/make/${results}/ ${results}/ "'/> </exec> </target> |