[bug#48977] [PATCH 0/4] Update openjdk 13 and later

[bug#48977] [PATCH 0/4] Update openjdk 13 and later

[Pierre Langlois]

[-- Attachment #1: Type: text/plain, Size: 1706 bytes --]

Hi Guix!

Here are a few patches to include the OpenJDK 15 and 16 releases, and
update 13 and 14. The codebase seems to have now moved to git, using
github as the default place to get the code.

Regarding release versions, it seems the scheme was changed for versions
10 and later to $FEATURE.$INTERIM.$UPDATE, where $INTERIM is always
zero, quoting from [0]:

--8<---------------cut here---------------start------------->8---
Under the six-month release model the elements of version numbers vary
as follows:

    $FEATURE is incremented every six months: The March 2018 release is
    JDK 10, the September 2018 release is JDK 11, and so forth.

    $INTERIM is always zero, since the six-month model does not include
    interim releases. We reserve it here for flexibility, so that a
    future revision to the release model could include such releases and
    say that JDK $N.1 and JDK $N.2 are compatible upgrades of JDK $N. As
    examples, the JDK 1.4.1 and 1.4.2 releases were, in essence, interim
    releases, and would have been numbered 4.1 and 4.2 under this
    scheme.

    $UPDATE is incremented one month after $FEATURE is incremented, and
    every three months thereafter: The April 2018 release is JDK 10.0.1,
    the July release is JDK 10.0.2, and so forth.
--8<---------------cut here---------------end--------------->8---

It seems the easiest thing to do is to refer to "GA" releases, for
"general availability" with git tags that look like "jdk-<version>-ga".

I've done it for OpenJDK 13 and later, however if we change 10, 11 and
12, it looks like a downgrade, is that a problem? 

Thanks,
Pierre

[0]: https://openjdk.java.net/jeps/322

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 519 bytes --]

[bug#48977] [PATCH 1/4] gnu: openjdk13: Update to 13.0.7.

[Pierre Langlois]

* gnu/packages/java.scm (openjdk13): Update to 13.0.7.
[source]: Switch to https://github.com/openjdk/jdk13u.
---
 gnu/packages/java.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a167aafc38..830e5b62b0 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2021 Mike Gerwitz <mtg@gnu.org>
+;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2428,14 +2429,16 @@ new Date();"))
   (package
     (inherit openjdk12)
     (name "openjdk")
-    (version "13.0")
+    (version "13.0.7")
     (source (origin
-              (method url-fetch)
-              (uri "http://hg.openjdk.java.net/jdk/jdk13/archive/9c250a7600e1.tar.bz2")
-              (file-name (string-append name "-" version ".tar.bz2"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/openjdk/jdk13u")
+                    (commit (string-append "jdk-" version "-ga"))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0v0ljvx5dyzp96dw4z4ksw3pvasil7783mgnmd1wk9gads5ab8iq"))
+                "0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp"))
               (modules '((guix build utils)))
               (snippet
                `(begin
--
2.32.0

[bug#48977] [PATCH 2/4] gnu: openjdk14: Update to 14.0.2.

[Pierre Langlois]

* gnu/packages/java.scm (openjdk14): Update to 14.0.2.
[source]: Switch to https://github.com/openjdk/jdk14u.
---
 gnu/packages/java.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 830e5b62b0..09360d6b6f 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2473,14 +2473,16 @@ new Date();"))
   (package
     (inherit openjdk13)
     (name "openjdk")
-    (version "14.0")
+    (version "14.0.2")
     (source (origin
-              (method url-fetch)
-              (uri "http://hg.openjdk.java.net/jdk/jdk14/archive/bc54620a3848.tar.bz2")
-              (file-name (string-append name "-" version ".tar.bz2"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/openjdk/jdk14u")
+                    (commit (string-append "jdk-" version "-ga"))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0z485pk7r1xpw8004g4nrwrzj17sabgx8yfdbxwfvzkjp8qyajch"))
+                "07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6"))
               (modules '((guix build utils)))
               (snippet
                `(begin
--
2.32.0

[bug#48977] [PATCH 3/4] gnu: Add openjdk15.

[Pierre Langlois]

* gnu/packages/java.scm (openjdk15): New variable.
---
 gnu/packages/java.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 09360d6b6f..af3e83be00 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2517,6 +2517,29 @@ new Date();"))
        ("zip" ,zip)))
     (home-page "https://openjdk.java.net/projects/jdk/14")))

+(define-public openjdk15
+  (package
+    (inherit openjdk14)
+    (name "openjdk")
+    (version "15.0.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/openjdk/jdk15u")
+                    (commit (string-append "jdk-" version "-ga"))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i"))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("openjdk14:jdk" ,openjdk14 "jdk")
+       ("pkg-config" ,pkg-config)
+       ("unzip" ,unzip)
+       ("which" ,which)
+       ("zip" ,zip)))
+    (home-page "https://openjdk.java.net/projects/jdk/15")))
+
 (define-public icedtea icedtea-8)

 \f
--
2.32.0

[bug#48977] [PATCH 4/4] gnu: Add openjdk16.

[Pierre Langlois]

* gnu/packages/java.scm (openjdk16): New variable.
---
 gnu/packages/java.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index af3e83be00..184393aaa3 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2540,6 +2540,44 @@ new Date();"))
        ("zip" ,zip)))
     (home-page "https://openjdk.java.net/projects/jdk/15")))

+(define-public openjdk16
+  (package
+    (inherit openjdk15)
+    (name "openjdk")
+    (version "16.0.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/openjdk/jdk16u")
+                    (commit (string-append "jdk-" version "-ga"))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f"))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("openjdk15:jdk" ,openjdk15 "jdk")
+       ("pkg-config" ,pkg-config)
+       ("unzip" ,unzip)
+       ("which" ,which)
+       ("zip" ,zip)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments openjdk15)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'make-templates-writable
+             (lambda _
+               ;; The build system copies a few .template files from the
+               ;; source directory into the build directory and then modifies
+               ;; them in-place. So these files have to be writable.
+               (for-each
+                (lambda (file)
+                  (invoke "chmod" "u+w" file))
+                (find-files "src/java.base/share/classes/jdk/internal/misc/"
+                            "\\.template"))
+               #t))))))
+    (home-page "https://openjdk.java.net/projects/jdk/16")))
+
 (define-public icedtea icedtea-8)

 \f
--
2.32.0

[bug#48977] [PATCH 4/4] gnu: Add openjdk16.

[Julien Lepiller]

Le Sat, 12 Jun 2021 20:54:49 +0100,
Pierre Langlois <pierre.langlois@gmx.com> a écrit :

> +    (arguments
> +     (substitute-keyword-arguments (package-arguments openjdk15)
> +       ((#:phases phases)
> +        `(modify-phases ,phases
> +           (add-after 'unpack 'make-templates-writable
> +             (lambda _
> +               ;; The build system copies a few .template files from
> the
> +               ;; source directory into the build directory and then
> modifies
> +               ;; them in-place. So these files have to be writable.
> +               (for-each
> +                (lambda (file)
> +                  (invoke "chmod" "u+w" file))
> +                (find-files
> "src/java.base/share/classes/jdk/internal/misc/"
> +                            "\\.template"))

Should be "\\.template$", otherwise the whole series LGTM!

bug#48977: [PATCH 4/4] gnu: Add openjdk16.

[Pierre Langlois]

[-- Attachment #1: Type: text/plain, Size: 1047 bytes --]

Hi Julien,

Julien Lepiller writes:

> Le Sat, 12 Jun 2021 20:54:49 +0100,
> Pierre Langlois <pierre.langlois@gmx.com> a écrit :
>
>> +    (arguments
>> +     (substitute-keyword-arguments (package-arguments openjdk15)
>> +       ((#:phases phases)
>> +        `(modify-phases ,phases
>> +           (add-after 'unpack 'make-templates-writable
>> +             (lambda _
>> +               ;; The build system copies a few .template files from
>> the
>> +               ;; source directory into the build directory and then
>> modifies
>> +               ;; them in-place. So these files have to be writable.
>> +               (for-each
>> +                (lambda (file)
>> +                  (invoke "chmod" "u+w" file))
>> +                (find-files
>> "src/java.base/share/classes/jdk/internal/misc/"
>> +                            "\\.template"))
>
> Should be "\\.template$", otherwise the whole series LGTM!

Thanks for the review! Fixed and pushed with
afd4924d6a64c01a1d5138954b9f22c9bd4f4690.

Pierre

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 519 bytes --]