diff options
| author | Mark Raynsford <[email protected]> | 2014-03-04 21:02:15 +0000 |
|---|---|---|
| committer | Mark Raynsford <[email protected]> | 2014-03-04 21:02:15 +0000 |
| commit | f538477c6467f046533b3fc584566dccc768c6f5 (patch) | |
| tree | e0a9b9ab2a3364953c56c2c945affe1a19f181d6 | |
| parent | 7f28cc15004e143f77f7b90f8e543c16f84dcff0 (diff) | |
| parent | d4468e1666fa7080278b02514cd16cd1091b9ce3 (diff) | |
Merge branch 'master' of ssh://jogamp.org/srv/scm/jogamp-scripting
7 files changed, 7 insertions, 1 deletions
diff --git a/jenkins-builds/promote-latest-builds.sh b/jenkins-builds/promote-latest-builds.sh index 8e4208a..a592c6d 100755 --- a/jenkins-builds/promote-latest-builds.sh +++ b/jenkins-builds/promote-latest-builds.sh @@ -165,7 +165,7 @@ function promote-latest-builds() { prom_promote_module jocl $joclslave $dest cp -a $joclmaster/artifact.properties $dest/log/jocl-master.artifact.properties - cp -a $joclmaster/jocl-javadoc.7z $dest/archive/jocl-javadoc.7z + cp -a $joclmaster/javadoc.7z $dest/archive/jocl-javadoc.7z cd $dest/javadoc prom_extract ../archive/jocl-javadoc.7z jocl cd $rootdir diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++ new file mode 120000 index 0000000..b625efa --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++ @@ -0,0 +1 @@ +/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-c++
\ No newline at end of file diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc new file mode 120000 index 0000000..6b785db --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc @@ -0,0 +1 @@ +/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-cc
\ No newline at end of file diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++ new file mode 120000 index 0000000..29bf2d3 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++ @@ -0,0 +1 @@ +/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-g++
\ No newline at end of file diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/c++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/c++ new file mode 120000 index 0000000..b13ecea --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/c++ @@ -0,0 +1 @@ +/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-c++
\ No newline at end of file diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/cc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/cc new file mode 120000 index 0000000..9701ec5 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/cc @@ -0,0 +1 @@ +/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-cc
\ No newline at end of file diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/g++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/g++ new file mode 120000 index 0000000..5869038 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/g++ @@ -0,0 +1 @@ +/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-g++
\ No newline at end of file |