From 3a98625c382e1f279a762f39d07322cb678d5e18 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 15 Feb 2014 03:46:52 +0100 Subject: [PATCH] jre: add subpackage jdk --- common/shlibs | 1 + srcpkgs/jdk | 1 + srcpkgs/jre/files/{jre.sh => java.sh} | 0 srcpkgs/jre/template | 118 ++++++++++++++++++++------ 4 files changed, 94 insertions(+), 26 deletions(-) create mode 120000 srcpkgs/jdk rename srcpkgs/jre/files/{jre.sh => java.sh} (100%) diff --git a/common/shlibs b/common/shlibs index cf34a609cf..3e82c373ec 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1469,3 +1469,4 @@ libstdlog.so.0 liblogging-1.0.0_1 libdom.so.0 libdom-0.0.1_1 libslang.so.2 slang-2.2.4_1 libtre.so.5 tre-0.8.0_1 +libjli.so jre-7u45_2 diff --git a/srcpkgs/jdk b/srcpkgs/jdk new file mode 120000 index 0000000000..6f3c4deb03 --- /dev/null +++ b/srcpkgs/jdk @@ -0,0 +1 @@ +jre \ No newline at end of file diff --git a/srcpkgs/jre/files/jre.sh b/srcpkgs/jre/files/java.sh similarity index 100% rename from srcpkgs/jre/files/jre.sh rename to srcpkgs/jre/files/java.sh diff --git a/srcpkgs/jre/template b/srcpkgs/jre/template index c51e4ad374..684d92abbe 100644 --- a/srcpkgs/jre/template +++ b/srcpkgs/jre/template @@ -2,14 +2,14 @@ pkgname=jre _extraversion=1.7.0_45 version=7u45 -revision=1 -wrksrc="jre${_extraversion}" +revision=2 +wrksrc="jdk${_extraversion}" if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/7/jre-${version}-linux-x64.tar.gz" - checksum=e107d8ca8dcd570207b4eff793e7b83a1ff82f1ed4ea8a80d88f5edc000c74c7 + distfiles="http://ghaffarian.net/downloads/Java/JDK/jdk-${version}-linux-x64.tar.gz" + checksum=f2eae4d81c69dfa79d02466d1cb34db2b628815731ffc36e9b98f96f46f94b1a elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then - distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/7/jre-${version}-linux-i586.tar.gz" - checksum=c6cec1ce57bc9b8b425f26e4e57ccdffc9667e4daf8ddca0d695e2db108ab233 + distfiles="http://ghaffarian.net/downloads/Java/JDK/jdk-${version}-linux-i586.tar.gz" + checksum=4acbdc25d0acad7c765b65c13cda44150200c33507bfe8b5ce6cabcab3e016e0 fi short_desc="Oracle's Java Runtime Environment (JRE) - Version 7" maintainer="davehome " @@ -25,32 +25,41 @@ replaces="java-runtime>=0" do_install() { # Install desktop related items vmkdir usr/share - vcopy lib/desktop/icons usr/share - vcopy lib/desktop/applications usr/share - vcopy lib/desktop/mime usr/share - vcopy lib/locale usr/share + vcopy jre/lib/desktop/icons usr/share + vcopy jre/lib/desktop/applications usr/share + vcopy jre/lib/desktop/mime usr/share + vcopy jre/lib/locale usr/share vcopy man usr/share rm -rf ${DESTDIR}/usr/share/man/ja # Install license(s) - vmkdir usr/share/licenses/jre - vcopy COPYRIGHT usr/share/licenses/jre - vcopy LICENSE usr/share/licenses/jre - vcopy THIRDPARTYLICENSEREADME.txt usr/share/licenses/jre + vmkdir usr/share/licenses/java + vcopy COPYRIGHT usr/share/licenses/java + vcopy LICENSE usr/share/licenses/java + vcopy THIRDPARTYLICENSEREADME.txt usr/share/licenses/java + vcopy THIRDPARTYLICENSEREADME-JAVAFX.txt usr/share/licenses/java # For system environment vars and desktop extra shortcut - vinstall ${FILESDIR}/jre.sh 644 etc/profile.d + vinstall ${FILESDIR}/java.sh 644 etc/profile.d vinstall ${FILESDIR}/java-policy-settings.desktop 644 usr/share/applications - # Install JRE - vmkdir usr/share/java/jre - vcopy bin usr/share/java/jre - vcopy lib usr/share/java/jre - vcopy release usr/share/java/jre - vcopy Welcome.html usr/share/java/jre + vmkdir usr/share/java + vmkdir usr/share/java/bin + vmkdir usr/share/java/lib - rm -rf ${DESTDIR}/usr/share/java/jre/lib/desktop - rm -rf ${DESTDIR}/usr/share/java/jre/lib/locale + # Install JDK + vcopy "bin/*" "usr/share/java/bin" + vcopy "lib/*" "usr/share/java/lib" + vcopy README.html usr/share/java + + # Install JRE + vcopy "jre/bin/*" "usr/share/java/bin" + vcopy "jre/lib/*" "usr/share/java/lib" + vcopy jre/Welcome.html usr/share/java + vcopy release usr/share/java + + rm -rf ${DESTDIR}/usr/share/java/lib/desktop + rm -rf ${DESTDIR}/usr/share/java/lib/locale # Install mozilla compatible plugin. vmkdir usr/lib/mozilla/plugins @@ -62,14 +71,71 @@ do_install() { fi # Remove shlib linking to old ffmpeg libraries. - rm -f ${DESTDIR}/usr/share/java/jre/lib/${_arch}/fxavcodecplugin-52.so + rm -f ${DESTDIR}/usr/share/java/lib/${_arch}/fxavcodecplugin-52.so cd ${DESTDIR}/usr/lib/mozilla/plugins - ln -sf ../../../share/java/jre/lib/${_arch}/libnpjp2.so . + ln -sf ../../../share/java/lib/${_arch}/libnpjp2.so . # linker's config vmkdir etc/ld.so.conf.d - echo "/usr/share/java/jre/lib/${_arch}" > \ + echo "/usr/share/java/lib/${_arch}" > \ ${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf } + +jdk_package() { + short_desc="Oracle's Java Development Kit (JDK) - Version 7" + depends="jre>=${version}_${revision}" + pkg_install() { + vmove "usr/share/java/README.html" + vmove "usr/share/licenses/java/THIRDPARTYLICENSEREADME-JAVAFX.txt" + + vmove "usr/share/java/lib/ant-javafx.jar" + vmove "usr/share/java/lib/ct.sym" + vmove "usr/share/java/lib/dt.jar" + vmove "usr/share/java/lib/ir.idl" + vmove "usr/share/java/lib/javafx-doclet.jar" + vmove "usr/share/java/lib/javafx-mx.jar" + vmove "usr/share/java/lib/jconsole.jar" + vmove "usr/share/java/lib/missioncontrol" + vmove "usr/share/java/lib/orb.idl" + vmove "usr/share/java/lib/sa-jdi.jar" + vmove "usr/share/java/lib/tools.jar" + vmove "usr/share/java/lib/visualvm" + + vmove "usr/share/java/bin/appletviewer" + vmove "usr/share/java/bin/apt" + vmove "usr/share/java/bin/extcheck" + vmove "usr/share/java/bin/idlj" + vmove "usr/share/java/bin/jar" + vmove "usr/share/java/bin/jarsigner" + vmove "usr/share/java/bin/java-rmi.cgi" + vmove "usr/share/java/bin/javac" + vmove "usr/share/java/bin/javadoc" + vmove "usr/share/java/bin/javafxpackager" + vmove "usr/share/java/bin/javah" + vmove "usr/share/java/bin/javap" + vmove "usr/share/java/bin/jcmd" + vmove "usr/share/java/bin/jconsole" + vmove "usr/share/java/bin/jdb" + vmove "usr/share/java/bin/jhat" + vmove "usr/share/java/bin/jinfo" + vmove "usr/share/java/bin/jmap" + vmove "usr/share/java/bin/jmc" + vmove "usr/share/java/bin/jmc.ini" + vmove "usr/share/java/bin/jps" + vmove "usr/share/java/bin/jrunscript" + vmove "usr/share/java/bin/jsadebugd" + vmove "usr/share/java/bin/jstack" + vmove "usr/share/java/bin/jstat" + vmove "usr/share/java/bin/jstatd" + vmove "usr/share/java/bin/jvisualvm" + vmove "usr/share/java/bin/native2ascii" + vmove "usr/share/java/bin/rmic" + vmove "usr/share/java/bin/schemagen" + vmove "usr/share/java/bin/serialver" + vmove "usr/share/java/bin/wsgen" + vmove "usr/share/java/bin/wsimport" + vmove "usr/share/java/bin/xjc" + } +}