[arch-commits] Commit in java8-openjdk/repos/extra-x86_64 (8 files)
Levente Polyak
anthraxx at archlinux.org
Sat May 23 16:58:22 UTC 2020
Date: Saturday, May 23, 2020 @ 16:58:21
Author: anthraxx
Revision: 387461
archrelease: copy trunk to extra-x86_64
Added:
java8-openjdk/repos/extra-x86_64/PKGBUILD
(from rev 387460, java8-openjdk/trunk/PKGBUILD)
java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh
(from rev 387460, java8-openjdk/trunk/install_jdk8-openjdk.sh)
java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh
(from rev 387460, java8-openjdk/trunk/install_jre8-openjdk-headless.sh)
java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh
(from rev 387460, 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 | 550 ++++++++++++++++++-------------------
install_jdk8-openjdk.sh | 100 +++---
install_jre8-openjdk-headless.sh | 96 +++---
install_jre8-openjdk.sh | 84 ++---
4 files changed, 415 insertions(+), 415 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-23 16:58:12 UTC (rev 387460)
+++ PKGBUILD 2020-05-23 16:58:21 UTC (rev 387461)
@@ -1,275 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Boyan Ding <stu_dby at 126.com>
-
-pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc')
-pkgbase=java8-openjdk
-_java_ver=8
-_jdk_update=242
-_jdk_build=08
-pkgver=${_java_ver}.u${_jdk_update}
-_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=1
-arch=('x86_64')
-url='https://openjdk.java.net/'
-license=('custom')
-makedepends=('java-environment=8' 'ccache' 'cpio' 'unzip' 'zip'
- 'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
-_url_src=https://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=('1f852e33c373d6f0b3d8383febc66816c04bd3efa301ecf874a6befa2b243ab3'
- '84078de4432b735b33f6da1b60997d2c6b4da82dd32b0109eb47ea262e9a2889'
- '8b799f2ef8e804110aa6ccd23fc46a04047141f7f8ad32936a6fc66f828b24a2'
- '7f7f0d8526ead3cd02eabb9b0485670bdd6d239e72419b6db56c7836f45c146f'
- 'ec53d7140b32a3c3fbcf53b2867803dd220e57cddf6e4529905925f0e372e9f1'
- '8e656bcba39808b2a86df5729d5265df06151a1cf7e58f0cb38f5d94d1ccbdc4'
- 'c4e7e8f23ea96ae6f5945b026f7769c02e7d63de78efd8fa2493b64373685da9'
- '18bbf98a240c057023e463f81a4623b05cb28546e47fcf7602c7c7accf579d62')
-
-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 jdk8u-${_repo_ver}
- for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
- ln -s ../${subrepo}-${_repo_ver} ${subrepo}
- done
-}
-
-build() {
- cd jdk8u-${_repo_ver}
-
- unset JAVA_HOME
- # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346
- export MAKEFLAGS=${MAKEFLAGS/-j*}
-
- # Avoid optimization of HotSpot being lowered from O3 to O2
- export CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS} -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks"
- export CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}"
-
- 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 \
- --with-extra-cflags="${CFLAGS}" \
- --with-extra-cxxflags="${CXXFLAGS}" \
- --with-extra-ldflags="${LDFLAGS}"
-
- # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed)
- #--with-giflib=system \
-
- # These help to debug builds: LOG=trace HOTSPOT_BUILD_JOBS=1
- # Without 'DEBUG_BINARIES', i686 won't build: http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html
- make
- make docs
-
- # FIXME sadly 'DESTDIR' is not used here!
- make install
-
- cd ../${_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 jdk8u-${_repo_ver}
- #make -k test
-}
-
-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 ${_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
- if [ -f "${srcdir}/${_imgdir}/man/man1/${file}.1" ]; then
- install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
- "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1"
- fi
- if [ -f "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" ]; then
- install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
- "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1"
- fi
- 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'
- 'java8-openjfx: for JavaFX GUI components support')
- provides=('java-runtime=8' 'java-runtime-openjdk=8')
- install=install_jre8-openjdk.sh
- replaces=('jre8-openjdk-wm')
-
- cd ${_imgdir}/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
-
- # 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 ${_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
- if [ -f ../man/man1/${b}.1 ]; then
- install -D -m 644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}-${_jdkname}.1"
- fi
- if [ -f ../man/ja/man1/${b}.1 ]; then
- install -D -m 644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}-${_jdkname}.1"
- fi
- fi
- done
- popd
-
- # Handling 'java-rmi.cgi' separately
- install -D -m 755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
-
- # 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}/"
-}
-
-# vim: ts=2 sw=2 et:
Copied: java8-openjdk/repos/extra-x86_64/PKGBUILD (from rev 387460, java8-openjdk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-05-23 16:58:21 UTC (rev 387461)
@@ -0,0 +1,275 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Boyan Ding <stu_dby at 126.com>
+
+pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc')
+pkgbase=java8-openjdk
+_java_ver=8
+_jdk_update=252
+_jdk_build=09
+pkgver=${_java_ver}.u${_jdk_update}
+_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
+pkgrel=1
+arch=('x86_64')
+url='https://openjdk.java.net/'
+license=('custom')
+makedepends=('java-environment=8' 'ccache' 'cpio' 'unzip' 'zip'
+ 'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
+_url_src=https://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=('a5f8d6ba216c30c93ee49324a077791df3bc0a0ac8b9560e06c37f2e8c68c005'
+ '5d75faf658e2a969c75921621a64125f9248686888186c36622dd54b73c14497'
+ 'd9951b6e0c8396a4442d548ca3e585a4e32391c78d3c772f0f57074ab15103cf'
+ 'c127845fc1dcc2e5da1e6fdd3f760630cbb3f40c25b5f7330cacae8526a7e27d'
+ '62431eb8144ff34e26256fb0e79f72c5ce589bdc7a14c780ca1cc6ff4407f884'
+ '128c9a2603461a5fd970bbe6dc99256ed4d996455fe04aa65853833824c8d77d'
+ '1900dd43ecd44fad6a766049c68b443063be0e47088b84a30e6056deb775ee27'
+ '7d7697216420e16343f50849ef2f05b540f4087243445889353d2bef8aec8fe7')
+
+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 jdk8u-${_repo_ver}
+ for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
+ ln -s ../${subrepo}-${_repo_ver} ${subrepo}
+ done
+}
+
+build() {
+ cd jdk8u-${_repo_ver}
+
+ unset JAVA_HOME
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346
+ export MAKEFLAGS=${MAKEFLAGS/-j*}
+
+ # Avoid optimization of HotSpot being lowered from O3 to O2
+ export CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS} -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon"
+ export CXXFLAGS="${CXXFLAGS} ${CPPFLAGS} -fcommon"
+
+ 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 \
+ --with-extra-cflags="${CFLAGS}" \
+ --with-extra-cxxflags="${CXXFLAGS}" \
+ --with-extra-ldflags="${LDFLAGS}"
+
+ # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed)
+ #--with-giflib=system \
+
+ # These help to debug builds: LOG=trace HOTSPOT_BUILD_JOBS=1
+ # Without 'DEBUG_BINARIES', i686 won't build: http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html
+ make
+ make docs
+
+ # FIXME sadly 'DESTDIR' is not used here!
+ make install
+
+ cd ../${_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 jdk8u-${_repo_ver}
+ #make -k test
+}
+
+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 ${_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
+ if [ -f "${srcdir}/${_imgdir}/man/man1/${file}.1" ]; then
+ install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1"
+ fi
+ if [ -f "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" ]; then
+ install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1"
+ fi
+ 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'
+ 'java8-openjfx: for JavaFX GUI components support')
+ provides=('java-runtime=8' 'java-runtime-openjdk=8')
+ install=install_jre8-openjdk.sh
+ replaces=('jre8-openjdk-wm')
+
+ cd ${_imgdir}/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
+
+ # 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 ${_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
+ if [ -f ../man/man1/${b}.1 ]; then
+ install -D -m 644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}-${_jdkname}.1"
+ fi
+ if [ -f ../man/ja/man1/${b}.1 ]; then
+ install -D -m 644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}-${_jdkname}.1"
+ fi
+ fi
+ done
+ popd
+
+ # Handling 'java-rmi.cgi' separately
+ install -D -m 755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
+
+ # 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}/"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: install_jdk8-openjdk.sh
===================================================================
--- install_jdk8-openjdk.sh 2020-05-23 16:58:12 UTC (rev 387460)
+++ install_jdk8-openjdk.sh 2020-05-23 16:58:21 UTC (rev 387461)
@@ -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 387460, java8-openjdk/trunk/install_jdk8-openjdk.sh)
===================================================================
--- install_jdk8-openjdk.sh (rev 0)
+++ install_jdk8-openjdk.sh 2020-05-23 16:58:21 UTC (rev 387461)
@@ -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 2020-05-23 16:58:12 UTC (rev 387460)
+++ install_jre8-openjdk-headless.sh 2020-05-23 16:58:21 UTC (rev 387461)
@@ -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 387460, java8-openjdk/trunk/install_jre8-openjdk-headless.sh)
===================================================================
--- install_jre8-openjdk-headless.sh (rev 0)
+++ install_jre8-openjdk-headless.sh 2020-05-23 16:58:21 UTC (rev 387461)
@@ -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 2020-05-23 16:58:12 UTC (rev 387460)
+++ install_jre8-openjdk.sh 2020-05-23 16:58:21 UTC (rev 387461)
@@ -1,42 +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
-
- echo "when you use a non-reparenting window manager,"
- echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
-}
-
-post_upgrade() {
- if [ -z "$(fix_default)" ]; then
- /usr/bin/archlinux-java set ${THIS_JRE}
- fi
-}
-
-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
-}
Copied: java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh (from rev 387460, java8-openjdk/trunk/install_jre8-openjdk.sh)
===================================================================
--- install_jre8-openjdk.sh (rev 0)
+++ install_jre8-openjdk.sh 2020-05-23 16:58:21 UTC (rev 387461)
@@ -0,0 +1,42 @@
+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
+
+ echo "when you use a non-reparenting window manager,"
+ echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
+}
+
+post_upgrade() {
+ if [ -z "$(fix_default)" ]; then
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ fi
+}
+
+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
+}
More information about the arch-commits
mailing list