Date: Wednesday, October 17, 2018 @ 19:58:12 Author: anthraxx Revision: 336813
archrelease: copy trunk to extra-x86_64 Added: java8-openjdk/repos/extra-x86_64/PKGBUILD (from rev 336812, java8-openjdk/trunk/PKGBUILD) java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh (from rev 336812, java8-openjdk/trunk/install_jdk8-openjdk.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh (from rev 336812, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh (from rev 336812, 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 | 571 ++++++++++++++++++------------------- install_jdk8-openjdk.sh | 100 +++--- install_jre8-openjdk-headless.sh | 96 +++--- install_jre8-openjdk.sh | 84 ++--- 4 files changed, 425 insertions(+), 426 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-10-17 19:57:37 UTC (rev 336812) +++ PKGBUILD 2018-10-17 19:58:12 UTC (rev 336813) @@ -1,286 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> -# Contributor: Boyan Ding <stu_...@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=181 -_jdk_build=13 -pkgver=${_java_ver}.u${_jdk_update} -_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} -pkgrel=1 -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=('2a613bc3eb3ecdb12946447e44e6c80ce80d1a7c5cbdf8127585b452f6708b66' - '3fc4793e39d2e8e9aa19707f43d61a81bef2c9de22ff47c99105e1b4a51b19ac' - '04b173f2af287c1b80aeb20b2e31563905e1e772cf5e01a25f3a985e392c7d5f' - 'c4da8f58c97c0a4d37907b099385961029482aa268331e19903c1d4738a9afa8' - 'f51a6827fd50bf29d4abb69e3a73ab13735dec45157f750b7cbfe375ebd022b9' - '2d0475ae6a925fef1f21f3fd96436ed5d11d3cb9dca5a96f96defb3040c68d3b' - '4ef19aaf1444d1d23c0f76fc6d8f55092c0b8b8e953b7c136448f6660b7165ea' - 'f2220793aa8fea31c8945566b639ea85e2d00ac68220827ba8861ca32e4aae48') - -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*} - - # We filter out -O flags so that the optimization of HotSpot is not 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 - 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 ${_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 - - # 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 ${_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}/" -} - -# vim: ts=2 sw=2 et: Copied: java8-openjdk/repos/extra-x86_64/PKGBUILD (from rev 336812, java8-openjdk/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-10-17 19:58:12 UTC (rev 336813) @@ -0,0 +1,285 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: Boyan Ding <stu_...@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 +_jdk_update=192 +_jdk_build=26 +pkgver=${_java_ver}.u${_jdk_update} +_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} +pkgrel=1 +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=('4d3c656cf27bfd9dd9007ccdee7a36ed1002f3f9ecd8a4b10a2030fab4d3a5c3' + 'a3e63d3a5fb839a7efa4006068d06265ab6033251b4796a4963c31638040efd5' + '702f0e4a391ae1a7e2e0a7c26bff0c1186c4d90ffe87aba3a6e0c6e8e813bf60' + '6e7b59a098b4b4bdf3ea4c985d1c90e984f5f8313c402fdc0c02120a135107e9' + '9846bcac7b21aea41940702c12e4347eeabc440b02fa35ced0b5b1ce7a645415' + '1466776a9e11a7bdc5c4fca327d3551873885c196a6689a5febd6259a8c56ee4' + '98cc9e7cf4dfd12ae1c3377e700e9e29b52ce7d9a3e44be3944f15a43fb5066f' + '61ca69a5267bbd02d0cb979b022bfb34bde1fb1c45b93ae53944914bcb88fc53') + +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*} + + # We filter out -O flags so that the optimization of HotSpot is not 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 + 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 ${_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 + + # 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 ${_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}/" +} + +# vim: ts=2 sw=2 et: Deleted: install_jdk8-openjdk.sh =================================================================== --- install_jdk8-openjdk.sh 2018-10-17 19:57:37 UTC (rev 336812) +++ install_jdk8-openjdk.sh 2018-10-17 19:58:12 UTC (rev 336813) @@ -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 336812, java8-openjdk/trunk/install_jdk8-openjdk.sh) =================================================================== --- install_jdk8-openjdk.sh (rev 0) +++ install_jdk8-openjdk.sh 2018-10-17 19:58:12 UTC (rev 336813) @@ -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-10-17 19:57:37 UTC (rev 336812) +++ install_jre8-openjdk-headless.sh 2018-10-17 19:58:12 UTC (rev 336813) @@ -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 336812, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) =================================================================== --- install_jre8-openjdk-headless.sh (rev 0) +++ install_jre8-openjdk-headless.sh 2018-10-17 19:58:12 UTC (rev 336813) @@ -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-10-17 19:57:37 UTC (rev 336812) +++ install_jre8-openjdk.sh 2018-10-17 19:58:12 UTC (rev 336813) @@ -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 336812, java8-openjdk/trunk/install_jre8-openjdk.sh) =================================================================== --- install_jre8-openjdk.sh (rev 0) +++ install_jre8-openjdk.sh 2018-10-17 19:58:12 UTC (rev 336813) @@ -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 +}