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

2 files changed, 13 insertions, 17 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>
 
diff --git a/make/scripts/make.jogl.all.linux-armv7-cross.sh b/make/scripts/make.jogl.all.linux-armv7-cross.sh
index 20421a099..daf98af7f 100755
--- a/make/scripts/make.jogl.all.linux-armv7-cross.sh
+++ b/make/scripts/make.jogl.all.linux-armv7-cross.sh
@@ -29,16 +29,12 @@ export TARGET_ANT_HOME=/usr/share/ant
 export TARGET_PLATFORM_LIBS=/opt-linux-armv7-eabi/lib
 export TARGET_JAVA_LIBS=/opt-linux-armv7-eabi/jre/lib/arm
 
+export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv7.xml"
+
+export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
+
 ant \
     -Drootrel.build=build-linux-armv7 \
-    -Dgluegen.cpptasks.detected.os=true \
-    -DisUnix=true \
-    -DisLinux=true \
-    -DisLinuxARMv7=true \
-    -DisX11=true \
-    -DjvmDataModel.arg="-Djnlp.no.jvm.data.model.set=true" \
-    -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
-    -DisCrosscompilation=true \
     \
     -Dsetup.addNativeKD=true \
     -Dsetup.addNativeOpenMAX=true \