Use relative path to job's gluegen repo for GLUEGEN_CPPTASKS_FILE

7 files changed, 9 insertions, 162 deletions

diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/gcc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/gcc
new file mode 120000
index 0000000..edeaa99
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/gcc
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabi-gcc
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/ld b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/ld
new file mode 120000
index 0000000..68f4fae
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/ld
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabi-ld
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/objdump b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/objdump
new file mode 120000
index 0000000..a48d9ee
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/objdump
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabi-objdump
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/strip b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/strip
new file mode 120000
index 0000000..8dab56b
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/arm-linux-gnueabi/bin/strip
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabi-strip
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/gluegen-cpptasks-android-armv7.xml b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/gluegen-cpptasks-android-armv7.xml
deleted file mode 100644
index 13ff70e..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/gluegen-cpptasks-android-armv7.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    This is an example of how to add custom compiler/linker 
-    arguments for a crosscompiler.
-
-    You can use such files with setting the property 'gluegen-cpptasks.file', ie:
-
-        -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml
-
-    In case you want to compile for 32bit on a 64bit machine,
-    you might also need to set the 'os.arch' to 'x86'.
-    Example: gluegen/make/make.gluegen.all.linux-x86.sh
-      -->
-
-<project name="GlueGen-cpptasks-android-armv7" basedir="." >
-
-<!-- Set OS and ARCH for crosscompilation compiler configuration -->
-<target name="gluegen.cpptasks.detect.os.custom">
-    <property name="gluegen.cpptasks.detected.os"     value="true" /> 
-    <property name="isUnix"                           value="true" /> 
-    <property name="isAndroid"                        value="true" /> 
-    <property name="isAndroidARMv7"                   value="true" /> 
-    <property name="jvmDataModel.arg"                 value="-Djnlp.no.jvm.data.model.set=true" /> 
-    <property name="isCrosscompilation"               value="true" />
-    <property name="android.abi"                      value="armeabi-v7a" />
-
-    <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-android-armv7' done"/>
-</target>
-
-<import file="../gluegen-cpptasks-base.xml" optional="false" />
-
-<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android">
-    <echo message="Custom forced compiler Android NDK, linker.cfg.android" />
-    <compiler id="compiler.cfg.android" name="gcc">
-      <compilerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" />
-      <!-- The default search dirs for 'gcc from $NDK_TOOLCHAIN/$TARGET_TRIPLE/bin will not find
-        subprograms properly (see gcc -print-search-dirs). Not sure if this is a bug in the NDK
-        or not. Need to explicitly indicate where subprograms are with -B.
-        NOTE: This is not necessary if using '$TARGET_TRIPLE-gcc' from $NDK_TOOLCHAIN/bin. -->
-      <compilerarg value="-B${env.NDK_TOOLCHAIN_ROOT}/libexec/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}" />
-
-      <compilerarg value="-ffunction-sections" />
-      <compilerarg value="-funwind-tables" />
-      <compilerarg value="-fstack-protector" />
-      <compilerarg value="-fpic" /> 
-
-      <compilerarg value="-march=armv7-a" />
-      <!--compilerarg value="-march=armv5te" /-->
-
-      <compilerarg value="-mtune=xscale" />
-      <compilerarg value="-msoft-float" /> 
-      <compilerarg value="-mthumb" /> 
-
-      <compilerarg value="-g" if="c.compiler.use-debug" />
-      <compilerarg value="-O0" if="c.compiler.use-debug" />
-      <compilerarg value="-Os" unless="c.compiler.use-debug" /> 
-      <!--<compilerarg value="-O2" /> -->
-
-      <compilerarg value="-fomit-frame-pointer" /> 
-      <compilerarg value="-fno-strict-aliasing" /> 
-      <compilerarg value="-finline-limit=64" /> 
-      <compilerarg value="-Wa,--noexecstack" /> 
-      <includepath path="${env.NDK_TOOLCHAIN_ROOT}/lib/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}/include" /> <!-- for stdarg.h -->
-      <defineset>
-        <define name="__unix__" />
-        <define name="__ARM_ARCH_5__" />
-        <define name="__ARM_ARCH_5T__" />
-        <define name="__ARM_ARCH_5E__" />
-        <define name="__ARM_ARCH_5TE__" />
-        <define name="ANDROID" />
-        <define name="_DEBUG"   if="c.compiler.use-debug"/>        
-        <define name="DEBUG"    if="c.compiler.use-debug"/>        
-        <define name="NDEBUG"   unless="c.compiler.use-debug"/>        
-      </defineset>
-    </compiler>
-
-    <linker id="linker.cfg.android" name="gcc">
-         <linkerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" />
-         <linkerarg value="-fpic" /> 
-
-         <linkerarg value="-march=armv7-a" />
-         <!--linkerarg value="-march=armv5te" /-->
-
-         <linkerarg value="-nostdlib" />
-         <linkerarg value="-Bdynamic" />
-         <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" />
-         <linkerarg value="-Wl,-z,nocopyreloc" />
-
-         <linkerarg value="--demangle" /> 
-         <linkerarg value="--gc-sections" /> 
-         <linkerarg value="--no-undefined" /> 
-         <!-- The gcc from $NDK_TOOLCHAIN/$TARGET_TRIPLE/bin needs to be told
-           where to find libgcc as the default location (gcc -print-search-dirs)
-           is not correct. Not sure if this is a bug in the NDK or not. We also
-           enforce that libgcc is linked after source files but before other shared
-           libraries. -->
-         <libset dir="${env.NDK_TOOLCHAIN_ROOT}/lib/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}/armv7-a" libs="gcc" />
-         <libset libs="c,m,dl" />
-    </linker>
-
-</target>
-
-<target name="gluegen.cpptasks.declare.compiler" depends="setup.java.home.dir">
-  <echo message="Custom forced Linux.x86 cross compile android" />
-  <property name="compiler.cfg.id.base"          value="compiler.cfg.android" /> 
-  <property name="linker.cfg.id.base"            value="linker.cfg.android" /> 
-  <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/i386" />
-  <property name="java.includes.dir.platform"    value="${java.includes.dir}/linux" />
-</target>
-
-<target name="declare.linux.android">
-      <echo message="android.arm" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
-      <property name="linker.cfg.id"                        value="linker.cfg.android" />
-</target>
-
-</project>
-
-
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/gluegen-cpptasks-linux-armv7.xml b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/gluegen-cpptasks-linux-armv7.xml
deleted file mode 100644
index 09c5f9f..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/gluegen-cpptasks-linux-armv7.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    This is an example of how to add custom compiler/linker 
-    arguments for a crosscompiler.
-
-    You can use such files with setting the property 'gluegen-cpptasks.file', ie:
-
-        -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml
-
-    In case you want to compile for 32bit on a 64bit machine,
-    you might also need to set the 'os.arch' to 'x86'.
-    Example: gluegen/make/make.gluegen.all.linux-x86.sh
-  -->
-
-<project name="GlueGen-cpptasks-linux-armv7" basedir="." >
-
-<!-- Set OS and ARCH for crosscompilation compiler configuration -->
-<target name="gluegen.cpptasks.detect.os.custom">
-    <property name="gluegen.cpptasks.detected.os"     value="true" /> 
-    <property name="isUnix"                           value="true" /> 
-    <property name="isLinux"                          value="true" /> 
-    <property name="isLinuxARMv7"                     value="true" /> 
-    <property name="isX11"                            value="true" /> 
-    <property name="jvmDataModel.arg"                 value="-Djnlp.no.jvm.data.model.set=true" /> 
-    <property name="isCrosscompilation"               value="true" />
-
-    <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv7' done"/>
-</target>
-
-<import file="../gluegen-cpptasks-base.xml" optional="false" />
-
-</project>
-
-
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 b7fdd3e..c9011ca 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
@@ -2,6 +2,8 @@
 
 cd ~/jenkins
 
+JENKINS_NODE_STARTUP_DIR=`pwd`
+
 scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
 
 function connect_1 {
@@ -44,10 +46,9 @@ function connect_30 {
     export NODE_LABEL=label/linux-armv7-img
     HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7
     JENKINS_WS=$HOST_ROOT/workspace
-    GLUEGEN_ROOT=$JENKINS_WS/gluegen/$NODE_LABEL
 
     # arm-linux-gnueabi == armel triplet
-    PATH=$GLUEGEN_ROOT/make/lib/linux/arm-linux-gnueabi/bin:$PATH
+    PATH=$JENKINS_NODE_STARTUP_DIR/arm-linux-gnueabi/bin:$PATH
     export PATH
 
     export HOST_UID=jogamp
@@ -63,8 +64,7 @@ function connect_30 {
     export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib
     export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm
 
-    #export GLUEGEN_CPPTASKS_FILE=$GLUEGEN_ROOT/make/lib/gluegen-cpptasks-linux-armv7.xml
-    export GLUEGEN_CPPTASKS_FILE=/home/jogamp/jenkins/gluegen-cpptasks-linux-armv7.xml
+    export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-armv7.xml
 
     export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
@@ -84,7 +84,6 @@ function connect_40 {
     export NODE_LABEL=label/android-armv7-img
     HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7_Android
     JENKINS_WS=$HOST_ROOT/workspace
-    GLUEGEN_ROOT=$JENKINS_WS/gluegen/$NODE_LABEL
 
     export HOST_UID=jogamp
     # jogamp02 - 10.1.0.122
@@ -121,8 +120,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=$GLUEGEN_ROOT/make/lib/gluegen-cpptasks-android-armv7.xml
-    export GLUEGEN_CPPTASKS_FILE=/home/jogamp/jenkins/gluegen-cpptasks-android-armv7.xml
+    export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-android-armv7.xml
 
     #export JUNIT_DISABLED="true"
     #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"