summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorYves Fischer <yves.fischer@cern.ch>2016-02-15 17:45:07 +0100
committerYves Fischer <yves.fischer@cern.ch>2016-02-15 17:45:07 +0100
commit7a0dc250a73b8b289ab416bd492582fcbbeb6015 (patch)
tree383403e517abb42f517252e27447a51a15a2b2fd /packages
parent37175c8ac467db648a7e5ceb7c5216c2db12b8fc (diff)
downloaddebian-packages-7a0dc250a73b8b289ab416bd492582fcbbeb6015.tar.gz
debian-packages-7a0dc250a73b8b289ab416bd492582fcbbeb6015.zip
oraclejdk java7
Diffstat (limited to 'packages')
-rw-r--r--packages/cern-scripts/resources/lib/environments.inc.sh31
-rw-r--r--packages/oraclejdk/build.gradle21
-rw-r--r--packages/oraclejdk/oraclejdk7/build.gradle8
-rw-r--r--packages/oraclejdk/oraclejdk8/build.gradle8
-rw-r--r--packages/oraclejdk8/build.gradle22
5 files changed, 58 insertions, 32 deletions
diff --git a/packages/cern-scripts/resources/lib/environments.inc.sh b/packages/cern-scripts/resources/lib/environments.inc.sh
index a9398bc..8960d95 100644
--- a/packages/cern-scripts/resources/lib/environments.inc.sh
+++ b/packages/cern-scripts/resources/lib/environments.inc.sh
@@ -1,24 +1,40 @@
-function __env_ideajava8() {
- export PATH=/opt/idea-iu15/bin:$PATH
+function __sub_java7() {
+ export JAVA_HOME=/usr/lib/jvm/java-7-oraclejdk
+ export PATH=$JAVA_HOME/bin:$PATH
+}
- export JAVA_HOME=/usr/lib/jvm/java-8.66-oraclejdk
+function __sub_java8() {
+ export JAVA_HOME=/usr/lib/jvm/java-8-oraclejdk
export PATH=$JAVA_HOME/bin:$PATH
+}
+function __sub_tools() {
+ export PATH=/opt/idea-iu15/bin:$PATH
export PATH=/opt/gwt-chromium/bin:$PATH
export PATH=/opt/grails3/bin:$PATH
export PATH=/opt/cern-scripts/bin:$PATH
-
+
export TNS_ADMIN=/home/yfischer/.cache/tnsnames/admin_localhost
export JAVA_OPTS="-Doracle.net.tns_admin=$TNS_ADMIN"
export GRADLE_OPTS="-Doracle.net.tns_admin=$TNS_ADMIN"
+}
- export PATH=/opt/gwt-chromium/bin:$PATH
+function __env_ideajava8() {
+ __sub_java8
+ __sub_tools
+}
+
+function __env_ideajava7() {
+ __sub_java7
+ __sub_tools
}
function __env_fwk24() {
+ __sub_java7
+
export PATH=/opt/idea-iu15/bin:$PATH
export PATH=/opt/gwt-chromium/bin:$PATH
export PATH=/opt/grails2.2.1/bin:$PATH
@@ -27,9 +43,4 @@ function __env_fwk24() {
export TNS_ADMIN=/home/yfischer/.cache/tnsnames/admin_localhost
export JAVA_OPTS="-Doracle.net.tns_admin=$TNS_ADMIN"
export GRADLE_OPTS="-Doracle.net.tns_admin=$TNS_ADMIN"
-
- export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/
- export PATH=$JAVA_HOME/bin:$PATH
}
-
-
diff --git a/packages/oraclejdk/build.gradle b/packages/oraclejdk/build.gradle
new file mode 100644
index 0000000..6c1e3d6
--- /dev/null
+++ b/packages/oraclejdk/build.gradle
@@ -0,0 +1,21 @@
+import org.xapek.yvesf.gradle.DownloadTask
+
+subprojects {
+ task download(type: DownloadTask) {}
+
+ task untar(type: Copy) {
+ into file("${buildDir}/unpacked/dist")
+ eachFile { FileCopyDetails fcd ->
+ fcd.path = fcd.path.substring(path.indexOf('/') + 1)
+ }
+ }
+ untar.dependsOn(download)
+
+ ospackage {
+ from untar.outputs.files
+ }
+
+ project.afterEvaluate {
+ untar.from tarTree(download.destFile)
+ }
+} \ No newline at end of file
diff --git a/packages/oraclejdk/oraclejdk7/build.gradle b/packages/oraclejdk/oraclejdk7/build.gradle
new file mode 100644
index 0000000..901f586
--- /dev/null
+++ b/packages/oraclejdk/oraclejdk7/build.gradle
@@ -0,0 +1,8 @@
+version '7.80'
+
+download.source 'http://ftp.heanet.ie/mirrors/funtoo/distfiles/oracle-java/jdk-7u80-linux-x64.tar.gz'
+download.sha256sum 'bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623'
+
+ospackage {
+ into '/usr/lib/jvm/java-7-oraclejdk'
+} \ No newline at end of file
diff --git a/packages/oraclejdk/oraclejdk8/build.gradle b/packages/oraclejdk/oraclejdk8/build.gradle
new file mode 100644
index 0000000..a0d7f95
--- /dev/null
+++ b/packages/oraclejdk/oraclejdk8/build.gradle
@@ -0,0 +1,8 @@
+version '8.66'
+
+download.source 'http://ftp.heanet.ie/mirrors/funtoo/distfiles/oracle-java/jdk-8u66-linux-x64.tar.gz'
+download.sha256sum 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+
+ospackage {
+ into '/usr/lib/jvm/java-8-oraclejdk'
+} \ No newline at end of file
diff --git a/packages/oraclejdk8/build.gradle b/packages/oraclejdk8/build.gradle
deleted file mode 100644
index 670b681..0000000
--- a/packages/oraclejdk8/build.gradle
+++ /dev/null
@@ -1,22 +0,0 @@
-import org.xapek.yvesf.gradle.DownloadTask
-
-version '8.66'
-
-task download(type: DownloadTask) {
- source "http://ftp.heanet.ie/mirrors/funtoo/distfiles/oracle-java/jdk-8u66-linux-x64.tar.gz"
- sha256sum 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
-}
-
-task untar(type: Copy) {
- into file("${buildDir}/unpacked/dist")
- from (tarTree(download.destFile))
- eachFile { FileCopyDetails fcd ->
- fcd.path = fcd.path.substring(path.indexOf('/')+1)
- }
-}
-untar.dependsOn(download)
-
-ospackage {
- into "/usr/lib/jvm/java-8-oraclejdk"
- from untar.outputs.files
-}