diff options
| author | Sven Gothel <[email protected]> | 2012-08-18 19:50:49 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-08-18 19:50:49 +0200 |
| commit | f866dfdacbe2c34926d9a73c89723b5f054017d9 (patch) | |
| tree | beb4f784b844e26fd89a41f6a3b17b94693b8084 /jenkins-server-slave-setup | |
| parent | 2a51d72348b74025a90c1707e1abc0281a1ecf77 (diff) | |
Adapt to GlueGen ARM changes 422d7a5eb53fca6642ebf4e8910d8b0311bb2597
Diffstat (limited to 'jenkins-server-slave-setup')
| -rwxr-xr-x | jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh index e83ecde..862f9d2 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh @@ -60,11 +60,11 @@ function connect_30 { export TARGET_ROOT=/home/jogamp/JogAmpSlaveARMv7 export TARGET_ANT_HOME=/usr/share/ant - export TARGET_PLATFORM_ROOT=/opt-linux-armv7-armel + export TARGET_PLATFORM_ROOT=/opt-linux-armv6-armel export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm - export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-armv4.xml + export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-armv6.xml export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" @@ -102,11 +102,11 @@ function connect_31 { export TARGET_ROOT=/home/jogamp/JogAmpSlaveARMv7hf export TARGET_ANT_HOME=/usr/share/ant - export TARGET_PLATFORM_ROOT=/opt-linux-armv7-armhf + export TARGET_PLATFORM_ROOT=/opt-linux-armv6-armhf export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm - export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-armv7hf.xml + export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-armv6hf.xml export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" @@ -163,7 +163,7 @@ function connect_40 { # Need to add toolchain bins to the PATH. export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_SDK_HOME/platform-tools:$PATH" - export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-android-armv7.xml + export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-android-armv6.xml #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" |