[arch-commits] Commit in java8-openjdk/repos/extra-x86_64 (8 files)
Levente Polyak
anthraxx at archlinux.org
Thu Apr 26 00:23:37 UTC 2018
Date: Thursday, April 26, 2018 @ 00:23:36
Author: anthraxx
Revision: 323017
archrelease: copy trunk to extra-x86_64
Added:
java8-openjdk/repos/extra-x86_64/PKGBUILD
(from rev 323016, java8-openjdk/trunk/PKGBUILD)
java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh
(from rev 323016, java8-openjdk/trunk/install_jdk8-openjdk.sh)
java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh
(from rev 323016, java8-openjdk/trunk/install_jre8-openjdk-headless.sh)
java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh
(from rev 323016, java8-openjdk/trunk/install_jre8-openjdk.sh)
Deleted:
java8-openjdk/repos/extra-x86_64/PKGBUILD
java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh
java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh
java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh
----------------------------------+
PKGBUILD | 570 ++++++++++++++++++-------------------
install_jdk8-openjdk.sh | 100 +++---
install_jre8-openjdk-headless.sh | 96 +++---
install_jre8-openjdk.sh | 110 +++----
4 files changed, 438 insertions(+), 438 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-26 00:23:28 UTC (rev 323016)
+++ PKGBUILD 2018-04-26 00:23:36 UTC (rev 323017)
@@ -1,285 +0,0 @@
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Boyan Ding <stu_dby at 126.com>
-
-# TODO
-# once icedtea:
-# pulse
-# add policytool desktop files
-
-# Package 'openjfx' must be updated when this one is
-pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc')
-pkgbase=java8-openjdk
-_java_ver=8
-# Found @ http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
-_jdk_update=162
-_jdk_build=12
-pkgver=${_java_ver}.u${_jdk_update}
-_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=2
-arch=('x86_64')
-url='http://openjdk.java.net/'
-license=('custom')
-makedepends=('jdk7-openjdk' 'ccache' 'cpio' 'unzip' 'zip'
- 'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
-_url_src=http://hg.openjdk.java.net/jdk8u/jdk8u
-source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
- corba-${_repo_ver}.tar.gz::${_url_src}/corba/archive/${_repo_ver}.tar.gz
- hotspot-${_repo_ver}.tar.gz::${_url_src}/hotspot/archive/${_repo_ver}.tar.gz
- jdk-${_repo_ver}.tar.gz::${_url_src}/jdk/archive/${_repo_ver}.tar.gz
- jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz
- jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
- langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
- nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
-
-sha256sums=('7ad155f34bae7bfb43b5f74972f61cf2d390be9d068d7825af8416fe098f15b1'
- 'd45747d3ef7bfff09e48391b10e9264619c2e3c65708cdf62fa3c4c4f724bf88'
- '9614ed1e9eb7e1ad9ee206272e761cbdb0d24193f4e70fad853ae1e8eb668af4'
- '1809fc11f8d5bd4817ac8be30493d0c6ae994c2f089101040345aed39cabe40d'
- 'c576306038e548071a0c9904dd0ef82e1ada4dba8acf865b065672356c256dde'
- 'c45c2bc4519992d78666c81b5faa33d7b40e268c8ae5c17ac1b7726fdf8e16d4'
- 'b0dae1ddc9113d6ce5e7afc0a75284f913ab2d8f21c56b2378962037947629ec'
- 'b8a89d7870c332055e4bde9ca7a4183b4de1a280709de29f18a6867dd1eb8296')
-
-case "${CARCH}" in
- 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
- 'i686' ) _JARCH=i386 ; _DOC_ARCH=x86 ;;
-esac
-
-_jdkname=openjdk8
-_jvmdir=/usr/lib/jvm/java-8-openjdk
-_prefix="jdk8u-${_repo_ver}/image"
-_imgdir="${_prefix}/jvm/openjdk-1.8.0_$(printf '%.2d' ${_jdk_update})"
-_nonheadless=(bin/policytool
- lib/${_JARCH}/libjsound.so
- lib/${_JARCH}/libjsoundalsa.so
- lib/${_JARCH}/libsplashscreen.so)
-
-prepare() {
- cd "${srcdir}/jdk8u-${_repo_ver}"
-
- for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
- do
- ln -s ../${subrepo}-${_repo_ver} ${subrepo}
- done
-}
-
-build() {
- cd "${srcdir}/jdk8u-${_repo_ver}"
-
- unset JAVA_HOME
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346
- export MAKEFLAGS=${MAKEFLAGS/-j*}
- # https://hydra.nixos.org/build/41230444/log
- export CFLAGS="-Wno-error=deprecated-declarations -fno-lifetime-dse -fno-delete-null-pointer-checks"
-
- install -d -m 755 "${srcdir}/${_prefix}/"
- sh configure \
- --prefix="${srcdir}/${_prefix}" \
- --with-update-version="${_jdk_update}" \
- --with-build-number="b${_jdk_build}" \
- --with-milestone="fcs" \
- --enable-unlimited-crypto \
- --with-zlib=system
-
- # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed)
- #--with-giflib=system \
-
- # Without 'DEBUG_BINARIES', i686 won't build
- # http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html
- make \
- DEBUG_BINARIES=true
- # These help to debug builds:
- #LOG=trace HOTSPOT_BUILD_JOBS=1
-
- make docs
-
- # FIXME sadly 'DESTDIR' is not used here!
- make install
-
- cd "${srcdir}/${_imgdir}"
-
- # A lot of build stuff were directly taken from
- # http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/tree/java-1.8.0-openjdk.spec
-
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
- find . -iname '*.jar' -exec chmod ugo+r {} \;
- chmod ugo+r lib/ct.sym
-
- # remove redundant *diz and *debuginfo files
- find . -iname '*.diz' -exec rm {} \;
- find . -iname '*.debuginfo' -exec rm {} \;
-}
-
-#check() {
-# cd "${srcdir}/${pkgname}-${pkgver}"
-# make -k check
-#}
-
-package_jre8-openjdk-headless() {
- pkgdesc='OpenJDK Java 8 headless runtime environment'
- depends=('java-runtime-common' 'ca-certificates-utils' 'nss')
- optdepends=('java-rhino: for some JavaScript support')
- provides=('java-runtime-headless=8' 'java-runtime-headless-openjdk=8')
- # Upstream config files that should go to etc and get backup
- _backup_etc=(etc/java-8-openjdk/${_JARCH}/jvm.cfg
- etc/java-8-openjdk/calendars.properties
- etc/java-8-openjdk/content-types.properties
- etc/java-8-openjdk/flavormap.properties
- etc/java-8-openjdk/images/cursors/cursors.properties
- etc/java-8-openjdk/logging.properties
- etc/java-8-openjdk/management/jmxremote.access
- etc/java-8-openjdk/management/jmxremote.password
- etc/java-8-openjdk/management/management.properties
- etc/java-8-openjdk/management/snmp.acl
- etc/java-8-openjdk/net.properties
- etc/java-8-openjdk/psfont.properties.ja
- etc/java-8-openjdk/psfontj2d.properties
- etc/java-8-openjdk/security/java.policy
- etc/java-8-openjdk/security/java.security
- etc/java-8-openjdk/sound.properties)
- replaces=('jre8-openjdk-headless-wm')
- backup=(${_backup_etc[@]})
- install=install_jre8-openjdk-headless.sh
-
- cd "${srcdir}/${_imgdir}/jre"
-
- install -d -m 755 "${pkgdir}${_jvmdir}/jre/"
- cp -a bin lib "${pkgdir}${_jvmdir}/jre"
-
- # Set config files
- mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,}
- mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,}
-
- # Remove 'non-headless' lib files
- for f in ${_nonheadless[@]}; do
- rm "${pkgdir}${_jvmdir}/jre/${f}"
- done
-
- # Man pages
- pushd "${pkgdir}${_jvmdir}/jre/bin"
- install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
- for file in *; do
- install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
- "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1"
- install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
- "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1"
- done
- popd
-
- # Link JKS keystore from ca-certificates-utils
- rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
- ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
-
- # Install license
- install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
- install -m 644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
- "${pkgdir}/usr/share/licenses/${pkgbase}"
- ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-
- # Move config files that were set in _backup_etc from ./lib to /etc
- for file in ${_backup_etc[@]}; do
- _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-8-openjdk/}
- install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}"
- ln -sf /${file} "${pkgdir}${_filepkgpath}"
- done
-}
-
-package_jre8-openjdk() {
- pkgdesc='OpenJDK Java 8 full runtime environment'
- depends=("jre8-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
- optdepends=('icedtea-web: web browser plugin + Java Web Start'
- 'alsa-lib: for basic sound support'
- 'gtk2: for the Gtk+ look and feel - desktop usage'
- 'java-openjfx: for JavaFX GUI components support')
- # TODO when adding IcedTea: 'giflib: for gif format support'
- # TODO when adding IcedTea: 'libpulse: for advanced sound support'
- provides=('java-runtime=8' 'java-runtime-openjdk=8')
- install=install_jre8-openjdk.sh
- replaces=('jre8-openjdk-wm')
-
- cd "${srcdir}/${_imgdir}/jre"
-
- # TODO? Should /usr/lib/jvm/java-8-openjdk/jre/lib/sound.properties belong to jre?
- for f in ${_nonheadless[@]}; do
- install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}"
- done
-
- # Man pages
- pushd "${pkgdir}${_jvmdir}/jre/bin"
- install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
- for file in *; do
- install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
- "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1"
- install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
- "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1"
- done
- popd
-
- # Desktop files
- # TODO add these when switching to IcedTea
- #install -D -m 644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" \
- # "${pkgdir}/usr/share/applications/policytool.desktop"
-
- # Install license
- install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
- ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_jdk8-openjdk() {
- pkgdesc='OpenJDK Java 8 development kit'
- depends=('java-environment-common' "jre8-openjdk=${pkgver}-${pkgrel}")
- provides=('java-environment=8' 'java-environment-openjdk=8')
- replaces=('jdk8-openjdk-wm')
- install=install_jdk8-openjdk.sh
-
- cd "${srcdir}/${_imgdir}"
-
- # Main files
- install -d -m 755 "${pkgdir}${_jvmdir}"
-
- cp -a include lib "${pkgdir}${_jvmdir}"
-
- # 'bin' files
- pushd bin
-
- # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
- for b in $(ls | grep -v java-rmi.cgi); do
- if [ -e ../jre/bin/${b} ]; then
- # Provide a link of the jre binary in the jdk/bin/ directory
- ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}"
- else
- # Copy binary to jdk/bin/
- install -D -m 755 ${b} "${pkgdir}${_jvmdir}/bin/${b}"
- # Copy man page
- install -D -m 644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}-${_jdkname}.1"
- install -D -m 644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}-${_jdkname}.1"
- fi
- done
- popd
-
- # Handling 'java-rmi.cgi' separately
- install -D -m 755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
-
- # Desktop files.
- # TODO add these when switching to IcedTea
- #install -m 644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" \
- # "${pkgdir}/usr/share/applications"
-
- # link license
- install -d -m 755 "${pkgdir}/usr/share/licenses/"
- ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_openjdk8-src() {
- pkgdesc='OpenJDK Java 8 sources'
-
- install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip"
-}
-
-package_openjdk8-doc() {
- pkgdesc='OpenJDK Java 8 documentation'
-
- install -d -m 755 "${pkgdir}/usr/share/doc/${pkgbase}/"
- cp -r "${srcdir}"/jdk8u-${_repo_ver}/build/linux-${_DOC_ARCH}-normal-server-release/docs/* \
- "${pkgdir}/usr/share/doc/${pkgbase}/"
-}
Copied: java8-openjdk/repos/extra-x86_64/PKGBUILD (from rev 323016, java8-openjdk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-04-26 00:23:36 UTC (rev 323017)
@@ -0,0 +1,285 @@
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Boyan Ding <stu_dby at 126.com>
+
+# TODO
+# once icedtea:
+# pulse
+# add policytool desktop files
+
+# Package 'openjfx' must be updated when this one is
+pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc')
+pkgbase=java8-openjdk
+_java_ver=8
+# Found @ http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
+_jdk_update=172
+_jdk_build=11
+pkgver=${_java_ver}.u${_jdk_update}
+_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
+pkgrel=2
+arch=('x86_64')
+url='http://openjdk.java.net/'
+license=('custom')
+makedepends=('jdk7-openjdk' 'ccache' 'cpio' 'unzip' 'zip'
+ 'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
+_url_src=http://hg.openjdk.java.net/jdk8u/jdk8u
+source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
+ corba-${_repo_ver}.tar.gz::${_url_src}/corba/archive/${_repo_ver}.tar.gz
+ hotspot-${_repo_ver}.tar.gz::${_url_src}/hotspot/archive/${_repo_ver}.tar.gz
+ jdk-${_repo_ver}.tar.gz::${_url_src}/jdk/archive/${_repo_ver}.tar.gz
+ jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz
+ jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
+ langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
+ nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
+
+sha256sums=('f1ca31605360594cb57b21aa5888f253e9775125957f96afb1a9dbb71676af22'
+ 'a89b558a4bb1d0368486a58d248a16b1760f8536fdc94ff70bf09e5c1bfcea24'
+ 'f7a2652021b50d43c076df8f94cec13b82e2704c0d1535289074cb5e0eec31a0'
+ '756b6855c9bdb7ae1ac4b7a4d2bafcbdad4ab6dd33ccc64efb94f9d4f21273d3'
+ '8ad3b70c468cce6104f023ca5f4354462a47a38d9dc25994a6d04b2c18598432'
+ '0193ff13167f6ff7d667cd32dd2d05e4591975a4404b433c9ff59d2d4ce54603'
+ 'ef0f2042143cf6ddc508d81978fdb7cd900d38e5b166f40112d1967ceb09f036'
+ '2a3bff4dfca022cb603cd46a6766fd1b7212adb473af5809b48504576bce6029')
+
+case "${CARCH}" in
+ 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
+ 'i686' ) _JARCH=i386 ; _DOC_ARCH=x86 ;;
+esac
+
+_jdkname=openjdk8
+_jvmdir=/usr/lib/jvm/java-8-openjdk
+_prefix="jdk8u-${_repo_ver}/image"
+_imgdir="${_prefix}/jvm/openjdk-1.8.0_$(printf '%.2d' ${_jdk_update})"
+_nonheadless=(bin/policytool
+ lib/${_JARCH}/libjsound.so
+ lib/${_JARCH}/libjsoundalsa.so
+ lib/${_JARCH}/libsplashscreen.so)
+
+prepare() {
+ cd "${srcdir}/jdk8u-${_repo_ver}"
+
+ for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
+ do
+ ln -s ../${subrepo}-${_repo_ver} ${subrepo}
+ done
+}
+
+build() {
+ cd "${srcdir}/jdk8u-${_repo_ver}"
+
+ unset JAVA_HOME
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346
+ export MAKEFLAGS=${MAKEFLAGS/-j*}
+ # https://hydra.nixos.org/build/41230444/log
+ export CFLAGS="-Wno-error=deprecated-declarations -fno-lifetime-dse -fno-delete-null-pointer-checks"
+
+ install -d -m 755 "${srcdir}/${_prefix}/"
+ sh configure \
+ --prefix="${srcdir}/${_prefix}" \
+ --with-update-version="${_jdk_update}" \
+ --with-build-number="b${_jdk_build}" \
+ --with-milestone="fcs" \
+ --enable-unlimited-crypto \
+ --with-zlib=system
+
+ # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed)
+ #--with-giflib=system \
+
+ # Without 'DEBUG_BINARIES', i686 won't build
+ # http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html
+ make \
+ DEBUG_BINARIES=true
+ # These help to debug builds:
+ #LOG=trace HOTSPOT_BUILD_JOBS=1
+
+ make docs
+
+ # FIXME sadly 'DESTDIR' is not used here!
+ make install
+
+ cd "${srcdir}/${_imgdir}"
+
+ # A lot of build stuff were directly taken from
+ # http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/tree/java-1.8.0-openjdk.spec
+
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+ find . -iname '*.jar' -exec chmod ugo+r {} \;
+ chmod ugo+r lib/ct.sym
+
+ # remove redundant *diz and *debuginfo files
+ find . -iname '*.diz' -exec rm {} \;
+ find . -iname '*.debuginfo' -exec rm {} \;
+}
+
+#check() {
+# cd "${srcdir}/${pkgname}-${pkgver}"
+# make -k check
+#}
+
+package_jre8-openjdk-headless() {
+ pkgdesc='OpenJDK Java 8 headless runtime environment'
+ depends=('java-runtime-common' 'ca-certificates-utils' 'nss')
+ optdepends=('java-rhino: for some JavaScript support')
+ provides=('java-runtime-headless=8' 'java-runtime-headless-openjdk=8')
+ # Upstream config files that should go to etc and get backup
+ _backup_etc=(etc/java-8-openjdk/${_JARCH}/jvm.cfg
+ etc/java-8-openjdk/calendars.properties
+ etc/java-8-openjdk/content-types.properties
+ etc/java-8-openjdk/flavormap.properties
+ etc/java-8-openjdk/images/cursors/cursors.properties
+ etc/java-8-openjdk/logging.properties
+ etc/java-8-openjdk/management/jmxremote.access
+ etc/java-8-openjdk/management/jmxremote.password
+ etc/java-8-openjdk/management/management.properties
+ etc/java-8-openjdk/management/snmp.acl
+ etc/java-8-openjdk/net.properties
+ etc/java-8-openjdk/psfont.properties.ja
+ etc/java-8-openjdk/psfontj2d.properties
+ etc/java-8-openjdk/security/java.policy
+ etc/java-8-openjdk/security/java.security
+ etc/java-8-openjdk/sound.properties)
+ replaces=('jre8-openjdk-headless-wm')
+ backup=(${_backup_etc[@]})
+ install=install_jre8-openjdk-headless.sh
+
+ cd "${srcdir}/${_imgdir}/jre"
+
+ install -d -m 755 "${pkgdir}${_jvmdir}/jre/"
+ cp -a bin lib "${pkgdir}${_jvmdir}/jre"
+
+ # Set config files
+ mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,}
+ mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,}
+
+ # Remove 'non-headless' lib files
+ for f in ${_nonheadless[@]}; do
+ rm "${pkgdir}${_jvmdir}/jre/${f}"
+ done
+
+ # Man pages
+ pushd "${pkgdir}${_jvmdir}/jre/bin"
+ install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
+ for file in *; do
+ install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1"
+ install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1"
+ done
+ popd
+
+ # Link JKS keystore from ca-certificates-utils
+ rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
+ ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
+
+ # Install license
+ install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
+ install -m 644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
+ "${pkgdir}/usr/share/licenses/${pkgbase}"
+ ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+
+ # Move config files that were set in _backup_etc from ./lib to /etc
+ for file in ${_backup_etc[@]}; do
+ _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-8-openjdk/}
+ install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}"
+ ln -sf /${file} "${pkgdir}${_filepkgpath}"
+ done
+}
+
+package_jre8-openjdk() {
+ pkgdesc='OpenJDK Java 8 full runtime environment'
+ depends=("jre8-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
+ optdepends=('icedtea-web: web browser plugin + Java Web Start'
+ 'alsa-lib: for basic sound support'
+ 'gtk2: for the Gtk+ look and feel - desktop usage'
+ 'java-openjfx: for JavaFX GUI components support')
+ # TODO when adding IcedTea: 'giflib: for gif format support'
+ # TODO when adding IcedTea: 'libpulse: for advanced sound support'
+ provides=('java-runtime=8' 'java-runtime-openjdk=8')
+ install=install_jre8-openjdk.sh
+ replaces=('jre8-openjdk-wm')
+
+ cd "${srcdir}/${_imgdir}/jre"
+
+ # TODO? Should /usr/lib/jvm/java-8-openjdk/jre/lib/sound.properties belong to jre?
+ for f in ${_nonheadless[@]}; do
+ install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}"
+ done
+
+ # Man pages
+ pushd "${pkgdir}${_jvmdir}/jre/bin"
+ install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
+ for file in *; do
+ install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1"
+ install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1"
+ done
+ popd
+
+ # Desktop files
+ # TODO add these when switching to IcedTea
+ #install -D -m 644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" \
+ # "${pkgdir}/usr/share/applications/policytool.desktop"
+
+ # Install license
+ install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
+ ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_jdk8-openjdk() {
+ pkgdesc='OpenJDK Java 8 development kit'
+ depends=('java-environment-common' "jre8-openjdk=${pkgver}-${pkgrel}")
+ provides=('java-environment=8' 'java-environment-openjdk=8')
+ replaces=('jdk8-openjdk-wm')
+ install=install_jdk8-openjdk.sh
+
+ cd "${srcdir}/${_imgdir}"
+
+ # Main files
+ install -d -m 755 "${pkgdir}${_jvmdir}"
+
+ cp -a include lib "${pkgdir}${_jvmdir}"
+
+ # 'bin' files
+ pushd bin
+
+ # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
+ for b in $(ls | grep -v java-rmi.cgi); do
+ if [ -e ../jre/bin/${b} ]; then
+ # Provide a link of the jre binary in the jdk/bin/ directory
+ ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}"
+ else
+ # Copy binary to jdk/bin/
+ install -D -m 755 ${b} "${pkgdir}${_jvmdir}/bin/${b}"
+ # Copy man page
+ install -D -m 644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}-${_jdkname}.1"
+ install -D -m 644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}-${_jdkname}.1"
+ fi
+ done
+ popd
+
+ # Handling 'java-rmi.cgi' separately
+ install -D -m 755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
+
+ # Desktop files.
+ # TODO add these when switching to IcedTea
+ #install -m 644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" \
+ # "${pkgdir}/usr/share/applications"
+
+ # link license
+ install -d -m 755 "${pkgdir}/usr/share/licenses/"
+ ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_openjdk8-src() {
+ pkgdesc='OpenJDK Java 8 sources'
+
+ install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip"
+}
+
+package_openjdk8-doc() {
+ pkgdesc='OpenJDK Java 8 documentation'
+
+ install -d -m 755 "${pkgdir}/usr/share/doc/${pkgbase}/"
+ cp -r "${srcdir}"/jdk8u-${_repo_ver}/build/linux-${_DOC_ARCH}-normal-server-release/docs/* \
+ "${pkgdir}/usr/share/doc/${pkgbase}/"
+}
Deleted: install_jdk8-openjdk.sh
===================================================================
--- install_jdk8-openjdk.sh 2018-04-26 00:23:28 UTC (rev 323016)
+++ install_jdk8-openjdk.sh 2018-04-26 00:23:36 UTC (rev 323017)
@@ -1,50 +0,0 @@
-THIS_JDK='java-8-openjdk'
-
-fix_default() {
- if [ ! -x /usr/bin/java ]; then
- /usr/bin/archlinux-java unset
- echo ""
- else
- /usr/bin/archlinux-java get
- fi
-}
-
-post_install() {
- default=$(fix_default)
- case ${default} in
- "" | ${THIS_JDK}/jre)
- /usr/bin/archlinux-java set ${THIS_JDK}
- ;;
- ${THIS_JDK})
- # Nothing
- ;;
- *)
- echo "Default Java environment is already set to '${default}'"
- echo "See 'archlinux-java help' to change it"
- ;;
- esac
-
- if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
- fi
-}
-
-post_upgrade() {
- default=$(fix_default)
- if [ -z "${default}" -o "x${default}" = "x${THIS_JDK}/jre" ]; then
- /usr/bin/archlinux-java set ${THIS_JDK}
- fi
-
- if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
- fi
-}
-
-pre_remove() {
- if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
- /usr/bin/archlinux-java unset
- if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then
- /usr/bin/archlinux-java set ${THIS_JDK}/jre
- fi
- fi
-}
Copied: java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh (from rev 323016, java8-openjdk/trunk/install_jdk8-openjdk.sh)
===================================================================
--- install_jdk8-openjdk.sh (rev 0)
+++ install_jdk8-openjdk.sh 2018-04-26 00:23:36 UTC (rev 323017)
@@ -0,0 +1,50 @@
+THIS_JDK='java-8-openjdk'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "" | ${THIS_JDK}/jre)
+ /usr/bin/archlinux-java set ${THIS_JDK}
+ ;;
+ ${THIS_JDK})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+post_upgrade() {
+ default=$(fix_default)
+ if [ -z "${default}" -o "x${default}" = "x${THIS_JDK}/jre" ]; then
+ /usr/bin/archlinux-java set ${THIS_JDK}
+ fi
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+pre_remove() {
+ if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
+ /usr/bin/archlinux-java unset
+ if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then
+ /usr/bin/archlinux-java set ${THIS_JDK}/jre
+ fi
+ fi
+}
Deleted: install_jre8-openjdk-headless.sh
===================================================================
--- install_jre8-openjdk-headless.sh 2018-04-26 00:23:28 UTC (rev 323016)
+++ install_jre8-openjdk-headless.sh 2018-04-26 00:23:36 UTC (rev 323017)
@@ -1,48 +0,0 @@
-THIS_JRE='java-8-openjdk/jre'
-
-fix_default() {
- if [ ! -x /usr/bin/java ]; then
- /usr/bin/archlinux-java unset
- echo ""
- else
- /usr/bin/archlinux-java get
- fi
-}
-
-post_install() {
- default=$(fix_default)
- case ${default} in
- "")
- /usr/bin/archlinux-java set ${THIS_JRE}
- ;;
- ${THIS_JRE} | ${THIS_JRE/\/jre})
- # Nothing
- ;;
- *)
- echo "Default Java environment is already set to '${default}'"
- echo "See 'archlinux-java help' to change it"
- ;;
- esac
-
- if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
- fi
-}
-
-post_upgrade() {
- if [ -z $(fix_default) ]; then
- /usr/bin/archlinux-java set ${THIS_JRE}
- fi
-
- if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/bin/update-ca-trust
- fi
-}
-
-pre_remove() {
- default=$(fix_default)
- if [ "x${default/\/jre}" = "x${THIS_JRE/\/jre}" ]; then
- /usr/bin/archlinux-java unset
- echo "No Java environment is set as default anymore"
- fi
-}
Copied: java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh (from rev 323016, java8-openjdk/trunk/install_jre8-openjdk-headless.sh)
===================================================================
--- install_jre8-openjdk-headless.sh (rev 0)
+++ install_jre8-openjdk-headless.sh 2018-04-26 00:23:36 UTC (rev 323017)
@@ -0,0 +1,48 @@
+THIS_JRE='java-8-openjdk/jre'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "")
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ ;;
+ ${THIS_JRE} | ${THIS_JRE/\/jre})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+post_upgrade() {
+ if [ -z $(fix_default) ]; then
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ fi
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+pre_remove() {
+ default=$(fix_default)
+ if [ "x${default/\/jre}" = "x${THIS_JRE/\/jre}" ]; then
+ /usr/bin/archlinux-java unset
+ echo "No Java environment is set as default anymore"
+ fi
+}
Deleted: install_jre8-openjdk.sh
===================================================================
--- install_jre8-openjdk.sh 2018-04-26 00:23:28 UTC (rev 323016)
+++ install_jre8-openjdk.sh 2018-04-26 00:23:36 UTC (rev 323017)
@@ -1,55 +0,0 @@
-THIS_JRE='java-8-openjdk/jre'
-
-fix_default() {
- if [ ! -x /usr/bin/java ]; then
- /usr/bin/archlinux-java unset
- echo ""
- else
- /usr/bin/archlinux-java get
- fi
-}
-
-post_install() {
- default=$(fix_default)
- case ${default} in
- "")
- /usr/bin/archlinux-java set ${THIS_JRE}
- ;;
- ${THIS_JRE} | ${THIS_JRE/\/jre})
- # Nothing
- ;;
- *)
- echo "Default Java environment is already set to '${default}'"
- echo "See 'archlinux-java help' to change it"
- ;;
- esac
-
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
- echo "when you use a non-reparenting window manager,"
- echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
-
-# update-desktop-database -q
-}
-
-post_upgrade() {
- if [ -z $(fix_default) ]; then
- /usr/bin/archlinux-java set ${THIS_JRE}
- fi
-
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-
-# update-desktop-database -q
-}
-
-pre_remove() {
- if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then
- /usr/bin/archlinux-java unset
- echo "No Java environment is set as default anymore"
- fi
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-
-# update-desktop-database -q
-}
Copied: java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh (from rev 323016, java8-openjdk/trunk/install_jre8-openjdk.sh)
===================================================================
--- install_jre8-openjdk.sh (rev 0)
+++ install_jre8-openjdk.sh 2018-04-26 00:23:36 UTC (rev 323017)
@@ -0,0 +1,55 @@
+THIS_JRE='java-8-openjdk/jre'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "")
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ ;;
+ ${THIS_JRE} | ${THIS_JRE/\/jre})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ echo "when you use a non-reparenting window manager,"
+ echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
+
+# update-desktop-database -q
+}
+
+post_upgrade() {
+ if [ -z $(fix_default) ]; then
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ fi
+
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+
+# update-desktop-database -q
+}
+
+pre_remove() {
+ if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then
+ /usr/bin/archlinux-java unset
+ echo "No Java environment is set as default anymore"
+ fi
+}
+
+post_remove() {
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+
+# update-desktop-database -q
+}
More information about the arch-commits
mailing list