From b41803a3807814efcc729bf34f35d0b2f20b2d7b Mon Sep 17 00:00:00 2001 From: Idris Kalp Date: Tue, 9 Mar 2021 22:38:12 +0300 Subject: [PATCH] java 8u_282.3.18.0 --- .../language/java/java8-openjdk/actions.py | 20 +-- .../language/java/java8-openjdk/pspec.xml | 117 ++++++++++-------- 2 files changed, 74 insertions(+), 63 deletions(-) diff --git a/programming/language/java/java8-openjdk/actions.py b/programming/language/java/java8-openjdk/actions.py index 00436ac748..2556873009 100755 --- a/programming/language/java/java8-openjdk/actions.py +++ b/programming/language/java/java8-openjdk/actions.py @@ -4,13 +4,17 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/licenses/gpl.txt +import subprocess + from pisi.actionsapi import get from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools -shelltools.export("ALT_PARALLEL_COMPILE_JOBS", get.makeJOBS()) -shelltools.export("HOTSPOT_BUILD_JOBS", get.makeJOBS()) +jobs = "-j"+ subprocess.check_output("nproc 2>/dev/null", shell=True).rstrip("\n") + +shelltools.export("ALT_PARALLEL_COMPILE_JOBS", jobs) +shelltools.export("HOTSPOT_BUILD_JOBS", jobs) shelltools.export("LC_ALL", "C") def setup(): @@ -33,8 +37,8 @@ def setup(): --enable-bootstrap \ --with-jdk-home=/usr/lib/jvm/java-8-openjdk \ --with-ecj-jar=/usr/share/java/ecj.jar \ - --with-pkgversion='PisiLinux build 8.u275_3.17.1' \ - " % get.makeJOBS().replace("-j", "")) + --with-pkgversion='PisiLinux build 8.u282_3.18.0' \ + " % jobs.replace("-j", "")) def build(): @@ -65,14 +69,14 @@ def install(): if not f in ["java", "java-rmi.cgi", "keytool", "orbd", "pack200", "policytool", "rmid", "rmiregistry", "servertool", "tnameserv", "unpack200", "jjs", "clhsdb", "hsdb"]: - pisitools.dosym("/usr/lib/jvm/java-8-openjdk/bin/%s" % f, "/usr/bin/%s_8" % f) + pisitools.dosym("/usr/lib/jvm/java-8-openjdk/bin/%s" % f, "/usr/bin/%s" % f) #install man pages for man in shelltools.ls("images/j2sdk-image/man/man1"): - pisitools.insinto("/usr/share/man/man1", "images/j2sdk-image/man/man1/%s" % man, "%s_8" % man) + pisitools.insinto("/usr/share/man/man1", "images/j2sdk-image/man/man1/%s" % man, "%s" % man) for man in shelltools.ls("images/j2sdk-image/man/ja_JP.UTF-8/man1"): - pisitools.insinto("/usr/share/man/ja/man1", "images/j2sdk-image/man/ja_JP.UTF-8/man1/%s" % man, "%s_8" % man ) + pisitools.insinto("/usr/share/man/ja/man1", "images/j2sdk-image/man/ja_JP.UTF-8/man1/%s" % man, "%s" % man ) pisitools.insinto("/usr/share/applications", "../jconsole.desktop", "jconsole-jdk8.desktop") shelltools.system("chmod go+r %s%s/lib/sa-jdi.jar" %(get.installDIR(), jvmdir)) @@ -82,7 +86,7 @@ def install(): #pisitools.insinto("%s/jre/lib/amd64" % jvmdir , "j2sdk-image/jre/lib/amd64/xawt") for binfile in shelltools.ls("images/j2sdk-image/jre/bin"): - pisitools.dosym("%s/jre/bin/%s" % (jvmdir, binfile), "/usr/bin/%s_8" % binfile) + pisitools.dosym("%s/jre/bin/%s" % (jvmdir, binfile), "/usr/bin/%s" % binfile) pisitools.insinto("/usr/share/applications", "../policytool.desktop", "policytool-jdk8.desktop") diff --git a/programming/language/java/java8-openjdk/pspec.xml b/programming/language/java/java8-openjdk/pspec.xml index 34bbb86c39..02062fdd62 100755 --- a/programming/language/java/java8-openjdk/pspec.xml +++ b/programming/language/java/java8-openjdk/pspec.xml @@ -12,16 +12,16 @@ app:gui Open Java Development Kit OpenJDK (Open Java Development Kit) is a free and open source implementation of the Java Platform, Standard Edition (Java SE). - http://icedtea.wildebeest.org/download/source/icedtea-3.17.1.tar.xz + http://icedtea.wildebeest.org/download/source/icedtea-3.18.0.tar.xz - http://icedtea.wildebeest.org/download/drops/icedtea8/3.17.1/corba.tar.xz - http://icedtea.wildebeest.org/download/drops/icedtea8/3.17.1/jaxp.tar.xz - http://icedtea.wildebeest.org/download/drops/icedtea8/3.17.1/jaxws.tar.xz - http://icedtea.wildebeest.org/download/drops/icedtea8/3.17.1/jdk.tar.xz - http://icedtea.wildebeest.org/download/drops/icedtea8/3.17.1/langtools.tar.xz - http://icedtea.wildebeest.org/download/drops/icedtea8/3.17.1/openjdk.tar.xz - http://icedtea.wildebeest.org/download/drops/icedtea8/3.17.1/nashorn.tar.xz - http://icedtea.wildebeest.org/download/drops/icedtea8/3.17.1/hotspot.tar.xz + http://icedtea.wildebeest.org/download/drops/icedtea8/3.18.0/corba.tar.xz + http://icedtea.wildebeest.org/download/drops/icedtea8/3.18.0/jaxp.tar.xz + http://icedtea.wildebeest.org/download/drops/icedtea8/3.18.0/jaxws.tar.xz + http://icedtea.wildebeest.org/download/drops/icedtea8/3.18.0/jdk.tar.xz + http://icedtea.wildebeest.org/download/drops/icedtea8/3.18.0/langtools.tar.xz + http://icedtea.wildebeest.org/download/drops/icedtea8/3.18.0/openjdk.tar.xz + http://icedtea.wildebeest.org/download/drops/icedtea8/3.18.0/nashorn.tar.xz + http://icedtea.wildebeest.org/download/drops/icedtea8/3.18.0/hotspot.tar.xz wget @@ -89,26 +89,26 @@ libjpeg-turbo - /usr/bin/jfr_8 - /usr/bin/hsdb_8 - /usr/bin/clhsdb_8 - /usr/bin/orbd_8 - /usr/bin/rmid_8 - /usr/bin/java_8 - /usr/bin/jjs_8 - /usr/bin/jdeps_8 + /usr/bin/jfr + /usr/bin/hsdb + /usr/bin/clhsdb + /usr/bin/orbd + /usr/bin/rmid + /usr/bin/java + /usr/bin/jjs + /usr/bin/jdeps /etc/env.d/25java_jre.csh /etc/env.d/25java_jre /etc/java-8-openjdk/ - /usr/bin/pack200_8 - /usr/bin/keytool_8 - /usr/bin/tnameserv_8 - /usr/bin/unpack200_8 + /usr/bin/pack200 + /usr/bin/keytool + /usr/bin/tnameserv + /usr/bin/unpack200 /usr/share/man/man1/rmid.1 /usr/share/man/man1/orbd.1 /usr/share/man/man1/java.1 - /usr/bin/servertool_8 - /usr/bin/rmiregistry_8 + /usr/bin/servertool + /usr/bin/rmiregistry /usr/share/doc/java8-openjdk/ /usr/share/man/ja/man1/rmid.1 /usr/share/man/ja/man1/java.1 @@ -178,10 +178,10 @@ /usr/share/doc/openjdk - /usr/bin/policytool_8 + /usr/bin/policytool /usr/share/icons/hicolor/ - /usr/share/man/man1/policytool.1_8 - /usr/share/man/ja/man1/policytool.1_8 + /usr/share/man/man1/policytool.1 + /usr/share/man/ja/man1/policytool.1 /usr/share/applications/policytool-jdk8.desktop /usr/lib/jvm/java-8-openjdk/jre/bin/policytool /usr/lib/jvm/java-8-openjdk/jre/lib/*/libjsoundalsa.so @@ -212,35 +212,35 @@ /etc/env.d/25java_jdk /usr/share/man/man1/ /usr/share/man/ja/man1/ - /usr/bin/jar_8 - /usr/bin/xjc_8 - /usr/bin/apt_8 - /usr/bin/jdb_8 - /usr/bin/jps_8 - /usr/bin/jmap_8 - /usr/bin/idlj_8 - /usr/bin/jcmd_8 - /usr/bin/jhat_8 - /usr/bin/rmic_8 - /usr/bin/javac_8 - /usr/bin/javah_8 - /usr/bin/javap_8 - /usr/bin/jinfo_8 - /usr/bin/wsgen_8 - /usr/bin/jstat_8 - /usr/bin/jstack_8 - /usr/bin/jstatd_8 - /usr/bin/javadoc_8 - /usr/bin/extcheck_8 - /usr/bin/jconsole_8 - /usr/bin/wsimport_8 - /usr/bin/jarsigner_8 - /usr/bin/jsadebugd_8 - /usr/bin/schemagen_8 - /usr/bin/serialver_8 - /usr/bin/jrunscript_8 - /usr/bin/appletviewer_8 - /usr/bin/native2ascii_8 + /usr/bin/jar + /usr/bin/xjc + /usr/bin/apt + /usr/bin/jdb + /usr/bin/jps + /usr/bin/jmap + /usr/bin/idlj + /usr/bin/jcmd + /usr/bin/jhat + /usr/bin/rmic + /usr/bin/javac + /usr/bin/javah + /usr/bin/javap + /usr/bin/jinfo + /usr/bin/wsgen + /usr/bin/jstat + /usr/bin/jstack + /usr/bin/jstatd + /usr/bin/javadoc + /usr/bin/extcheck + /usr/bin/jconsole + /usr/bin/wsimport + /usr/bin/jarsigner + /usr/bin/jsadebugd + /usr/bin/schemagen + /usr/bin/serialver + /usr/bin/jrunscript + /usr/bin/appletviewer + /usr/bin/native2ascii /usr/share/applications/jconsole-jdk8.desktop /usr/lib/jvm/java-8-openjdk/include /usr/lib/jvm/java-8-openjdk/bin/apt @@ -327,6 +327,13 @@ + + 2021-03-09 + 8u_282.3.18.0 + Version bump + İdris Kalp + idriskalp@gmail.com + 2020-12-18 8u_275.3.17.1