aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-08-05 16:41:34 +0200
committerSven Gothel <[email protected]>2011-08-05 16:41:34 +0200
commit2fa326f0f64afff58e3d0a706a637bd54126c343 (patch)
treeeb0db9dc117b787c7345a89c961515ca87b95e99 /make
parente70e44922955dfcf26b222ed36754dea00253bde (diff)
crosstest rsync, drop src zip
Diffstat (limited to 'make')
-rw-r--r--make/build-test.xml4
-rw-r--r--make/scripts/crosstest-java-android-armv7-rel.sh4
-rw-r--r--make/scripts/crosstest-java-linux-armv7-rel.sh2
-rw-r--r--make/scripts/crosstest-junit-android-armv7-rel.sh2
-rw-r--r--make/scripts/crosstest-junit-linux-armv7-rel.sh2
5 files changed, 7 insertions, 7 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index 0c76e77..0913003 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -218,7 +218,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/' \${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}
export ${system.env.library.path}=${env.TARGET_ROOT}/gluegen/${rootrel.build}/obj:${env.TARGET_ROOT}/gluegen/${rootrel.build}/test/build/natives ${line.separator}
@@ -278,7 +278,7 @@ ${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/' \${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}
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}
diff --git a/make/scripts/crosstest-java-android-armv7-rel.sh b/make/scripts/crosstest-java-android-armv7-rel.sh
index 20a2ae7..1d5aa67 100644
--- a/make/scripts/crosstest-java-android-armv7-rel.sh
+++ b/make/scripts/crosstest-java-android-armv7-rel.sh
@@ -33,7 +33,7 @@ LOGFILE=`basename $0 .sh`.log
# -Djava.library.path=/system/lib:$TARGET_ROOT/gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
RSYNC_EXCLUDES="--exclude 'build-x86*/' --exclude 'build-linux*/' --exclude 'build-win*/' --exclude 'build-mac*/' \
- --exclude 'classes/' --exclude 'src/' --exclude '.git/' \
+ --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'gluegen-java-src.zip' \
--delete-excluded"
echo "#! /system/bin/sh" > $BUILD_DIR/targetcommand.sh
@@ -45,7 +45,7 @@ export LD_LIBRARY_PATH=/system/lib:$TARGET_ROOT/gluegen/make/$BUILD_DIR/obj:$TAR
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 ; \
dalvikvm \
-Xjnigreflimit:2000 \
- -cp ../make/lib/ant-junit-all.apk:../build-android-armv7/gluegen.apk:../build-android-armv7/test/build/gluegen-test.apk \
+ -cp ../make/lib/ant-junit-all.apk:$BUILD_DIR/gluegen.apk:$BUILD_DIR/test/build/gluegen-test.apk \
-Djogamp.debug.JNILibLoader=true \
-Djogamp.debug.NativeLibrary=true \
-Djogamp.debug.NativeLibrary.Lookup=true \
diff --git a/make/scripts/crosstest-java-linux-armv7-rel.sh b/make/scripts/crosstest-java-linux-armv7-rel.sh
index 60721b0..12ec855 100644
--- a/make/scripts/crosstest-java-linux-armv7-rel.sh
+++ b/make/scripts/crosstest-java-linux-armv7-rel.sh
@@ -15,7 +15,7 @@ TSTCLASS=com.jogamp.common.GlueGenVersion
LOGFILE=`basename $0 .sh`.log
RSYNC_EXCLUDES="--exclude 'build-x86*/' --exclude 'build-linux-x*/' --exclude 'build-android*/' --exclude 'build-win*/' --exclude 'build-mac*/' \
- --exclude 'classes/' --exclude 'src/' --exclude '.git/' \
+ --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'gluegen-java-src.zip' \
--delete-excluded"
ssh $TARGET_UID@$TARGET_IP "\
diff --git a/make/scripts/crosstest-junit-android-armv7-rel.sh b/make/scripts/crosstest-junit-android-armv7-rel.sh
index 61dcda4..c22217b 100644
--- a/make/scripts/crosstest-junit-android-armv7-rel.sh
+++ b/make/scripts/crosstest-junit-android-armv7-rel.sh
@@ -31,7 +31,7 @@ LOGFILE=`basename $0 .sh`.log
# -Djava.library.path=/system/lib:$TARGET_ROOT/gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
RSYNC_EXCLUDES="--exclude 'build-x86*/' --exclude 'build-linux*/' --exclude 'build-win*/' --exclude 'build-mac*/' \
- --exclude 'classes/' --exclude 'src/' --exclude '.git/' \
+ --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'gluegen-java-src.zip' \
--delete-excluded"
echo "#! /system/bin/sh" > $BUILD_DIR/targetcommand.sh
diff --git a/make/scripts/crosstest-junit-linux-armv7-rel.sh b/make/scripts/crosstest-junit-linux-armv7-rel.sh
index 7330797..6b46b06 100644
--- a/make/scripts/crosstest-junit-linux-armv7-rel.sh
+++ b/make/scripts/crosstest-junit-linux-armv7-rel.sh
@@ -14,7 +14,7 @@ TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter
LOGFILE=`basename $0 .sh`.log
RSYNC_EXCLUDES="--exclude 'build-x86*/' --exclude 'build-linux-x*/' --exclude 'build-android*/' --exclude 'build-win*/' --exclude 'build-mac*/' \
- --exclude 'classes/' --exclude 'src/' --exclude '.git/' \
+ --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'gluegen-java-src.zip' \
--delete-excluded"
ssh $TARGET_UID@$TARGET_IP "\