From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH] [staging] gnu: groovy: Update to 3.0.5. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160115844216258 (code B ref -1); Sat, 26 Sep 2020 22:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Sep 2020 22:14:02 +0000 Received: from localhost ([127.0.0.1]:47896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIS9-0004Dx-MI for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:14:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:54396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIS5-0004Dn-Vo for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMIS5-0006Li-QN for guix-patches@gnu.org; Sat, 26 Sep 2020 18:13:57 -0400 Received: from lepiller.eu ([89.234.186.109]:36666) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMIS2-0003El-WB for guix-patches@gnu.org; Sat, 26 Sep 2020 18:13:56 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 1c479136 for ; Sat, 26 Sep 2020 22:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type :content-transfer-encoding; s=dkim; bh=hpr1T0wI+wATH4vVOqjSllDQu 1VByZB7lM2VDb75zsQ=; b=Xx6buEFhnOOzlz5h0P+Icpx2Ag8c9meOhxyIj8CIY nxpyuPqP03c89G4vrbcV/cQ6FeyLhTB8SXbdj1rxmWT4qM5RAgdxlmg+F8fHHxNG OR+aMFQKEEIpBJkwOC9JZUqxe5tTpxTvNObJJR4z/LttSwFX/bnqjnpgJFwZ0ZYf VZY8Y3YX9ffw+7PJFO88wU7fwopcQbNM5pMf3pG9Bfoc1TEJ+kztZ562pqSCNn6Q vqI0rSTYjvsqokX/TBYvITbFav0T4CS7gvt8+Csbbc6GdjIIrG3yblBhGOBtVmdh kzwR5W34UM6a5HmLWm51QVLrPOw70uCjTpHgphiLfaXiA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 6403c8d5 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sat, 26 Sep 2020 22:13:49 +0000 (UTC) Date: Sun, 27 Sep 2020 00:13:35 +0200 From: Julien Lepiller Message-ID: <20200927001335.40c2409a@tachikoma.lepiller.eu> X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=89.234.186.109; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/26 18:13:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi Guix! The following patch series updates groovy to 3.0.5. groovy-ant depends on a newer version of ant/java8 than we have in master, so I had to update it. This lead me to change the recipe slightly, which propagated to ant, so I thought I could as well update it as well. The change to ant's recipe (and version) leads to ~500 rebuilds, so this is going to staging. The first three patches are required, but already pushed in master. Then, I add asm-8 and 3 subpackages. Groovy requires a fork of antlr4, not antlr4 itself, but this fork has a cyclic dependency on itself. antlr4 has a runtime library and a binary that generates a parser. The binary depends on the runtime library. In that fork, the runtime requires the binary, to generate a parser. To break the cycle, I use an old version of antlr4 (4.1), and fix the parser (it generates the parser for a different runtime library after all). Then, I can use this runtime to build the binary. Now, the binary uses a runtime that doesn't fully work, so I rebuild the runtime with it (so this time it generates the parser properly), and use this runtime to rebuild the final binary. Then, there's java-javaparser and the actual update of groovy. I changed the way groovy subprojects are built, using a procedure (groovy-subproject) that returns a package that builds the subproject. I also added a few additional subprojects that didn't exist in the previous version. Unfortunately, I'm missing the junit5 and jaxb because of missing dependencies. From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 01/15] gnu: Add java-treelayout. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115872516740 (code B ref 43639); Sat, 26 Sep 2020 22:19:02 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:18:45 +0000 Received: from localhost ([127.0.0.1]:47907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWi-0004Lw-NJ for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:44 -0400 Received: from lepiller.eu ([89.234.186.109]:49480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWg-0004Lo-TN for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:43 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id a965b2bf for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=67Chie5pnt3vbqcKwby8AjL6t ICC6PkffBAKSDtWi1A=; b=Gh7MXgg2ZM1cuzh8aFTUPKstyS17WuWWcFKAFzx4E j2KQrYznzQgnTF3GzeNWsumH/PKYTCsS+RA5XAgt9dqk7/VkF6HpIqXcdCSi6h5J zvi2JSRhf/23PdeOeicVJS/lM+h408gFyK1wTk0NL7Am2LdclAj/qqTCmLiPO+wW hcgXC9ZGoWsf/8vZ+Rej3k1BBmnbjtY2J3bhvGYfg4PWErEg5rqNhkcms1ARB01T S+O8HgIzJZwyqIm0QMSLfAWNlc4ugxr7cZmjMhYUBjiq+xhjXQ1yBKJk47LNcwPD yfBO5N2eQ850bDpiOUL5of6Hoe/hyJzLc5CAjHKC+U19w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 731ba228 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:41 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:10 +0200 Message-Id: <20200926221824.20925-1-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200927001335.40c2409a@tachikoma.lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-treelayout): New variable. --- gnu/packages/java.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e8de1bc154..ad8011fbd8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8168,6 +8168,37 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;")) (propagated-inputs `(("stringtemplate" ,java-stringtemplate-3))))) +(define-public java-treelayout + (package + (name "java-treelayout") + (version "1.0.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abego/treelayout") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18my8ql9b1y0n0zrvkih7xfhf3dpgfhyfifvkcfhmwcvw3divxak")))) + (build-system ant-build-system) + (arguments + `(#:jar-name (string-append ,name "-" ,version ".jar") + #:source-dir "org.abego.treelayout/src/main/java" + #:test-dir "org.abego.treelayout/src/test")) + (inputs + `(("java-junit" ,java-junit))) + (native-inputs + `(("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "http://treelayout.sourceforge.net") + (synopsis "Tree Layout Algorithm in Java") + (description "TreeLayout creates tree layouts for arbitrary trees. It is +not restricted to a specific output or format, but can be used for any kind of +two dimensional diagram. Examples are Swing based components, SVG files, etc. +This is possible because TreeLayout separates the layout of a tree from the +actual rendering.") + (license license:bsd-3))) + (define-public java-commons-cli-1.2 ;; This is a bootstrap dependency for Maven2. (package -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 02/15] gnu: Add java-antlr4-runtime. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115873316788 (code B ref 43639); Sat, 26 Sep 2020 22:19:02 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:18:53 +0000 Received: from localhost ([127.0.0.1]:47910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWm-0004MD-Vu for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:52 -0400 Received: from lepiller.eu ([89.234.186.109]:49480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWh-0004Lo-W3 for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:48 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 8796d7ae for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=tkj6hJoT8xtgt9VEUWtcLGxbo gOJtJ+Ci293745BYEQ=; b=RXbJfKfiOy6wZmPMsluBMilAfqO03LTIIAcQn0RzU Pikkysxd1Mj39OOzHz7pbjtf5PfNKyY+lhdGk4AO3prhdRjBJW45hwxz1YBYiTfC 4+3FDOTzvQU1+IbnXALjYxag+IxzPoqIX5SRtNLI4QTmSDkfG4tRD8cSpyEGckAG /2gFe4NlKB2QfQWueIFiQqSBZsgk/D3JMjfHR+g2fLKnA4D7cFCkyH9SlSTrDlSa op7x1YMTn9Gi0ZX70s9jvE9ZjhCg8Y2yhQZijfFVGTuyukARKPPCPcynusm+iYB8 Ld8mIwEmH8QKDD5fs722NHJPqW/dfrZ8EFMM5W/wgT2jA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 0f52a68d (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:41 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:11 +0200 Message-Id: <20200926221824.20925-2-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-antlr4-runtime): New variable. * gnu/packages/patches/java-antlr4-Add-standalone-generator.patch: New file. * gnu/packages/patches/java-antlr4-fix-code-too-large.java: New file. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 2 + gnu/packages/java.scm | 34 +++++++ ...java-antlr4-Add-standalone-generator.patch | 52 +++++++++++ .../java-antlr4-fix-code-too-large.java | 90 +++++++++++++++++++ 4 files changed, 178 insertions(+) create mode 100644 gnu/packages/patches/java-antlr4-Add-standalone-generator.patch create mode 100644 gnu/packages/patches/java-antlr4-fix-code-too-large.java diff --git a/gnu/local.mk b/gnu/local.mk index ba94adfe72..8e2f1976bf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1159,6 +1159,8 @@ dist_patch_DATA = \ %D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \ %D%/packages/patches/jamvm-2.0.0-disable-branch-patching.patch \ %D%/packages/patches/jamvm-2.0.0-opcode-guard.patch \ + %D%/packages/patches/java-antlr4-Add-standalone-generator.patch \ + %D%/packages/patches/java-antlr4-fix-code-too-large.java \ %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ %D%/packages/patches/java-commons-collections-fix-java8.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ad8011fbd8..0fd0d5e29f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8199,6 +8199,40 @@ This is possible because TreeLayout separates the layout of a tree from the actual rendering.") (license license:bsd-3))) +(define-public java-antlr4-runtime + (package + (name "java-antlr4-runtime") + (version "4.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/antlr/antlr4") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m")) + (patches + (search-patches "java-antlr4-Add-standalone-generator.patch" + "java-antlr4-fix-code-too-large.java")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-antlr4-runtime.jar" + #:source-dir "runtime/Java/src/org" + #:tests? #f; tests depend on java-antlr4 itself + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "runtime/Java/src/main/dot" + "build/classes") + #t))))) + (home-page "https://antlr.org") + (synopsis "ANTLR runtime library") + (description "This package contains the runtime library used with generated +sources by ANTLR.") + (license license:bsd-3))) + (define-public java-commons-cli-1.2 ;; This is a bootstrap dependency for Maven2. (package diff --git a/gnu/packages/patches/java-antlr4-Add-standalone-generator.patch b/gnu/packages/patches/java-antlr4-Add-standalone-generator.patch new file mode 100644 index 0000000000..75b6dce39f --- /dev/null +++ b/gnu/packages/patches/java-antlr4-Add-standalone-generator.patch @@ -0,0 +1,52 @@ +From 3b43b79da15be994348f13035474925ba592fe1f Mon Sep 17 00:00:00 2001 +From: Julien Lepiller +Date: Fri, 15 Sep 2017 10:06:42 +0200 +Subject: [PATCH] Add standalone template generator + +--- + tool/src/org/antlr/v4/unicode/UnicodeRenderer.java | 33 ++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + create mode 100644 tool/src/org/antlr/v4/unicode/UnicodeRenderer.java + +diff --git a/tool/src/org/antlr/v4/unicode/UnicodeRenderer.java b/tool/src/org/antlr/v4/unicode/UnicodeRenderer.java +new file mode 100644 +index 0000000..9e53213 +--- /dev/null ++++ b/tool/src/org/antlr/v4/unicode/UnicodeRenderer.java +@@ -0,0 +1,33 @@ ++package org.antlr.v4.unicode; ++ ++import org.stringtemplate.v4.*; ++import org.stringtemplate.v4.misc.ErrorBuffer; ++import org.antlr.v4.unicode.UnicodeDataTemplateController; ++ ++import java.io.File; ++import java.io.FileWriter; ++import java.io.IOException; ++import java.util.Map; ++import java.util.Map.Entry; ++ ++public class UnicodeRenderer extends UnicodeDataTemplateController { ++ public static void main(String[] arg) ++ throws IOException { ++ String inputdir = arg[0]; ++ String input = arg[1]; ++ String output = arg[2]; ++ ++ FileWriter fileWriter = new FileWriter(new File(output)); ++ ErrorBuffer listener = new ErrorBuffer(); ++ ++ STGroupDir group = new STGroupDir(inputdir); ++ ST st = group.getInstanceOf(input); ++ ++ for(Entry entry : getProperties().entrySet()) ++ st.add(entry.getKey(), entry.getValue()); ++ ++ st.write(new AutoIndentWriter(fileWriter), listener); ++ fileWriter.flush(); ++ fileWriter.close(); ++ } ++} +-- +2.13.5 + diff --git a/gnu/packages/patches/java-antlr4-fix-code-too-large.java b/gnu/packages/patches/java-antlr4-fix-code-too-large.java new file mode 100644 index 0000000000..9e9f92349d --- /dev/null +++ b/gnu/packages/patches/java-antlr4-fix-code-too-large.java @@ -0,0 +1,90 @@ +From d22db2048534bdf3d9615117291f9d86564ff10d Mon Sep 17 00:00:00 2001 +From: Julien Lepiller +Date: Sat, 19 Sep 2020 21:05:48 +0200 +Subject: [PATCH] Separate addPropertyAliases in two methods + +The quantity of data used to generate addPropertyAliases creates a big +method, that is too big for java and results in "error: code too large". +This is most likely due to added data between the expected version of +icu and the actual version of icu in Guix. +--- + .../org/antlr/v4/tool/templates/unicodedata.st | 17 ++++++++++++++--- + .../unicode/UnicodeDataTemplateController.java | 18 ++++++++++-------- + 2 files changed, 24 insertions(+), 11 deletions(-) + +diff --git a/tool/resources/org/antlr/v4/tool/templates/unicodedata.st b/tool/resources/org/antlr/v4/tool/templates/unicodedata.st +index 0f22c73..3573873 100644 +--- a/tool/resources/org/antlr/v4/tool/templates/unicodedata.st ++++ b/tool/resources/org/antlr/v4/tool/templates/unicodedata.st +@@ -1,4 +1,4 @@ +-unicodedata(propertyCodePointRanges, propertyAliases) ::= << ++unicodedata(propertyCodePointRanges, propertyAliasesA, propertyAliasesB) ::= << + package org.antlr.v4.unicode; + + import java.util.Arrays; +@@ -15,7 +15,7 @@ import org.antlr.v4.runtime.misc.Interval; + */ + public abstract class UnicodeData { + private static final Map\ propertyCodePointRanges = new HashMap\<\>(); +- private static final Map\ propertyAliases = new HashMap\<\>(); ++ private static final Map\ propertyAliases = new HashMap\<\>( + ); + + // Work around Java 64k bytecode method limit by splitting up static + // initialization into one method per Unicode property +@@ -30,9 +30,20 @@ static private void addProperty() { + propertyCodePointRanges.put("".toLowerCase(Locale.US), codePointRanges); + \}}; separator="\n\n"> + ++ // Property aliases ++ static private void addPropertyAliases1() { ++ ".toLowerCase(Locale.US), "".toLowerCase(Locale.US)); }; separator="\n"> ++ } ++ ++ // Property aliases ++ static private void addPropertyAliases2() { ++ ".toLowerCase(Locale.US), "".toLowerCase(Locale.US)); }; separator="\n"> ++ } ++ + // Property aliases + static private void addPropertyAliases() { +- ".toLowerCase(Locale.US), "".toLowerCase(Locale.US)); }; separator="\n"> ++ addPropertyAliases1(); ++ addPropertyAliases2(); + } + + // Put it all together +diff --git a/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java b/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java +index da244a3..dc591cb 100644 +--- a/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java ++++ b/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java +@@ -78,17 +78,19 @@ public abstract class UnicodeDataTemplateController { + addTR35ExtendedPictographicPropertyCodesToCodePointRanges(propertyCodePointRanges); + addEmojiPresentationPropertyCodesToCodePointRanges(propertyCodePointRanges); + +- Map propertyAliases = new LinkedHashMap<>(); +- addUnicodeCategoryCodesToNames(propertyAliases); +- addUnicodeBinaryPropertyCodesToNames(propertyAliases); +- addUnicodeScriptCodesToNames(propertyAliases); +- addUnicodeBlocksToNames(propertyAliases); +- addUnicodeIntPropertyCodesToNames(propertyAliases); +- propertyAliases.put("EP", "Extended_Pictographic"); ++ Map propertyAliases1 = new LinkedHashMap<>(); ++ Map propertyAliases2 = new LinkedHashMap<>(); ++ addUnicodeCategoryCodesToNames(propertyAliases1); ++ addUnicodeBinaryPropertyCodesToNames(propertyAliases1); ++ addUnicodeScriptCodesToNames(propertyAliases1); ++ addUnicodeBlocksToNames(propertyAliases2); ++ addUnicodeIntPropertyCodesToNames(propertyAliases2); ++ propertyAliases2.put("EP", "Extended_Pictographic"); + + Map properties = new LinkedHashMap<>(); + properties.put("propertyCodePointRanges", propertyCodePointRanges); +- properties.put("propertyAliases", propertyAliases); ++ properties.put("propertyAliasesA", propertyAliases1); ++ properties.put("propertyAliasesB", propertyAliases2); + return properties; + } + +-- +2.28.0 + -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 03/15] gnu: Add antlr4. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:19:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115873316803 (code B ref 43639); Sat, 26 Sep 2020 22:19:03 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:18:53 +0000 Received: from localhost ([127.0.0.1]:47917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWr-0004Mj-0r for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:53 -0400 Received: from lepiller.eu ([89.234.186.109]:49480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWm-0004Lo-G3 for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:49 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 0c119fa5 for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=IInbbjIXPAT74PJIz5Y9G9tft ubDeNFLk24UPVoWGh4=; b=VBi1sOSp3yjv+2wzuWB1X3Z0TIhkBJs7eH445+m7W Cmfw0jXBnNX9Y+7UG+F9erNz64JrEUh4yCmvNqy/jw1zdZM0Kyhq1dXZIUg+9go/ 0mdoq8pjuTx5ZziiuouIXH1NDkGAB8UiequpsVpzEbM1ROxRSrogythbXPpZK0Gm +vmBLDWPsz59oDA6KH7Mu34tA32zC7TyBrS7eYSvlxMe7utziK5mqiwZ2gIrZ2tJ AB6gENfeTZgG0rHZbWGahy1C8Hj2gJ/rDD9cea70ajCTqTS7AKw9nMu1Q/JlxQ4y MFDH4HEYNFWMAQTB+OlrK3YDUg8jwPWHljDEnNf6PF7fA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 80b75eee (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:42 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:12 +0200 Message-Id: <20200926221824.20925-3-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (antlr4): New variable. --- gnu/packages/java.scm | 161 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0fd0d5e29f..674135071b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8233,6 +8233,167 @@ actual rendering.") sources by ANTLR.") (license license:bsd-3))) +(define-public antlr4 + (package + (inherit java-antlr4-runtime) + (name "antlr4") + (arguments + `(#:jar-name "antlr4.jar" + #:source-dir "tool/src" + #:test-dir "tool-testsuite/test:runtime-testsuite/test:runtime-testsuite/annotations/src" + #:test-include (list "**/Test*.java") + #:test-exclude (list + ;; no runnable method + "**/TestOutputReading.java" + ;; no @Test methods + "**/TestParserErrors.java" + "**/TestSemPredEvalParser.java" + "**/TestSets.java" + "**/TestListeners.java" + "**/TestParseTrees.java" + "**/TestParserExec.java" + "**/TestLexerErrors.java" + "**/TestPerformance.java" + "**/TestCompositeParsers.java" + "**/TestLexerExec.java" + "**/TestSemPredEvalLexer.java" + "**/TestLeftRecursion.java" + "**/TestFullContextParsing.java" + "**/TestCompositeLexers.java" + ;; Null pointer exception + "**/TestCompositeGrammars.java" + ;; Wrong assumption on emoji + "**/TestUnicodeData.java") + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-build.xml + (lambda _ + ;; tests are not in a java subdirectory + (substitute* "build.xml" + (("\\$\\{test.home\\}/java") "${test.home}")) + #t)) + ;; tests require to have a working antlr4 binary + (delete 'check) + (add-after 'bin-install 'check + (lambda _ + (invoke "ant" "compile-tests") + (invoke "ant" "check" "-Dtest.home=runtime-testsuite/annotations/src") + (invoke "ant" "check" "-Dtest.home=runtime-testsuite/test") + (invoke "ant" "check" "-Dtest.home=tool-testsuite/test") + #t)) + (add-before 'check 'remove-unrelated-languages + (lambda _ + ;; There are tests for other languages that ANTLR can generate, but + ;; we don't have the infrastructure for that yet. Let's test Java + ;; generation only. + (for-each + (lambda (language) + (delete-file-recursively + (string-append "runtime-testsuite/test/org/antlr/v4/test/runtime/" + language))) + '("cpp" "csharp" "go" "javascript" "php" "python" "python2" + "python3" "swift")) + #t)) + (add-before 'check 'generate-test-parsers + (lambda* (#:key outputs #:allow-other-keys) + (define (run-antlr dir filename package) + (invoke "antlr4" "-lib" dir "-visitor" "-no-listener" + "-package" package (string-append dir "/" filename) + "-Xlog")) + (setenv "PATH" (string-append (getenv "PATH") ":" + (assoc-ref outputs "out") "/bin")) + (run-antlr "runtime-testsuite/test/org/antlr/v4/test/runtime/java/api" + "Java.g4" "org.antlr.v4.test.runtime.java.api") + (run-antlr "runtime-testsuite/test/org/antlr/v4/test/runtime/java/api" + "VisitorBasic.g4" "org.antlr.v4.test.runtime.java.api") + (run-antlr "runtime-testsuite/test/org/antlr/v4/test/runtime/java/api" + "VisitorCalc.g4" "org.antlr.v4.test.runtime.java.api") + #t)) + (add-before 'check 'remove-graphemes + (lambda _ + ;; When running antlr on grahemes.g4, we get a runtime exception: + ;; set is empty. So delete the file that depends on it. + (delete-file + "runtime-testsuite/test/org/antlr/v4/test/runtime/java/api/perf/TimeLexerSpeed.java") + #t)) + (add-after 'install 'bin-install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((jar (string-append (assoc-ref outputs "out") "/share/java")) + (bin (string-append (assoc-ref outputs "out") "/bin"))) + (mkdir-p bin) + (with-output-to-file (string-append bin "/antlr4") + (lambda _ + (display + (string-append "#!" (which "sh") "\n" + "java -cp " jar "/antlr4.jar:" + (string-join + (apply + append + (map + (lambda (input) + (find-files (assoc-ref inputs input) + ".*\\.jar")) + '("antlr3" "java-stringtemplate" + "java-antlr4-runtime" "java-treelayout" + "java-jsonp-api" "java-icu4j"))) + ":") + " org.antlr.v4.Tool $*")))) + (chmod (string-append bin "/antlr4") #o755) + #t))) + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "tool/resources/" "build/classes") + #t)) + (add-before 'build 'generate-unicode + (lambda _ + ;; First: build the generator + (invoke "javac" "-cp" (getenv "CLASSPATH") + "tool/src/org/antlr/v4/unicode/UnicodeRenderer.java" + "tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java") + ;; Then use it + (invoke "java" "-cp" (string-append (getenv "CLASSPATH") + ":tool/src:runtime/Java") + "org.antlr.v4.unicode.UnicodeRenderer" + "tool/resources/org/antlr/v4/tool/templates" + "unicodedata" + "tool/src/org/antlr/v4/unicode/UnicodeData.java") + ;; It seems there is a bug with our ST4 + (substitute* "tool/src/org/antlr/v4/unicode/UnicodeData.java" + (("\\\\>") ">")) + ;; Remove the additional file + (delete-file "tool/src/org/antlr/v4/unicode/UnicodeRenderer.java") + #t)) + (add-before 'build 'generate-grammar + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "tool/src/org/antlr/v4/parse" + (for-each (lambda (file) + (display file) + (newline) + (invoke "antlr3" file)) + '("ANTLRLexer.g" "ANTLRParser.g" "BlockSetTransformer.g" + "GrammarTreeVisitor.g" "ATNBuilder.g" + "ActionSplitter.g" "LeftRecursiveRuleWalker.g"))) + (with-directory-excursion "tool/src/org/antlr/v4/codegen" + (install-file "../parse/ANTLRParser.tokens" ".") + (display "SourceGenTriggers.g\n") + (invoke "antlr3" "SourceGenTriggers.g")) + #t))))) + (inputs + `(("antlr3" ,antlr3) + ("java-antlr4-runtime" ,java-antlr4-runtime) + ("java-icu4j" ,java-icu4j) + ("java-jsonp-api" ,java-jsonp-api) + ("java-stringtemplate" ,java-stringtemplate) + ("java-treelayout" ,java-treelayout))) + (native-inputs + `(("java-junit" ,java-junit))) + (synopsis "Parser and lexer generator in Java") + (description "ANTLR (ANother Tool for Language Recognition) is a powerful +parser generator for reading, processing, executing, or translating structured +text or binary files. It's widely used to build languages, tools, and +frameworks. From a grammar, ANTLR generates a parser that can build and walk +parse trees."))) + (define-public java-commons-cli-1.2 ;; This is a bootstrap dependency for Maven2. (package -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 04/15] gnu: ant/java8: Update to 1.10.8. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:19:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115873416817 (code B ref 43639); Sat, 26 Sep 2020 22:19:03 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:18:54 +0000 Received: from localhost ([127.0.0.1]:47920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWr-0004Mx-KO for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:54 -0400 Received: from lepiller.eu ([89.234.186.109]:49480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWn-0004Lo-BL for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:50 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 55313336 for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=8wTdBal17x5HWEYmauI0wETre dEVr/VUEZ0srFrqj/c=; b=CxyRHQwuZRK5sm9qKLI+NTyVCit4K5IqVRrqbWbc+ 9asWS524S/yuWJ5G+71iczzAanl+e2xrYF4ATMupO3wzcmwO20sy6c11zoI7aq45 8xtjeQNVV8PDvQMmeQO3Jj99vrFBbEja6krGVh0wOPwWG1bkA4EiKIkOAAoOlPih +5SvzKMLea2ujaEvU2nQEZwx9Sh4o8+7k1jQVCs1O9k/FYPWDjXA4qiXm+tuJGbC W3yKRImajSAUKB6h2UTSZC46REXsmm8IrXRwO0sLH+V9dbzskNqp+whH9mpwWS9S 5dNd33H8xzBYeSh+1xYze/VDsXnLV94Y6izLI7LDZt1cg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id d00e6781 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:42 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:13 +0200 Message-Id: <20200926221824.20925-4-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (ant/java8): Update to 1.10.8. --- gnu/packages/java.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 674135071b..dd3ff73e2e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2431,14 +2431,14 @@ new Date();")) (define-public ant/java8 (package (inherit ant-bootstrap) (name "ant") - (version "1.10.1") + (version "1.10.8") (source (origin (method url-fetch) (uri (string-append "mirror://apache/ant/source/apache-ant-" version "-src.tar.gz")) (sha256 (base32 - "10p3dh77lkzzzcy32dk9azljixzadp46fggjfbvgkl8mmb8cxxv8")) + "066k2isig5xm70cihj9p73hkp5w7h5zbfqz5kxb6cwr9cb86xl2k")) (modules '((guix build utils))) (snippet '(begin @@ -2466,7 +2466,7 @@ new Date();")) ;; "check" phase, because the dependency on "test-jar" would always ;; result in the tests to be run. (substitute* "build.xml" - (("depends=\"jars,test-jar\"") "depends=\"jars\"")) + (("depends=\"jars,test-jar") "depends=\"jars")) (invoke "bash" "bootstrap.sh" (string-append "-Ddist.dir=" (assoc-ref outputs "out"))))))))) -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 05/15] gnu: ant: Update to 1.9.15. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115873416827 (code B ref 43639); Sat, 26 Sep 2020 22:19:04 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:18:54 +0000 Received: from localhost ([127.0.0.1]:47924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWs-0004NB-6P for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:54 -0400 Received: from lepiller.eu ([89.234.186.109]:49480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWo-0004Lo-BF for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:50 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 9fb761db for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=b9bg7gyv+MBvitu0rvNJHSt0K N17hsGjh/rjT1dT620=; b=RKNHIqB4dCFyf5VhJPgOznDaB6OwPVbBIgNMEeJHp uwTBoZPxBAOoe6JnT7341N8v9b3KoAPJjGU+UDVEKc4FkmQsewhCc3w6pgBzvM7B ELfFmG7nM6LGvy8GfJetYAkCqm49PGkt9Wej/dOYm7L2RGGZ+KxwHdz1twgjqZwf lNKI9E9EJn9Eko5wbkx30kHTY1BUfOKIOQqMhGFy1NqaAkgTz/TtUnjFbVucfDM1 b5SHLzm6cP0GUK483vLvLkovcZQifE09CyCG5N6hCeN21Z/6sv6fZm4YRblDHRRf 3lAzxAupR2q0UKXbqtMIynX/6y91fJIDAO8m5br9fIg4w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id f0fa89a6 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:43 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:14 +0200 Message-Id: <20200926221824.20925-5-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (ant): Update to 1.9.15. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index dd3ff73e2e..253839e5f4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2479,14 +2479,14 @@ new Date();")) ;; requires Java 8. (define-public ant (package (inherit ant/java8) - (version "1.9.9") + (version "1.9.15") (source (origin (method url-fetch) (uri (string-append "mirror://apache/ant/source/apache-ant-" version "-src.tar.gz")) (sha256 (base32 - "1k28mka0m3isy9yr8gz84kz1f3f879rwaxrd44vdn9xbfwvwk86n")))) + "1xy30f1w5gaqk6g3f0vw7ygix4rb6032qkcw42y4z8wd9jihgygd")))) (native-inputs `(("jdk" ,icedtea-7 "jdk") ("zip" ,zip) -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 06/15] gnu: Add java-asm-8. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115873516839 (code B ref 43639); Sat, 26 Sep 2020 22:19:04 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:18:55 +0000 Received: from localhost ([127.0.0.1]:47926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWs-0004NM-Jt for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:55 -0400 Received: from lepiller.eu ([89.234.186.109]:49480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWo-0004Lo-Vz for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:51 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 5d90da15 for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=oozgEbHPrZ+F6Df/VpfKWF019 tVC7gGrKgAnjfl5l+U=; b=SxYl9yh1U7SDyhS3SexZR9tMBs6QyLRgJ3ltUoSXU M9Gz9vuK/Z1BlgdyvxT/bpDS19n4N1WcdAHH9JaizqBYZuNbMfz0TdPptrZlScZU sXd7SwzUcoH+G5RwSq3SHgkBTJN7Ljca5THxjm3eisvwSfyQweEzlYg4ekqtsX1f CHze7PrNcsrKl8dloLTTo9UxUypyfNcrTSjnhkEcSwf0VMDY32tx6f2AB6VcFdVY b4Ifc7IduW52ahIJjprO5cA9U7kVz9uTi1nHPMdxWjPb6AfgfUtIdWRC3T9brhlp AtlMsb04l3BxBCH4e9rOqpZyLmCeGhZklHeVboAr4jXbA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id d27fe085 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:43 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:15 +0200 Message-Id: <20200926221824.20925-6-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-asm-8): New variable. --- gnu/packages/java.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 253839e5f4..3b6f3bed69 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5140,6 +5140,30 @@ including java-asm.") ((#:tests? _) #f))) (native-inputs `()))) +(define-public java-asm-8 + (package + (inherit java-asm) + (version "8.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.ow2.org/asm/asm") + (commit (string-append + "ASM_" (string-join (string-split version #\.) + "_"))))) + (file-name (git-file-name "java-asm" version)) + (sha256 + (base32 + "1s6j27zc1i76gh891w2g48b1c3abp9w8zp5j54yb1vm5h8djkd69")))) + (arguments + `(#:jar-name "asm8.jar" + #:source-dir "asm/src/main/java" + #:test-dir "asm/src/test" + ;; tests depend on junit5 + #:tests? #f)) + (propagated-inputs '()) + (native-inputs '()))) + (define-public java-cglib (package (name "java-cglib") -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 07/15] gnu: Add java-asm-tree-8. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115873516846 (code B ref 43639); Sat, 26 Sep 2020 22:19:04 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:18:55 +0000 Received: from localhost ([127.0.0.1]:47929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWt-0004NY-1l for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:55 -0400 Received: from lepiller.eu ([89.234.186.109]:49480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWp-0004Lo-T3 for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:52 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 9b99da5f for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=yWI7AWQARV4ZgSV3VK5YkDINt zNmgN2CybJKbneu7GI=; b=SEJdf7QKarI/eGxitCvyyvNNBPlKwO+5Qh3zVUSRz UaoO1tBJFqUtus7OSsmOs3wN70gmCt8hDXiQJJjl0YH0d+nRc9Zbd/Td9/xafwBC GvPigEbNIBgqTehiFVFiuwkgKQsBFd8LRzOthCuFLWyzSW7+iaxrA6W/P9lOmtg1 bUjsucJ4g5vk4VEf+pc0KUvDuq9sdXEbfIam9S9xnMdcvXwtpbRzmqbpSI0NZMK4 KL0J+8EdKMNDPSJ5XJ9c6eNUnpl9jLOleOSM6bWxl4f5WOYylFl1UvxK/zyk54TC Y7mrzD/f2fyNx7/6zZRlSiI57qFIvecGEKxN0aKldTNNA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 57e18f15 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:44 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:16 +0200 Message-Id: <20200926221824.20925-7-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-asm-tree-8): New variable. --- gnu/packages/java.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3b6f3bed69..5afe22fcd4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5164,6 +5164,19 @@ including java-asm.") (propagated-inputs '()) (native-inputs '()))) +(define-public java-asm-tree-8 + (package + (inherit java-asm-8) + (name "java-asm-tree") + (arguments + `(#:jar-name "asm-tree.jar" + #:source-dir "asm-tree/src/main/java" + #:test-dir "asm-tree/src/test" + ;; tests depend on junit5 + #:tests? #f)) + (inputs + `(("java-asm" ,java-asm-8))))) + (define-public java-cglib (package (name "java-cglib") -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 08/15] gnu: Add java-asm-analysis-8. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115874816955 (code B ref 43639); Sat, 26 Sep 2020 22:20:02 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:19:08 +0000 Received: from localhost ([127.0.0.1]:47941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIX6-0004PM-EK for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:19:08 -0400 Received: from lepiller.eu ([89.234.186.109]:49480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWq-0004Lo-K4 for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:53 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id d4b3ee58 for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=M1XiHP2t1uaqAY+tde0XNznsZ hmp+/WLTrPrOflJk3A=; b=PeFcEIJkd97teaEChEwZk5bRsB/aPj1mXpy5IUfw1 Z57fZzfQrLNjTS2daw5lHkZuBBgYThpJh16jTHzCLrFPybQj/YN79FgTPZzNKugs hB36hSfJBWDmXNAEOg4OeHE/wPzlj+IQh0Iha/xkb0kRx680G0snXUvVSvvX6Opx 2xt6kgEs6lRHOF7NhA5vdF0lgc0fWyUJ/siYQf8IehijlBgPs58IxaWaJe1yOLZd TTnOC2Vd9M3gYtX8fSoe7Fr55wKlVAqVoB5L9T/z4lI1mewerkr9LooQg/ogcEqE jLBLfBK9Q9zX3eWNsvupfvxLvEy2T0MTCUNXs99SgJIsg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1d75a6d8 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:44 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:17 +0200 Message-Id: <20200926221824.20925-8-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-asm-analysis-8): New variable. --- gnu/packages/java.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5afe22fcd4..f1540e5b43 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5177,6 +5177,20 @@ including java-asm.") (inputs `(("java-asm" ,java-asm-8))))) +(define-public java-asm-analysis-8 + (package + (inherit java-asm-8) + (name "java-asm-analysis") + (arguments + `(#:jar-name "asm-analysis.jar" + #:source-dir "asm-analysis/src/main/java" + #:test-dir "asm-analysis/src/test" + ;; tests depend on junit5 + #:tests? #f)) + (inputs + `(("java-asm" ,java-asm-8) + ("java-asm-tree" ,java-asm-tree-8))))) + (define-public java-cglib (package (name "java-cglib") -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 09/15] gnu: Add java-asm-util-8. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115874916962 (code B ref 43639); Sat, 26 Sep 2020 22:20:02 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:19:09 +0000 Received: from localhost ([127.0.0.1]:47943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIX6-0004PQ-OH for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:19:08 -0400 Received: from lepiller.eu ([89.234.186.109]:49482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWr-0004Mg-3z for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:53 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ecbf2c10 for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=hHt8wxITlD453LEs5APk5AXzB Lxo0SY1r4NES8GZ+JE=; b=PZIBLQCFYuNr91zUwbFvg2NXSe3vXnJBuXEbykFyl DRFGaro9Td7i2DjT2BVm/joRzeaq+WCw/njbD7sxbmm30sOuEkjY8dCuKbDQTHCb taTA5rcIl48gTpLEQQCEBU0qfzw61JaKW0VjGWLBlu6Kz9ylfQktEllYVR360a/q GC8Suwoi+P6g+G3e1+Bj52pi7H8PbaRT+g1iVkCEbhzy/w0ehN037X2Vu3Fe90Lh /swybATUAns0Ar4y+a1JZ6QNJpfs+gSHnjgmKV2+MHopWMrVGAOlQQsXrFb8clIY VaSVncSV359pxXKj+/ZXAJxD6VHmGmARulKqdF7mq00dQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id f5885d7c (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:45 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:18 +0200 Message-Id: <20200926221824.20925-9-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-asm-util-8): New variable. --- gnu/packages/java.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f1540e5b43..0e02528a38 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5191,6 +5191,21 @@ including java-asm.") `(("java-asm" ,java-asm-8) ("java-asm-tree" ,java-asm-tree-8))))) +(define-public java-asm-util-8 + (package + (inherit java-asm-8) + (name "java-asm-util") + (arguments + `(#:jar-name "asm-util8.jar" + #:source-dir "asm-util/src/main/java" + #:test-dir "asm-util/src/test" + ;; tests depend on junit5 + #:tests? #f)) + (inputs + `(("java-asm" ,java-asm-8) + ("java-asm-analysis" ,java-asm-analysis-8) + ("java-asm-tree" ,java-asm-tree-8))))) + (define-public java-cglib (package (name "java-cglib") -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 10/15] gnu: Add java-antlr4-runtime-4.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115874916969 (code B ref 43639); Sat, 26 Sep 2020 22:20:03 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:19:09 +0000 Received: from localhost ([127.0.0.1]:47945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIX7-0004PX-09 for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:19:09 -0400 Received: from lepiller.eu ([89.234.186.109]:49480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWr-0004Lo-Cq for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:54 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 1c2a1221 for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=rxEmGOynooYW46bawl4F5j06p Kk4qXiJZlYH1BLVUc0=; b=c0wGi92Y/GXfh/mOaw+pW7Zoy45IDEpWw55GNL9Y4 bnk/ISqNdBNvLBA0eaVzr7U4Y24Ws7Zo1ahOpAsGifeH0bkVGQBOqdZQHsm04l3E 7YnUJC60gc32dS24HUyVTGFEDNmDFh+gO1qSt5ihYUj5nXDsBbykMn9H0M3YQOW2 DXvHrCzeM5s93o8miNiFWWan9Wi1fAytBeXM5cq3GHdINTdtoyk4a0eCOLVhGGUO Yz/TAdvuLMxUGRyC63cNbfO8Hxk00AKRw2YgqNJRLis9kTmD2i3twrjRU+Xc7AW4 RcPyTVtmhC6bzWSXx1twtdtKZjWwIkIBnI7pPAZGOEXEg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id c56f4c99 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:45 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:19 +0200 Message-Id: <20200926221824.20925-10-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-antlr4-runtime-4.1): New variable. --- gnu/packages/java.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0e02528a38..40a10be8b2 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8460,6 +8460,30 @@ text or binary files. It's widely used to build languages, tools, and frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees."))) +(define-public java-antlr4-runtime-4.1 + (package + (inherit java-antlr4-runtime) + (version "4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/antlr/antlr4") + (commit version))) + (file-name (git-file-name "antlr4" version)) + (sha256 + (base32 + "1i8hmx5an58cjyvhji0xgpvd6lq00z1k1mjys025q2wqc25wv4c1")))) + (arguments + (substitute-keyword-arguments (package-arguments java-antlr4-runtime) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'chmod + (lambda _ + (chmod "build.xml" #o644) + #t)))))) + (inputs + `(("java-treelayout" ,java-treelayout))))) + (define-public java-commons-cli-1.2 ;; This is a bootstrap dependency for Maven2. (package -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 11/15] gnu: Add antlr4-4.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115874916976 (code B ref 43639); Sat, 26 Sep 2020 22:20:03 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:19:09 +0000 Received: from localhost ([127.0.0.1]:47947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIX7-0004Pe-94 for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:19:09 -0400 Received: from lepiller.eu ([89.234.186.109]:49482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWr-0004Mg-TE for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:54 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 298b8b8b for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=8AwiSDeMV+Ln3RNOmkRU0247g S9xbIsdawzfM9kCMHc=; b=NT9KSXXbyFhL/uoy2Qw/mHjZjauNaeoiBw+CdUofA JB5WW0qKCCk1p8AmkPyi6iy4thi4xfiJM9NkDGywcT6Sq/2dujdKrmBa5tzoDwnn mHw13vC+uyGB3yI7z3hJqm1/GM3RSEoHoVFVQGwrVHQg1BKbj5eUZVgz+EPQYmG1 Wgp+4qVvbhFQf5WCkrj2jWFtwutQ9xllOjjS1JvolfcigmYaU/Z6KfAA4Vh85kri xtot718cuxjdV0LpXzBBtUXDCCIsCPjtkFKRNfg6rU9n/pOME6hWIx9ii3/Pu8L5 bmtvYrdNU3kcXTXj+V4T6K1MlzbH0ECErvgq01U29PeyA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 6a3ae1b1 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:46 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:20 +0200 Message-Id: <20200926221824.20925-11-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (antlr4-4.1): New variable. --- gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 40a10be8b2..198a06c292 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8484,6 +8484,42 @@ parse trees."))) (inputs `(("java-treelayout" ,java-treelayout))))) +(define-public antlr4-4.1 + (package + (inherit antlr4) + (version (package-version java-antlr4-runtime-4.1)) + (source (package-source java-antlr4-runtime-4.1)) + (arguments + (substitute-keyword-arguments (package-arguments antlr4) + ((#:test-dir _) + "tool/test") + ((#:test-exclude excludes) + `(list "**/TestParseErrors.java" + "**/TestTopologicalSort.java" + ,@excludes)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'generate-unicode) + (replace 'check + (lambda _ + (invoke "ant" "check") + #t)) + (add-before 'configure 'chmod + (lambda _ + (chmod "build.xml" #o644) + #t)) + (delete 'remove-graphemes) + (delete 'remove-unrelated-languages) + (delete 'generate-test-parsers))))) + (inputs + (map + (match-lambda + ((name package) + (if (equal? name "java-antlr4-runtime") + (list name java-antlr4-runtime-4.1) + (list name package)))) + (package-inputs antlr4))))) + (define-public java-commons-cli-1.2 ;; This is a bootstrap dependency for Maven2. (package -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 13/15] gnu: Add java-tunnelvisionlabs-antlr4-runtime. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115875016984 (code B ref 43639); Sat, 26 Sep 2020 22:20:03 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:19:10 +0000 Received: from localhost ([127.0.0.1]:47949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIX7-0004Pl-I1 for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:19:09 -0400 Received: from lepiller.eu ([89.234.186.109]:49482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWt-0004Mg-43 for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:55 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 00e18bcc for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=PY0P2yQtnAguhF+YEsDTmZU9Y GyH5RBxGw1aQFATZFY=; b=GpEezBRsmpCzPsb9eqVnRQfq7SRSLup00UDBigX57 N/IiYvhGWorp83w55dk9QD7jKcO308wJaIbWYSLxoeuAoqmqd3pYxqc//gV6rh4T 32WqZW7aOd8ui/iAVpkXyspbVZciuIfnl6VuI66IWrUUvyac05FIG/18qyPt0kQP U8uEEbjtC3MgxnsOv8zbzskwG33okPK2IEhHoy8JiTf+RZj8BQoeqKpcq90urX2L 69V0dwtWMhOsU9Noj+/MtmwVORHFIL7c+V6SAnngYB8LES2nYu/nfMTcexihO2r0 TjKp9r64ymC5b2X7nAoof7JkRojaT+EoMQovhDBw1ggHA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 7e0963b1 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:47 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:22 +0200 Message-Id: <20200926221824.20925-13-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-tunnelvisionlabs-antlr4-runtime): New variable. --- gnu/packages/java.scm | 73 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 73a5fbd693..83d26c4ab4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8558,6 +8558,79 @@ parse trees."))) (description "This package contains annotations used during the build of the runtime library of ANTLR."))) +(define java-tunnelvisionlabs-antlr4-runtime-bootstrap + (package + (inherit java-antlr4-runtime) + (name "java-tunnelvisionlabs-antlr4-runtime") + (version (package-version java-tunnelvisionlabs-antlr4-runtime-annotations)) + (source (package-source java-tunnelvisionlabs-antlr4-runtime-annotations)) + (arguments + `(#:jar-name "java-antlr4-runtime.jar" + #:source-dir "runtime/Java/src" + #:tests? #f; tests require antlr4, but antlr4 depends on this package + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-xpath-lexer + (lambda _ + (invoke "antlr4" "-lib" "runtime/Java/src/org/antlr/v4/runtime/tree/xpath" + "-visitor" "-no-listener" + "-package" "org.antlr.v4.runtime.tree.xpath" + "runtime/Java/src/org/antlr/v4/runtime/tree/xpath/XPathLexer.g4") + ;; Generated code is for an incompatible version of the runtime + (substitute* "runtime/Java/src/org/antlr/v4/runtime/tree/xpath/XPathLexer.java" + (("LexerATNSimulator\\(this,_ATN,_decisionToDFA,_sharedContextCache\\)") + "LexerATNSimulator(this,_ATN)")) + #t)) + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "runtime/Java/src/main/dot" + "build/classes") + #t))))) + (native-inputs + `(("antlr4" ,antlr4-4.1) + ("java-tunnelvisionlabs-antlr4-runtime-annotations" + ,java-tunnelvisionlabs-antlr4-runtime-annotations))))) + +(define java-tunnelvisionlabs-antlr4-bootstrap + (package + (inherit antlr4) + (name "java-tunnelvisionlabs-antlr4") + (version (package-version java-tunnelvisionlabs-antlr4-runtime-annotations)) + (source (package-source java-tunnelvisionlabs-antlr4-runtime-annotations)) + (arguments + (substitute-keyword-arguments (package-arguments antlr4) + ((#:test-dir _) + "tool/test:runtime-testsuite/src") + ((#:phases phases) + `(modify-phases ,phases + (delete 'remove-unrelated-languages) + (delete 'remove-graphemes) + (delete 'generate-test-parsers) + (delete 'check))))) + (native-inputs '()) + (inputs + `(("antlr3" ,antlr3) + ("java-antlr4-runtime" ,java-tunnelvisionlabs-antlr4-runtime-bootstrap) + ("java-tunnelvisionlabs-antlr4-runtime-annotations" + ,java-tunnelvisionlabs-antlr4-runtime-annotations) + ("java-icu4j" ,java-icu4j) + ("java-jsonp-api" ,java-jsonp-api) + ("java-stringtemplate" ,java-stringtemplate) + ("java-treelayout" ,java-treelayout))))) + +(define-public java-tunnelvisionlabs-antlr4-runtime + (package + (inherit java-tunnelvisionlabs-antlr4-runtime-bootstrap) + (native-inputs + (map + (match-lambda + ((name package) + (if (equal? name "antlr4") + (list name java-tunnelvisionlabs-antlr4-bootstrap) + (list name package)))) + (package-native-inputs java-tunnelvisionlabs-antlr4-runtime-bootstrap))))) + + (define-public java-commons-cli-1.2 ;; This is a bootstrap dependency for Maven2. (package -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 14/15] gnu: Add java-tunnelvisionlabs-antlr4. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:20:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115875016991 (code B ref 43639); Sat, 26 Sep 2020 22:20:04 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:19:10 +0000 Received: from localhost ([127.0.0.1]:47951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIX7-0004Pt-Sn for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:19:10 -0400 Received: from lepiller.eu ([89.234.186.109]:49482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWt-0004Mg-W1 for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:56 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 53597a3e for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=5vUH9+uxIP+3nZGTuSKCbMK+u 3q+gLvdLvlOkj9BLP8=; b=f/BnzUvfAskZkmJIeA6WPZj27q3FVF3sg5+T0W7Tl JIxo4+kCOMgTzrN4md1GQJk8Jc5iufJlP8jT57dIMmf0d9AOJFPWti6WZV7ukS7D z2jLaOudwbFKOYVUmWeGwpQNQ3sufssKSYG3KmOGlFCEElRewZL16iDNwNVsWBFP hvlKhAKd2gDMostwMw/v5oQup+7hfg6G4aRmVlbW/tRDg1KsxLj6dUH2Q2kWUcUY 0coqRth4SlUYZ4TQRY67MjgW8j1V92TJqQFXof8BN3nQjsN1qCCm65dDjIwtf2mG w+diaYNTebouOhVE5ELs/FPHnmRwn8ofsH6ml0Mgh9uDw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id da1408fb (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:47 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:23 +0200 Message-Id: <20200926221824.20925-14-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-tunnelvisionlabs-antlr4): New variable. --- gnu/packages/java.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 83d26c4ab4..8b6f3f945b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8630,6 +8630,17 @@ the runtime library of ANTLR."))) (list name package)))) (package-native-inputs java-tunnelvisionlabs-antlr4-runtime-bootstrap))))) +(define-public java-tunnelvisionlabs-antlr4 + (package + (inherit java-tunnelvisionlabs-antlr4-bootstrap) + (inputs + (map + (match-lambda + ((name package) + (if (equal? name "java-antlr4-runtime") + (list name java-tunnelvisionlabs-antlr4-runtime) + (list name package)))) + (package-inputs java-tunnelvisionlabs-antlr4-bootstrap))))) (define-public java-commons-cli-1.2 ;; This is a bootstrap dependency for Maven2. -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 15/15] gnu: Add java-javaparser. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:20:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115875016998 (code B ref 43639); Sat, 26 Sep 2020 22:20:04 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:19:10 +0000 Received: from localhost ([127.0.0.1]:47953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIX8-0004Q0-4x for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:19:10 -0400 Received: from lepiller.eu ([89.234.186.109]:49482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWu-0004Mg-Ov for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:57 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 83dec06c for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=j+b+xruuTiBIfnAC/XIzA8206 jjJ7oVesK3lxFNlL4A=; b=l0viJj1RvxczQdf5cX+s9X9P0H9cMDTBehIyCVkBn t5x0Na+bE+OFio12cP7ke7lxxAYSdenmHQY3IqUE1/HAMqXBy8ZpwTKpvO+vwLY6 j/ZOkQE4z91lTiW8uw5a9me4EEDsfGgadrMf6h+cuUOZmAkgHGhgGMnjzIEzI5ZW fz5Dn86+e87nz/Cy1XIfB8+9mCAtWnK/w19mn+i/A4YTMOFlzMqIRdFaYOK4LqvB Gu+X5CWE+Go32KXyjBRfA6Fv1l1oGlRFNFQ2yZ2RIpms5egw3Bst9jYqJfFEryS2 rTKrgUcl53gG3abaHfQTVGnkcspSxYtkZgCVkSQyhH6tg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ad7a4838 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:48 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:24 +0200 Message-Id: <20200926221824.20925-15-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-javaparser): New variable. --- gnu/packages/java.scm | 95 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8b6f3f945b..c96fee2bb5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13441,3 +13441,98 @@ in Java, usable from Groovy, Kotlin, Scala, etc.") used in JVM-based languages. They serve as an additional documentation and can be interpreted by IDEs and static analysis tools to improve code analysis.") (license license:expat))) + +(define-public java-javaparser + (package + (name "java-javaparser") + (version "3.16.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/javaparser/javaparser") + (commit (string-append "javaparser-parent-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1a4jk12ffa31fa0y8vda0739vpfj1206p0nha842b7bixbvwamv9")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file + (find-files "." "\\.jar$")) + #t)))) + (build-system ant-build-system) + (arguments + `(#:tests? #f; tests require jbehave and junit5 + #:phases + (modify-phases %standard-phases + (add-before 'build 'fill-template + (lambda _ + (with-directory-excursion "javaparser-core/src/main" + (copy-file "java-templates/com/github/javaparser/JavaParserBuild.java" + "java/com/github/javaparser/JavaParserBuild.java") + (substitute* "java/com/github/javaparser/JavaParserBuild.java" + (("\\$\\{project.version\\}") ,version) + (("\\$\\{project.name\\}") "javaparser") + (("\\$\\{project.build.finalName\\}") "javaparser") + (("\\$\\{maven.version\\}") "fake") + (("\\$\\{maven.build.version\\}") "fake") + (("\\$\\{build.timestamp\\}") "0") + (("\\$\\{java.vendor\\}") "Guix") + (("\\$\\{java.vendor.url\\}") "https://gnu.org/software/guix") + (("\\$\\{java.version\\}") "1.8") + (("\\$\\{os.arch\\}") "any") + (("\\$\\{os.name\\}") "GuixSD") + (("\\$\\{os.version\\}") "not available"))) + #t)) + (add-before 'build 'generate-javacc + (lambda _ + (with-directory-excursion "javaparser-core/src/main/java" + (invoke "java" "javacc" "../javacc/java.jj")) + #t)) + (add-before 'build 'copy-javacc-support + (lambda _ + (with-directory-excursion "javaparser-core/src/main" + (copy-recursively "javacc-support" "java")) + #t)) + (replace 'build + (lambda _ + (define (build name) + (format #t "Building ~a~%" name) + (delete-file-recursively "build/classes") + (mkdir-p "build/classes") + (apply invoke "javac" + "-cp" (string-append (getenv "CLASSPATH") ":" + (string-join (find-files "build/jar" ".") + ":")) + "-d" "build/classes" + (find-files (string-append name "/src/main/java") + ".*.java")) + (invoke "jar" "-cf" (string-append "build/jar/" name ".jar") + "-C" "build/classes" ".")) + (mkdir-p "build/classes") + (mkdir-p "build/test-classes") + (mkdir-p "build/jar") + (build "javaparser-core") + (build "javaparser-core-serialization") + (build "javaparser-core-generators") + (build "javaparser-core-metamodel-generator") + (build "javaparser-symbol-solver-core") + #t)) + (replace 'install + (install-jars "build/jar"))))) + (inputs + `(("java-guava" ,java-guava) + ("java-jboss-javassist" ,java-jboss-javassist) + ("java-jsonp-api" ,java-jsonp-api))) + (native-inputs + `(("javacc" ,javacc))) + (home-page "http://javaparser.org/") + (synopsis "Parser for Java") + (description + "This project contains a set of libraries implementing a Java 1.0 - Java +11 Parser with advanced analysis functionalities.") + (license (list + ;; either lgpl or asl + license:lgpl3+ + license:asl2.0)))) -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 12/15] gnu: Add java-tunnelvisionlabs-antlr4-runtime-annotations. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:20:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115875217007 (code B ref 43639); Sat, 26 Sep 2020 22:20:05 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:19:12 +0000 Received: from localhost ([127.0.0.1]:47955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIX8-0004Q7-Jk for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:19:12 -0400 Received: from lepiller.eu ([89.234.186.109]:49480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIWs-0004Lo-EL for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:18:59 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 6b0e94ce for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=pL2M3xDJEpC1qlylcDSOD0L3S 7WZqsaBbVsRLbO2I1w=; b=FswHTDfu3ndKdxU5LIIjLPAELJAXZONhqdctLaxRg iUv/ZyHCXR6EDuU1mx1lls/dvnkdbi6sT/ynbrrQoxZsXcP/gNM6F5xjvvfdtePT DWcM01PKjvOr9BUAn00JvT7gGy6buNfJS8ey4f58tK6ibG0OWPDcp8n/ojBcFsCf Mk3PmduYP7G0C/8dTt1iUUpyGTHavcCuHc1+/nHUWP1uffF3mEN9FGFcOn4S8WrQ Pvr1tNw/3xzR8naHBnFPJnuhZXtrTvN/TqKTj+f20DRGFs4/+ljK2cC92eN7HXCv R7iMTJLM/3CusscvXQywHRsN8fuGNk//Rqs1awjvf6eCA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 3057480b (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:18:46 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:18:21 +0200 Message-Id: <20200926221824.20925-12-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200926221824.20925-1-julien@lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> <20200926221824.20925-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-tunnelvisionlabs-antlr4-runtime-annotations): New variable. * gnu/packages/patches/java-tunnelvisionlabs-antlr-code-too-large.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/java.scm | 38 ++++++++ ...unnelvisionlabs-antlr-code-too-large.patch | 87 +++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 gnu/packages/patches/java-tunnelvisionlabs-antlr-code-too-large.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8e2f1976bf..01a825721d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1161,6 +1161,7 @@ dist_patch_DATA = \ %D%/packages/patches/jamvm-2.0.0-opcode-guard.patch \ %D%/packages/patches/java-antlr4-Add-standalone-generator.patch \ %D%/packages/patches/java-antlr4-fix-code-too-large.java \ + %D%/packages/patches/java-tunnelvisionlabs-antlr-code-too-large.patch \ %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ %D%/packages/patches/java-commons-collections-fix-java8.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 198a06c292..73a5fbd693 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8520,6 +8520,44 @@ parse trees."))) (list name package)))) (package-inputs antlr4))))) +(define-public java-tunnelvisionlabs-antlr4-runtime-annotations + (package + (inherit java-antlr4-runtime) + (name "java-tunnelvisionlabs-antlr4-runtime-annotations") + (version "4.7.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tunnelvisionlabs/antlr4") + (commit (string-append version "-opt")))) + (file-name (git-file-name "java-tunnelvisionlabs-antlr4" version)) + (sha256 + (base32 + "1mf2lvvsszpialsk23ma83pwp50nd32lrbjpa847zlm5gmranbr8")) + (patches + (search-patches "java-antlr4-Add-standalone-generator.patch" + "java-tunnelvisionlabs-antlr-code-too-large.patch")))) + (arguments + `(#:jar-name "java-antlr4-runtime-annotations.jar" + #:source-dir "runtime/JavaAnnotations/src" + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (add-after 'build 'copy-resources + (lambda _ + (copy-recursively "runtime/JavaAnnotations/resources" + "build/classes") + #t)) + (add-after 'copy-resources 'rebuild-jar + (lambda _ + (invoke "ant" "jar") + #t))))) + (inputs '()) + (native-inputs '()) + (synopsis "Annotations for ANTLR's runtime library") + (description "This package contains annotations used during the build of +the runtime library of ANTLR."))) + (define-public java-commons-cli-1.2 ;; This is a bootstrap dependency for Maven2. (package diff --git a/gnu/packages/patches/java-tunnelvisionlabs-antlr-code-too-large.patch b/gnu/packages/patches/java-tunnelvisionlabs-antlr-code-too-large.patch new file mode 100644 index 0000000000..7bdf05eb9c --- /dev/null +++ b/gnu/packages/patches/java-tunnelvisionlabs-antlr-code-too-large.patch @@ -0,0 +1,87 @@ +From 56ae699a27eca52cc0bb14cbc9944b62136be52b Mon Sep 17 00:00:00 2001 +From: Julien Lepiller +Date: Sun, 20 Sep 2020 21:07:29 +0200 +Subject: [PATCH] Separate addPropertyAliases in two methods + +The quantity of data used to generate addPropertyAliases creates a big +method, that is too big for java and results in "error: code too large". +This is most likely due to added data between the expected version of +icu and the actual version of icu in Guix. +--- + .../org/antlr/v4/tool/templates/unicodedata.st | 15 ++++++++++++--- + .../unicode/UnicodeDataTemplateController.java | 18 ++++++++++-------- + 2 files changed, 22 insertions(+), 11 deletions(-) + +diff --git a/tool/resources/org/antlr/v4/tool/templates/unicodedata.st b/tool/resources/org/antlr/v4/tool/templates/unicodedata.st +index f5052b7..125d15b 100644 +--- a/tool/resources/org/antlr/v4/tool/templates/unicodedata.st ++++ b/tool/resources/org/antlr/v4/tool/templates/unicodedata.st +@@ -1,4 +1,4 @@ +-unicodedata(propertyCodePointRanges, propertyAliases) ::= << ++unicodedata(propertyCodePointRanges, propertyAliasesA, propertyAliasesB) ::= << + package org.antlr.v4.unicode; + + import java.util.Arrays; +@@ -17,7 +17,7 @@ public enum UnicodeData { + ; + + private static final Map\ propertyCodePointRanges = new HashMap\(); +- private static final Map\ propertyAliases = new HashMap\(); ++ private static final Map\ propertyAliases = new HashMap\( + ); + + // Work around Java 64k bytecode method limit by splitting up static + // initialization into one method per Unicode property +@@ -33,8 +33,17 @@ static private void addProperty() { + \}}; separator="\n\n"> + + // Property aliases ++ static private void addPropertyAliasesA() { ++ ".toLowerCase(Locale.US), "".toLowerCase(Locale.US)); }; separator="\n"> ++ } ++ ++ static private void addPropertyAliasesB() { ++ ".toLowerCase(Locale.US), "".toLowerCase(Locale.US)); }; separator="\n"> ++ } ++ + static private void addPropertyAliases() { +- ".toLowerCase(Locale.US), "".toLowerCase(Locale.US)); }; separator="\n"> ++ addPropertyAliasesA(); ++ addPropertyAliasesB(); + } + + // Put it all together +diff --git a/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java b/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java +index 570190c..692cee0 100644 +--- a/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java ++++ b/tool/src/org/antlr/v4/unicode/UnicodeDataTemplateController.java +@@ -74,17 +74,19 @@ public abstract class UnicodeDataTemplateController { + addTR35ExtendedPictographicPropertyCodesToCodePointRanges(propertyCodePointRanges); + addEmojiPresentationPropertyCodesToCodePointRanges(propertyCodePointRanges); + +- Map propertyAliases = new LinkedHashMap(); +- addUnicodeCategoryCodesToNames(propertyAliases); +- addUnicodeBinaryPropertyCodesToNames(propertyAliases); +- addUnicodeScriptCodesToNames(propertyAliases); +- addUnicodeBlocksToNames(propertyAliases); +- addUnicodeIntPropertyCodesToNames(propertyAliases); +- propertyAliases.put("EP", "Extended_Pictographic"); ++ Map propertyAliasesA = new LinkedHashMap(); ++ Map propertyAliasesB = new LinkedHashMap(); ++ addUnicodeCategoryCodesToNames(propertyAliasesA); ++ addUnicodeBinaryPropertyCodesToNames(propertyAliasesA); ++ addUnicodeScriptCodesToNames(propertyAliasesA); ++ addUnicodeBlocksToNames(propertyAliasesB); ++ addUnicodeIntPropertyCodesToNames(propertyAliasesB); ++ propertyAliasesB.put("EP", "Extended_Pictographic"); + + Map properties = new LinkedHashMap(); + properties.put("propertyCodePointRanges", propertyCodePointRanges); +- properties.put("propertyAliases", propertyAliases); ++ properties.put("propertyAliasesA", propertyAliasesA); ++ properties.put("propertyAliasesB", propertyAliasesB); + return properties; + } + +-- +2.28.0 + -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#43639] [PATCH 16/16] gnu: groovy: Update to 3.0.5. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 22:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43639@debbugs.gnu.org Received: via spool by 43639-submit@debbugs.gnu.org id=B43639.160115902417514 (code B ref 43639); Sat, 26 Sep 2020 22:24:02 +0000 Received: (at 43639) by debbugs.gnu.org; 26 Sep 2020 22:23:44 +0000 Received: from localhost ([127.0.0.1]:47986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIbW-0004YN-7a for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:23:44 -0400 Received: from lepiller.eu ([89.234.186.109]:49494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIbS-0004YE-Pd for 43639@debbugs.gnu.org; Sat, 26 Sep 2020 18:23:41 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 16fafccd for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:23:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=x+MCDLwa5jC9py1HRTuqXpiw1 0QGqjDTVNIjlRQzGEo=; b=Abc0lQXYZSgVG9pvv7ZCxXB5aB8JK6XcaINz7uP4Z dzbgVs71sJudMjNbpw+I9pHMOvHSRwgg/suEUQ1JW7WOYZB7L2aXdjbR0uB8MJuT NZWjnKAeoEkdPb01sn1Rzd5uj8tSkzgI5BhhZKWk6RYpHd9FaRYuk7zk9PV3NFsK zV+se38Gk9m+YED93ZdRUnfAxuCLRtnrM+ZCq1c9sWMvFsrBkKE0ro4pt8JO8EwI vN6i40oA5gZZoIMC5UO5CafDV52DP1ooR98AbmdCerGNr3P3HZAS5eXuOqyXTSG9 uwUSiFEcNnBylNJT7rGHccoIRULmN9SUUlqyS+/o2Ss0Q== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 978ea8ad (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639@debbugs.gnu.org>; Sat, 26 Sep 2020 22:23:37 +0000 (UTC) From: Julien Lepiller Date: Sun, 27 Sep 2020 00:23:25 +0200 Message-Id: <20200926222325.21057-1-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200927001335.40c2409a@tachikoma.lepiller.eu> References: <20200927001335.40c2409a@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/groovy.scm (groovy): Update to 3.0.5. --- gnu/packages/groovy.scm | 1430 ++++++++++++++++----------------------- 1 file changed, 577 insertions(+), 853 deletions(-) diff --git a/gnu/packages/groovy.scm b/gnu/packages/groovy.scm index e21c4e3775..c44a17b59e 100644 --- a/gnu/packages/groovy.scm +++ b/gnu/packages/groovy.scm @@ -31,7 +31,7 @@ (define java-groovy-bootstrap (package (name "java-groovy-bootstrap") - (version "2.4.15") + (version "3.0.5") (source (origin (method git-fetch) @@ -43,57 +43,69 @@ version))))) (file-name (git-file-name name version)) (sha256 - (base32 "1q4cplimr18j93zz92kgq8b6wdv0p9svr7cdr47q8b2mbjpd0x3j")) + (base32 "00556qxjmcn3a3xhfy6n0zw3d69mnw72vzm2rb6n4ihzkk7579nm")) (patches (search-patches "groovy-add-exceptionutilsgenerator.patch")))) (build-system ant-build-system) (arguments `(#:jar-name "groovy.jar" - #:source-dir "src/main:subprojects/groovy-test/src/main/java" + #:source-dir "src/main/java:src/main/antlr2:subprojects/parser-antlr4/src/main/java:src/antlr" #:test-dir "src/test" #:tests? #f - #:jdk ,icedtea-8 + #:jdk ,openjdk9 #:main-class "groovy.ui.GroovyMain" #:phases (modify-phases %standard-phases - (add-before 'build 'fix-java8 - ;; Fix "Reference to plus is ambiguous" - (lambda _ - (substitute* "src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java" - (("toList\\(left\\)") - "(List)toList(left)")) - #t)) (add-before 'build 'generate-parsers (lambda _ - (with-directory-excursion "src/main/org/codehaus/groovy/antlr/java" + (with-directory-excursion "src/main/antlr2/org/codehaus/groovy/antlr/java" (invoke "antlr" "java.g")) - (with-directory-excursion "src/main/org/codehaus/groovy/antlr" + (with-directory-excursion "src/main/antlr2/org/codehaus/groovy/antlr" (mkdir "parser") (with-directory-excursion "parser" (invoke "antlr" "../groovy.g"))) + (invoke "antlr4" "-lib" "src/antlr" + "-package" "org.apache.groovy.parser.antlr4" + "-visitor" "-no-listener" "src/antlr/GroovyLexer.g4") + (invoke "antlr4" "-lib" "src/antlr" + "-package" "org.apache.groovy.parser.antlr4" + "-visitor" "-no-listener" "src/antlr/GroovyParser.g4") #t)) (add-before 'build 'generate-exception-utils (lambda _ (invoke "javac" "-cp" (getenv "CLASSPATH") + "-source" "1.8" "-target" "1.8" "config/ant/src/org/codehaus/groovy/ExceptionUtilsGenerator.java") (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":config/ant/src") "org.codehaus.groovy.ExceptionUtilsGenerator" "build/classes/org/codehaus/groovy/runtime/ExceptionUtils.class") + #t)) + (add-before 'build 'set-source-level + (lambda _ + (substitute* "build.xml" + ((")toList(left)")) - #t)) (add-before 'build 'generate-parser (lambda _ - (with-directory-excursion "src/main/org/codehaus/groovy/antlr/java" + (with-directory-excursion "src/main/antlr2/org/codehaus/groovy/antlr/java" (invoke "antlr" "java.g")) - (with-directory-excursion "src/main/org/codehaus/groovy/antlr" + (with-directory-excursion "src/main/antlr2/org/codehaus/groovy/antlr" (mkdir "parser") (with-directory-excursion "parser" (invoke "antlr" "../groovy.g"))) + (invoke "antlr4" "-lib" "src/antlr" + "-package" "org.apache.groovy.parser.antlr4" + "-visitor" "-no-listener" "src/antlr/GroovyLexer.g4") + (invoke "antlr4" "-lib" "src/antlr" + "-package" "org.apache.groovy.parser.antlr4" + "-visitor" "-no-listener" "src/antlr/GroovyParser.g4") #t)) (add-before 'build 'generate-exception-utils (lambda _ @@ -141,19 +152,19 @@ groovy submodules.") (mkdir-p "target/classes/org/codehaus/groovy/runtime") (mkdir-p "target/classes/META-INF") (invoke "javac" "-cp" (getenv "CLASSPATH") - "src/main/org/codehaus/groovy/tools/DgmConverter.java") + "src/main/java/org/codehaus/groovy/tools/DgmConverter.java") (invoke "java" "-cp" (string-append (getenv "CLASSPATH") - ":src/main") + ":src/main/java") "org.codehaus.groovy.tools.DgmConverter") #t)) (add-before 'build 'copy-resources (lambda _ - (with-directory-excursion "src/main" + (with-directory-excursion "src/main/java" (for-each (lambda (file) - (mkdir-p (string-append "../../target/classes/" + (mkdir-p (string-append "../../../target/classes/" (dirname file))) (copy-file file - (string-append "../../target/classes/" + (string-append "../../../target/classes/" file))) (find-files "." ".*.(txt|properties|xml|html)"))) #t)) @@ -162,6 +173,7 @@ groovy submodules.") (mkdir-p "build/jar") (apply invoke "java" "-cp" (getenv "CLASSPATH") "org.codehaus.groovy.tools.FileSystemCompiler" + "-cp" (getenv "CLASSPATH") "-d" "target/classes" "-j"; joint compilation (find-files "src/main" @@ -186,7 +198,7 @@ is used to build the groovy submodules written in groovy."))) (name "groovy-tests-bootstrap") (arguments `(#:jar-name "groovy-tests-bootstrap.jar" - #:jdk ,icedtea-8 + #:jdk ,openjdk9 #:tests? #f; no tests #:phases (modify-phases %standard-phases @@ -196,17 +208,20 @@ is used to build the groovy submodules written in groovy."))) (mkdir-p "build/jar") (apply invoke "java" "-cp" (getenv "CLASSPATH") "org.codehaus.groovy.tools.FileSystemCompiler" + "-cp" (getenv "CLASSPATH") "-d" "build/classes" "-j"; joint compilation (append (find-files "src/test" "TestSupport.java") (find-files "src/test" "HeadlessTestSupport.java") + (find-files "src/test" "AstAssert.groovy") (find-files "src/test" "XmlAssert.java"))) (invoke "jar" "-cf" "build/jar/groovy-tests-bootstrap.jar" "-C" "build/classes" ".") #t))))) (inputs `(("groovy-test" ,groovy-test) + ("groovy-parser-antlr4" ,groovy-parser-antlr4) ,@(package-inputs groovy-bootstrap))) (native-inputs `(("groovy-bootstrap" ,groovy-bootstrap) @@ -215,855 +230,548 @@ is used to build the groovy submodules written in groovy."))) (description "This package contains three classes required for testing other groovy submodules."))) +(define (groovy-subproject name) + (package + (inherit groovy-bootstrap) + (name name) + (arguments + `(#:jar-name ,(string-append name ".jar") + #:test-dir ,(string-append name "/src/test") + #:test-include (list "**/*Test.java" "**/*.groovy") + #:jdk ,openjdk9 + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (mkdir-p "build/classes") + (mkdir-p "build/jar") + (apply invoke "java" "-cp" (getenv "CLASSPATH") + "org.codehaus.groovy.tools.FileSystemCompiler" + "-cp" (getenv "CLASSPATH") + "-d" "build/classes" "-j" + (append + (find-files ,(string-append "subprojects/" name "/src/main/java") + ".*\\.(groovy|java)$") + (find-files ,(string-append "subprojects/" name "/src/main/groovy") + ".*\\.(groovy|java)$"))) + (invoke "jar" "-cf" ,(string-append "build/jar/" name ".jar") + "-C" "build/classes" ".") + #t)) + (add-before 'build 'copy-resources + (lambda _ + (let ((resource-dir ,(string-append "subprojects/" name + "/src/main/resources"))) + (when (file-exists? resource-dir) + (copy-recursively resource-dir "build/classes"))) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (mkdir-p "build/test-classes") + (substitute* "build.xml" + (("depends=\"compile-tests\"") "depends=\"\"") + (("}/java") "}/")) + (apply invoke "java" "-cp" + (string-append (getenv "CLASSPATH") ":build/classes") + "org.codehaus.groovy.tools.FileSystemCompiler" "-cp" + (string-append (getenv "CLASSPATH") ":build/classes") + "-d" "build/test-classes" "-j" + (append + (find-files ,(string-append "subprojects/" name "/src/test/java") + ".*\\.(groovy|java)$") + (find-files ,(string-append "subprojects/" name "/src/test/groovy") + ".*\\.(groovy|java)$"))) + (invoke "ant" "check")) + #t))))))) + +(define groovy-parser-antlr4 + (let ((base (groovy-subproject "parser-antlr4"))) + (package + (inherit base) + (name "groovy-parser-antlr4") + (arguments + `(#:tests? #f + ,@(substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'generate-parser + (lambda _ + (invoke "antlr4" "-lib" "src/antlr" + "-package" "org.apache.groovy.parser.antlr4" + "-visitor" "-no-listener" "src/antlr/GroovyLexer.g4") + (invoke "antlr4" "-lib" "src/antlr" + "-package" "org.apache.groovy.parser.antlr4" + "-visitor" "-no-listener" "src/antlr/GroovyParser.g4") + (for-each + (lambda (file) + (install-file file + "subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4")) + (find-files "src/antlr" ".*.java$")) + #t))))))) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ,@(package-native-inputs java-groovy-bootstrap))) + (synopsis "Groovy antlr4 parser submodule") + (description "This package contains the new parser Parrot for Groovy, which +is based on Antlr4. The new parser can parse Groovy source code and construct +the related AST, which is almost identical to the one generated by the old +parser. Currently all features of Groovy are available.")))) + (define groovy-test - (package - (inherit groovy-bootstrap) - (name "groovy-test") - (arguments - `(#:jar-name "groovy-test.jar" - #:jdk ,icedtea-8 - #:test-dir "subprojects/groovy-test/src/test" - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "subprojects/groovy-test/src/main" - ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-test.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"") - (("}/java") "}/groovy")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" "-j" - (append (find-files "subprojects/groovy-test/src/test" - ".*\\.(groovy|java)$"))) - (invoke "ant" "check") - #t))))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy test submodule") - (description "This package contains the test submodules used to test -other groovy submodules."))) + (let ((base (groovy-subproject "groovy-test"))) + (package + (inherit base) + (arguments + `(;#:tests? #f + ,@(package-arguments base))) + (synopsis "Groovy test submodule") + (description "This package contains the test submodules used to test +other groovy submodules.")))) (define groovy-xml - (package - (inherit groovy-bootstrap) - (name "groovy-xml") - (arguments - `(#:jar-name "groovy-xml.jar" - #:jdk ,icedtea-8 - #:test-dir "src/test" - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-xml") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-xml.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"") - (("}/java") "}/groovy")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" "-j" - (append (find-files "src/test" ".*\\.(groovy|java)$"))) - (invoke "ant" "check") - #t))))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy XML") - (description "This package contains XML-related utilities for groovy."))) + (let ((base (groovy-subproject "groovy-xml"))) + (package + (inherit base) + (native-inputs + `(("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (inputs + `(("groovy-parser-antlr4" ,groovy-parser-antlr4) + ,@(package-inputs base))) + (synopsis "Groovy XML") + (description "This package contains XML-related utilities for groovy.")))) (define groovy-templates - (package - (inherit groovy-bootstrap) - (name "groovy-templates") - (arguments - `(#:jar-name "groovy-templates.jar" - #:jdk ,icedtea-8 - #:test-dir "subprojects/groovy-templates/src/test" - #:tests? #f;Requires spock-framework which is a circular dependency - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "subprojects/groovy-templates/src/main" - ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-templates.jar" - "-C" "build/classes" ".") - #t))))) - (inputs - `(("groovy-xml" ,groovy-xml) - ,@(package-inputs groovy-bootstrap))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy template engine") - (description "This package contains a template framework which is + (let ((base (groovy-subproject "groovy-templates"))) + (package + (inherit base) + (arguments + `(#:tests? #f;Requires spock-framework which is a circular dependency + ,@(substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + ;; These annotations are used for QA, but do not affect build output. + ;; They require findbugs, which we don't have yet. + (add-before 'build 'remove-annotation + (lambda _ + (substitute* '("subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java" + "subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java") + (("import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;") "") + (("@SuppressFBWarnings.*") "")) + #t))))))) + (inputs + `(("groovy-xml" ,groovy-xml) + ,@(package-inputs base))) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (synopsis "Groovy template engine") + (description "This package contains a template framework which is well-suited to applications where the text to be generated follows the form of -a static template."))) +a static template.")))) (define groovy-groovydoc - (package - (inherit groovy-bootstrap) - (name "groovy-groovydoc") - (arguments - `(#:jar-name "groovy-groovydoc.jar" - #:jdk ,icedtea-8 - #:test-dir "subprojects/groovy-groovydoc/src/test" - #:tests? #f; Requires groovy-ant which is a circular dependency - #:phases - (modify-phases %standard-phases - (add-before 'build 'copy-resources - (lambda _ - (copy-recursively "subprojects/groovy-groovydoc/src/main/resources" - "build/classes") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" - "-j"; joint compilation - (find-files "subprojects/groovy-groovydoc/src/main" - ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-groovydoc.jar" - "-C" "build/classes" ".") - #t))))) - (inputs - `(("groovy-templates" ,groovy-templates) - ,@(package-inputs groovy-bootstrap))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy documentation generation") - (description "This package contains the groovy documentation generator, -similar to javadoc."))) + (let ((base (groovy-subproject "groovy-groovydoc"))) + (package + (inherit base) + (arguments + `(#:tests? #f; Requires groovy-ant which is a circular dependency + ,@(package-arguments base))) + (inputs + `(("groovy-templates" ,groovy-templates) + ("groovy-parser-antlr4" ,groovy-parser-antlr4) + ("java-javaparser" ,java-javaparser) + ,@(package-inputs groovy-bootstrap))) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs java-groovy-bootstrap))) + (synopsis "Groovy documentation generation") + (description "This package contains the groovy documentation generator, +similar to javadoc.")))) (define groovy-ant - (package - (inherit groovy-bootstrap) - (name "groovy-ant") - (arguments - `(#:jar-name "groovy-ant.jar" - #:jdk ,icedtea-8 - #:test-dir "src/test" - ;; FIXME: Excluding all tests because they fail - #:test-exclude (list - "**/GroovyTest.java" - "**/GroovycTest.java") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-ant") - #t)) - (add-before 'build 'copy-resources - (lambda _ - (copy-recursively "src/main/resources" "build/classes") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-ant.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"") - (("}/java") "}/groovy")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" "-j" - (find-files "src/test" ".*\\.(groovy|java)$")) - (invoke "ant" "check") - #t))))) - (inputs - `(("groovy-groovydoc" ,groovy-groovydoc) - ,@(package-inputs groovy-bootstrap))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-xml" ,groovy-xml) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy ant tasks") - (description "This package contains groovy-related ant tasks definitions."))) + (let ((base (groovy-subproject "groovy-ant"))) + (package + (inherit base) + (arguments + `(;#:tests? #f;Requires spock-framework which is a circular dependency + #:ant ,ant/java8; ant is actually a dependency of this package, and we need 1.10 + ,@(substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + ;; These annotations are used for QA, but do not affect build output. + ;; They require findbugs, which we don't have yet. + (add-before 'build 'remove-annotation + (lambda _ + (substitute* (find-files "subprojects/groovy-ant" + ".*.java$") + (("import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;") "") + (("@SuppressFBWarnings.*") "")) + #t))))))) + (inputs + `(("groovy-groovydoc" ,groovy-groovydoc) + ("java-asm-tree" ,java-asm-tree-8) + ("java-asm-analysis" ,java-asm-analysis-8) + ,@(package-inputs base))) + (native-inputs + `(("ant-junit" ,ant-junit) + ("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-xml" ,groovy-xml) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (synopsis "Groovy ant tasks") + (description "This package contains groovy-related ant tasks definitions.")))) + +(define groovy-astbuilder + (let ((base (groovy-subproject "groovy-astbuilder"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (delete 'copy-resources) + (add-after 'build 'copy-resources + (lambda _ + (copy-recursively + "subprojects/groovy-astbuilder/src/main/resources" + "build/classes") + (substitute* "build.xml" + (("depends=\"compile,") "depends=\"")) + (invoke "ant" "jar") + #t)))))) + (inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ,@(package-inputs base))) + (native-inputs + `(("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (synopsis "Transformation to capture ASTBuilder from code statements") + (description "This package contains an AST transformation for use with +ASTBuilder when building \"from string\" Groovy statements.")))) (define groovy-bsf - (package - (inherit groovy-bootstrap) - (name "groovy-bsf") - (arguments - `(#:jar-name "groovy-bsf.jar" - #:jdk ,icedtea-8 - #:test-dir "src/test" - #:test-exclude (list + (let ((base (groovy-subproject "groovy-bsf"))) + (package + (inherit base) + (arguments + `(#:test-exclude (list ;; exception from Groovy: org.codehaus.groovy.runtime.InvokerInvocationException: ;; groovy.lang.MissingMethodException: No signature of method: ;; java.util.ArrayList.each() is applicable for argument types: ;; (groovy.script.MapFromList$_doit_closure1) values: ;; [groovy.script.MapFromList$_doit_closure1@17e554d5] "**/BSFTest.java") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-bsf") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-bsf.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" "-j" - (find-files "src/test" ".*\\.(groovy|java)$")) - (invoke "ant" "check") - #t))))) - (inputs - `(("java-commons-bsf" ,java-commons-bsf) - ,@(package-inputs groovy-bootstrap))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ("java-commons-logging-minimal" ,java-commons-logging-minimal) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy BSF engine") - (description "This package defines the BSF engine for using Groovy inside -any @dfn{Bean Scripting Framework} (BSF) application."))) + ,@(package-arguments base))) + (inputs + `(("java-commons-bsf" ,java-commons-bsf) + ,@(package-inputs base))) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ("java-commons-logging-minimal" ,java-commons-logging-minimal) + ,@(package-native-inputs base))) + (synopsis "Groovy BSF engine") + (description "This package defines the BSF engine for using Groovy inside +any @dfn{Bean Scripting Framework} (BSF) application.")))) + +(define groovy-cli-commons + (let ((base (groovy-subproject "groovy-cli-commons"))) + (package + (inherit base) + (inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ,@(package-inputs base))) + (native-inputs + `(("groovy-test" ,groovy-test) + ,@(package-native-inputs base))) + (synopsis "Groovy CLI common classes") + (description "This package defines common classes for dealing with +command-line arguments in Groovy.")))) + +(define groovy-cli-picocli + (let ((base (groovy-subproject "groovy-cli-picocli"))) + (package + (inherit base) + (inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("java-picocli" ,java-picocli) + ,@(package-inputs base))) + (native-inputs + `(("groovy-test" ,groovy-test) + ,@(package-native-inputs base))) + (synopsis "Groovy CLI classes that use picocli") + (description "This package defines classes for dealing with command-line +arguments in Groovy using the picocli library.")))) (define groovy-swing - (package - (inherit groovy-bootstrap) - (name "groovy-swing") - (arguments - `(#:jar-name "groovy-swing.jar" - #:jdk ,icedtea-8 - ;; FIXME: tests are not run - #:test-dir "src/test" - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-swing") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-swing.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "src/test/groovy/groovy/util/GroovySwingTestCase.groovy" - (("HeadlessTestSupport.headless") "isHeadless()")) - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"") - (("}/java") "}/groovy")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" "-j" - (find-files "src/test" ".*\\.(groovy|java)$")) - (invoke "ant" "check") - #t))))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ("java-commons-logging-minimal" ,java-commons-logging-minimal) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy graphical library") - (description "This package contains the groovy bindings to Java Swing, a -library used to build graphical interfaces."))) + (let ((base (groovy-subproject "groovy-swing"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'check 'fix-test + (lambda _ + (substitute* + "subprojects/groovy-swing/src/test/groovy/groovy/swing/GroovySwingTestCase.groovy" + (("HeadlessTestSupport.headless") "isHeadless()")) + #t)))))) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ("java-commons-logging-minimal" ,java-commons-logging-minimal) + ,@(package-native-inputs base))) + (synopsis "Groovy graphical library") + (description "This package contains the groovy bindings to Java Swing, a +library used to build graphical interfaces.")))) (define groovy-console - (package - (inherit groovy-bootstrap) - (name "groovy-console") - (arguments - `(#:jar-name "groovy-console.jar" - #:jdk ,icedtea-8 - ;; FIXME: tests are not run - #:test-dir "src/test" - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-console") - #t)) - (add-before 'build 'copy-resources - (lambda _ - (copy-recursively "src/main/resources" "build/classes") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-console.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"") - (("}/java") "}/groovy")) - (substitute* - "../groovy-swing/src/test/groovy/groovy/util/GroovySwingTestCase.groovy" - (("HeadlessTestSupport.headless") "isHeadless()")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" "-j" - (append - (find-files "../groovy-swing/src/test" ".*\\.(groovy|java)$") - (find-files "src/test" ".*\\.(groovy|java)$"))) - (invoke "ant" "check") - #t))))) - (inputs - `(("groovy-swing" ,groovy-swing) - ("groovy-templates" ,groovy-templates) - ,@(package-inputs groovy-bootstrap))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ("java-commons-logging-minimal" ,java-commons-logging-minimal) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy graphical interface") - (description "This package contains a graphical interface to run groovy."))) + (let ((base (groovy-subproject "groovy-console"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'check 'build-swing + (lambda _ + (substitute* + "subprojects/groovy-swing/src/test/groovy/groovy/swing/GroovySwingTestCase.groovy" + (("HeadlessTestSupport.headless") "isHeadless()")) + (mkdir-p "build/test-classes") + (apply invoke "java" "-cp" + (string-append (getenv "CLASSPATH") ":build/classes") + "org.codehaus.groovy.tools.FileSystemCompiler" "-cp" + (string-append (getenv "CLASSPATH") ":build/classes") + "-d" "build/test-classes" "-j" + (append + (find-files "subprojects/groovy-swing/src/test/java" + ".*\\.(groovy|java)$") + (find-files "subprojects/groovy-swing/src/test/groovy" + ".*\\.(groovy|java)$"))) + #t)))))) + (inputs + `(("groovy-swing" ,groovy-swing) + ("groovy-templates" ,groovy-templates) + ,@(package-inputs base))) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ("java-commons-logging-minimal" ,java-commons-logging-minimal) + ,@(package-native-inputs base))) + (synopsis "Groovy graphical interface") + (description "This package contains a graphical interface to run groovy.")))) + +(define groovy-datetime + (let ((base (groovy-subproject "groovy-datetime"))) + (package + (inherit base) + (native-inputs + `(("groovy-test" ,groovy-test) + ,@(package-native-inputs base))) + (synopsis "Date/Time API for Groovy") + (description "This package defines new Groovy methods which appear on +normal JDK Date/Time API (@code{java.time}) classes inside the Groovy +environment.")))) + +(define groovy-dateutil + (let ((base (groovy-subproject "groovy-dateutil"))) + (package + (inherit base) + (native-inputs + `(("groovy-test" ,groovy-test) + ,@(package-native-inputs base))) + (synopsis "Date and Calendar API for Groovy") + (description "This package defines new groovy methods which appear on +normal JDK Date and Calendar classes inside the Groovy environment.")))) (define groovy-docgenerator - (package - (inherit groovy-bootstrap) - (name "groovy-docgenerator") - (arguments - `(#:jar-name "groovy-docgenerator.jar" - #:jdk ,icedtea-8 - #:tests? #f; No tests - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-docgenerator") - #t)) - (add-before 'build 'copy-resources - (lambda _ - (copy-recursively "src/main/resources" "build/classes") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-docgenerator.jar" - "-C" "build/classes" ".") - #t))))) - (inputs - `(("groovy-templates" ,groovy-templates) - ("groovy-swing" ,groovy-swing) - ("java-qdox-1.12" ,java-qdox-1.12) - ,@(package-inputs groovy-bootstrap))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy documentation generation") - (description "This package contains a command line tool to generate -documentation for groovy applications."))) + (let ((base (groovy-subproject "groovy-docgenerator"))) + (package + (inherit base) + (arguments + `(#:tests? #f; No tests + ,@(package-arguments base))) + (inputs + `(("groovy-templates" ,groovy-templates) + ("groovy-swing" ,groovy-swing) + ("java-qdox-1.12" ,java-qdox-1.12) + ,@(package-inputs base))) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (synopsis "Groovy documentation generation") + (description "This package contains a command line tool to generate +documentation for groovy applications.")))) (define groovy-groovysh - (package - (inherit groovy-bootstrap) - (name "groovy-groovysh") - (arguments - `(#:jar-name "groovy-groovysh.jar" - #:test-dir "src/test" - #:jdk ,icedtea-8 - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-groovysh") - #t)) - (add-before 'build 'copy-resources - (lambda _ - (copy-recursively "src/main/resources" "build/classes") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-groovysh.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"") - (("}/java") "}/groovy")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" "-j" - (append (find-files "src/test" ".*\\.(groovy|java)$"))) - (invoke "ant" "check") - #t))))) - (inputs - `(("groovy-xml" ,groovy-xml) - ("groovy-console" ,groovy-console) - ,@(package-inputs groovy-bootstrap))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy REPL") - (description "This package contains the Groovy REPL."))) + (let ((base (groovy-subproject "groovy-groovysh"))) + (package + (inherit base) + (inputs + `(("groovy-xml" ,groovy-xml) + ("groovy-console" ,groovy-console) + ,@(package-inputs base))) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (synopsis "Groovy REPL") + (description "This package contains the Groovy REPL.")))) (define groovy-jmx - (package - (inherit groovy-bootstrap) - (name "groovy-jmx") - (arguments - `(#:jar-name "groovy-jmx.jar" - #:test-dir "src/test" - #:jdk ,icedtea-8 - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-jmx") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-jmx.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"") - (("}/java") "}/groovy")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" "-j" - (append (find-files "src/test" ".*\\.(groovy|java)$"))) - (invoke "ant" "check") - #t))))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy JMX extension") - (description "This package contains the JMX extension of Groovy, for -management and monitoring of JVM-based solutions."))) + (let ((base (groovy-subproject "groovy-jmx"))) + (package + (inherit base) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (synopsis "Groovy JMX extension") + (description "This package contains the JMX extension of Groovy, for +management and monitoring of JVM-based solutions.")))) (define groovy-json - (package - (inherit groovy-bootstrap) - (name "groovy-json") - (arguments - `(#:jar-name "groovy-json.jar" - #:test-dir "src/test" - #:jdk ,icedtea-8 - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-json") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-json.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"") - (("}/java") "}/groovy")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" "-j" - (append (find-files "src/test" ".*\\.(groovy|java)$"))) - (invoke "ant" "check") - #t))))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy JSON") - (description "This package contains JSON-related utilities for groovy."))) + (let ((base (groovy-subproject "groovy-json"))) + (package + (inherit base) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (synopsis "Groovy JSON") + (description "This package contains JSON-related utilities for groovy.")))) (define groovy-jsr223 - (package - (inherit groovy-bootstrap) - (name "groovy-jsr223") - (arguments - `(#:jar-name "groovy-jsr223.jar" - #:test-dir "src/test" - #:jdk ,icedtea-8 - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-jsr223") - #t)) - (add-before 'build 'copy-resources - (lambda _ - (copy-recursively "src/main/resources" "build/classes") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-jsr223.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"") - (("}/java") "}/groovy")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" "-j" - (append (find-files "src/test" ".*\\.(groovy|java)$"))) - (invoke "ant" "check") - #t))))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy's own JSR223 implementation") - (description "This package contains Groovy's own JSR223 implementation. This -module is used for interaction between Groovy and Java code."))) + (let ((base (groovy-subproject "groovy-jsr223"))) + (package + (inherit base) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (synopsis "Groovy's own JSR223 implementation") + (description "This package contains Groovy's own JSR223 implementation. This +module is used for interaction between Groovy and Java code.")))) (define groovy-nio - (package - (inherit groovy-bootstrap) - (name "groovy-nio") - (arguments - `(#:jar-name "groovy-nio.jar" - #:test-dir "src/test" - #:jdk ,icedtea-8 - #:tests? #f; Requires spock-framework - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-nio") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-nio.jar" - "-C" "build/classes" ".") - #t))))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy input-output library") - (description "This package implements an input/output library that extends -the functionality of the common library of Java."))) + (let ((base (groovy-subproject "groovy-nio"))) + (package + (inherit base) + (arguments + `(#:tests? #f; Require spock-framework + ,@(package-arguments base))) + (synopsis "Groovy input-output library") + (description "This package implements an input/output library that extends +the functionality of the common library of Java.")))) (define groovy-servlet - (package - (inherit groovy-bootstrap) - (name "groovy-servlet") - (arguments - `(#:jar-name "groovy-servlet.jar" - #:test-dir "src/test" - #:jdk ,icedtea-8 - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-servlet") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" - "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-servlet.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"") - (("}/java") "}/groovy")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" - "-j" - (append (find-files "src/test" ".*\\.(groovy|java)$"))) - (invoke "ant" "check") - #t))))) - (inputs - `(("groovy-templates" ,groovy-templates) - ("groovy-xml" ,groovy-xml) - ,@(package-inputs groovy-bootstrap))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-json" ,groovy-json) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy's servlet implementation") - (description "This package contains a library to create groovlets, Groovy's -version of Java servlets."))) + (let ((base (groovy-subproject "groovy-servlet"))) + (package + (inherit base) + (inputs + `(("groovy-templates" ,groovy-templates) + ("groovy-xml" ,groovy-xml) + ,@(package-inputs base))) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-json" ,groovy-json) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (synopsis "Groovy's servlet implementation") + (description "This package contains a library to create groovlets, Groovy's +version of Java servlets.")))) (define groovy-sql - (package - (inherit groovy-bootstrap) - (name "groovy-sql") - (arguments - `(#:jar-name "groovy-sql.jar" - #:test-dir "src/test" - #:tests? #f;TODO: Requires hsqldb - #:jdk ,icedtea-8 - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-sql") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" - ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-sql.jar" - "-C" "build/classes" ".") - #t))))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy SQL library") - (description "This package contains a facade over Java's normal JDBC APIs -providing greatly simplified resource management and result set handling."))) + (let ((base (groovy-subproject "groovy-sql"))) + (package + (inherit base) + (arguments + `(#:tests? #f;TODO: Requires hsqldb + ,@(package-arguments base))) + (synopsis "Groovy SQL library") + (description "This package contains a facade over Java's normal JDBC APIs +providing greatly simplified resource management and result set handling.")))) (define groovy-testng - (package - (inherit groovy-bootstrap) - (name "groovy-testng") - (arguments - `(#:jar-name "groovy-testng.jar" - #:tests? #f; No tests - #:jdk ,icedtea-8 - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-testng") - #t)) - (add-before 'build 'copy-resources - (lambda _ - (copy-recursively "src/main/resources" "build/classes") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" - "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-testng.jar" - "-C" "build/classes" ".") - #t))))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy testing framework") - (description "This package contains integration code for running TestNG -tests in Groovy."))) + (let ((base (groovy-subproject "groovy-testng"))) + (package + (inherit base) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (synopsis "Groovy testing framework") + (description "This package contains integration code for running TestNG +tests in Groovy.")))) (define groovy-macro - (package - (inherit groovy-bootstrap) - (name "groovy-macro") - (arguments - `(#:jar-name "groovy-macro.jar" - #:test-dir "src/test" - #:jdk ,icedtea-8 - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "subprojects/groovy-macro") - #t)) - (replace 'build - (lambda _ - (mkdir-p "build/classes") - (mkdir-p "build/jar") - (apply invoke "java" "-cp" (getenv "CLASSPATH") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/classes" "-j"; joint compilation - (find-files "src/main" ".*\\.(groovy|java)$")) - (invoke "jar" "-cf" "build/jar/groovy-macro.jar" - "-C" "build/classes" ".") - #t)) - (replace 'check - (lambda _ - (mkdir-p "build/test-classes") - (substitute* "build.xml" - (("depends=\"compile-tests\"") "depends=\"\"") - (("}/java") "}/groovy")) - (apply invoke "java" "-cp" - (string-append (getenv "CLASSPATH") ":build/classes") - "org.codehaus.groovy.tools.FileSystemCompiler" - "-d" "build/test-classes" "-j" - (append (find-files "src/test" ".*\\.(groovy|java)$"))) - (invoke "ant" "check") - #t))))) - (inputs - `(("groovy-templates" ,groovy-templates) - ("groovy-xml" ,groovy-xml) - ,@(package-inputs groovy-bootstrap))) - (native-inputs - `(("groovy-bootstrap" ,groovy-bootstrap) - ("groovy-json" ,groovy-json) - ("groovy-test" ,groovy-test) - ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) - ,@(package-native-inputs java-groovy-bootstrap))) - (synopsis "Groovy macro processor") - (description "This package contains a high-level library to create macro -and modify groovy's @dfn{Abstract Syntax Tree} (AST)."))) + (let ((base (groovy-subproject "groovy-macro"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (delete 'copy-resources) + (add-after 'build 'copy-resources + (lambda _ + (copy-recursively "subprojects/groovy-macro/src/main/resources" + "build/classes") + (substitute* "build.xml" + (("depends=\"compile,") "depends=\"")) + (invoke "ant" "jar") + #t)))))) + (inputs + `(("groovy-templates" ,groovy-templates) + ("groovy-xml" ,groovy-xml) + ,@(package-inputs base))) + (native-inputs + `(("groovy-bootstrap" ,groovy-bootstrap) + ("groovy-json" ,groovy-json) + ("groovy-test" ,groovy-test) + ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) + ,@(package-native-inputs base))) + (synopsis "Groovy macro processor") + (description "This package contains a high-level library to create macro +and modify groovy's @dfn{Abstract Syntax Tree} (AST).")))) + +(define groovy-yaml + (let ((base (groovy-subproject "groovy-yaml"))) + (package + (inherit base) + (inputs + `(("groovy-json" ,groovy-json) + ("java-fasterxml-jackson-annotations" ,java-fasterxml-jackson-annotations) + ("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core) + ("java-fasterxml-jackson-databind" ,java-fasterxml-jackson-databind) + ("java-fasterxml-jackson-dataformat-yaml" ,java-fasterxml-jackson-dataformat-yaml) + ,@(package-inputs base))) + (native-inputs + `(("groovy-test" ,groovy-test) + ,@(package-native-inputs base))) + (synopsis "Groovy YAML") + (description "This package contains YAML-related utilities for groovy.")))) (define-public groovy (package @@ -1071,7 +779,7 @@ and modify groovy's @dfn{Abstract Syntax Tree} (AST)."))) (name "groovy") (arguments `(#:tests? #f; No tests - #:jdk ,icedtea-8 + #:jdk ,openjdk9 #:phases (modify-phases %standard-phases (delete 'configure) @@ -1089,7 +797,7 @@ and modify groovy's @dfn{Abstract Syntax Tree} (AST)."))) (("@GROOVYJAR@") "groovy.jar") (("MAX_FD=\"maximum\"") (string-append - "MAX_FD=\"maximum\"\nJAVAHOME=" + "MAX_FD=\"maximum\"\nJAVA_HOME=" (assoc-ref inputs "jdk")))) ;; Groovy uses class loading. It's not enough to put the class ;; in the loader's classpath, as it causes breakages: @@ -1105,14 +813,17 @@ and modify groovy's @dfn{Abstract Syntax Tree} (AST)."))) (lambda (jar) (symlink jar (string-append out-lib "/" (basename jar)))) (find-files (assoc-ref inputs input) ".*.jar"))) - '("groovy-bootstrap" "groovy-ant" "groovy-bsf" - "groovy-console" "groovy-docgenerator" - "groovy-groovydoc" "groovy-groovysh" - "groovy-jmx" "groovy-json" "groovy-jsr223" - "groovy-nio" "groovy-servlet" "groovy-sql" + '("groovy-bootstrap" "groovy-ant" "groovy-astbuilder" + "groovy-bsf" "groovy-cli-commons" "groovy-cli-picocli" + "groovy-console" "groovy-datetime" "groovy-dateutil" + "groovy-docgenerator" "groovy-groovydoc" "groovy-groovysh" + "groovy-jmx" "groovy-json" "groovy-jsr223" "groovy-nio" + "groovy-parser-antlr4" "groovy-servlet" "groovy-sql" "groovy-swing" "groovy-templates" "groovy-testng" - "groovy-xml" "java-commons-cli" "java-asm" - "java-classpathx-servletapi" "java-xstream" + "groovy-xml" "groovy-yaml" "java-commons-cli" + "java-tunnelvisionlabs-antlr4-runtime" "java-asm" + "java-asm-analysis" "java-asm-tree" "java-asm-util" + "java-classpathx-servletapi" "java-xstream" "java-picocli" "java-jansi" "java-jline-2")) ;; antlr.jar is present twice in antlr2. Symlink doesn't like ;; it, so we symlink it here. @@ -1130,8 +841,13 @@ and modify groovy's @dfn{Abstract Syntax Tree} (AST)."))) (inputs `(("groovy-bootstrap" ,groovy-bootstrap) ("groovy-ant" ,groovy-ant) + ("groovy-astbuilder" ,groovy-astbuilder) ("groovy-bsf" ,groovy-bsf) + ("groovy-cli-commons" ,groovy-cli-commons) + ("groovy-cli-picocli" ,groovy-cli-picocli) ("groovy-console" ,groovy-console) + ("groovy-datetime" ,groovy-datetime) + ("groovy-dateutil" ,groovy-dateutil) ("groovy-docgenerator" ,groovy-docgenerator) ("groovy-groovydoc" ,groovy-groovydoc) ("groovy-groovysh" ,groovy-groovysh) @@ -1139,18 +855,26 @@ and modify groovy's @dfn{Abstract Syntax Tree} (AST)."))) ("groovy-json" ,groovy-json) ("groovy-jsr223" ,groovy-jsr223) ("groovy-nio" ,groovy-nio) + ("groovy-parser-antlr4" ,groovy-parser-antlr4) ("groovy-servlet" ,groovy-servlet) ("groovy-sql" ,groovy-sql) ("groovy-swing" ,groovy-swing) ("groovy-templates" ,groovy-templates) ("groovy-testng" ,groovy-testng) ("groovy-xml" ,groovy-xml) + ("groovy-yaml" ,groovy-yaml) + ("java-tunnelvisionlabs-antlr4-runtime" + ,java-tunnelvisionlabs-antlr4-runtime) ("java-commons-cli" ,java-commons-cli) - ("java-asm" ,java-asm) + ("java-asm" ,java-asm-8) + ("java-asm-analysis" ,java-asm-analysis-8) + ("java-asm-tree" ,java-asm-tree-8) + ("java-asm-util" ,java-asm-util-8) ("java-classpathx-servletapi" ,java-classpathx-servletapi) - ("java-xstream" ,java-xstream) + ("java-picocli" ,java-picocli) ("java-jansi" ,java-jansi) ("java-jline-2" ,java-jline-2) + ("java-xstream" ,java-xstream) ("antlr2" ,antlr2))) (synopsis "Programming language for the JVM") (description "Apache Groovy is a powerful, optionally typed and dynamic -- 2.28.0 From unknown Sun Jun 22 17:13:13 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Julien Lepiller Subject: bug#43639: closed ([PATCH] [staging] gnu: groovy: Update to 3.0.5.) Message-ID: References: <20201014034458.1300489f@tachikoma> <20200927001335.40c2409a@tachikoma.lepiller.eu> X-Gnu-PR-Message: they-closed 43639 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 43639@debbugs.gnu.org Date: Wed, 14 Oct 2020 01:47:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1602640022-6500-1" This is a multi-part message in MIME format... ------------=_1602640022-6500-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #43639: [PATCH] [staging] gnu: groovy: Update to 3.0.5. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 43639@debbugs.gnu.org. --=20 43639: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D43639 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1602640022-6500-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 43639-done) by debbugs.gnu.org; 14 Oct 2020 01:46:15 +0000 Received: from localhost ([127.0.0.1]:49246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kSVrq-0001fq-L3 for submit@debbugs.gnu.org; Tue, 13 Oct 2020 21:46:14 -0400 Received: from lepiller.eu ([89.234.186.109]:46118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kSVrm-0001fe-IK for 43639-done@debbugs.gnu.org; Tue, 13 Oct 2020 21:46:14 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 52135d4f for <43639-done@debbugs.gnu.org>; Wed, 14 Oct 2020 01:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type :content-transfer-encoding; s=dkim; bh=iqOoSmWlR8TiuLf87NhATuvXV u4f88eALNffYd8dhZk=; b=S9byyg9ZOLjglsn8SURfc1F/HWqcikTWSilk0+wOZ 7C5ESC/2lZkCtgFea5+TjgLRuM9MamDE8k1fagEirz+jmF7lkMUPF2v5HNQDWEWD RNHZmWXziAw3L19ga4FbWpljWXlBcrLtvm96n2r3OVku+gmfm1Caano5znJaizJ1 HcTaasWld+JESo0KUbOu8welMCcR/0nZbG/VEhA7vh8/9iq0RUYTAJU4gzIDFSCT ZW4SgWir7Ju6zfuLHP84kWOmYZstklkio93wM0k02HrQrhddRlbBnIuD7TEYJRZ9 kE5S1qhBczjwgtDi1yZm/Jgqjf/SRY0LrPwjIigGNYSlw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5dcf06a5 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43639-done@debbugs.gnu.org>; Wed, 14 Oct 2020 01:46:07 +0000 (UTC) Date: Wed, 14 Oct 2020 03:44:58 +0200 From: Julien Lepiller To: 43639-done@debbugs.gnu.org Subject: [PATCH] [staging] gnu: groovy: Update to 3.0.5. Message-ID: <20201014034458.1300489f@tachikoma> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 43639-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Since there was no review, pushed as 069ddd9900..417cf5445b on staging. ------------=_1602640022-6500-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 26 Sep 2020 22:14:02 +0000 Received: from localhost ([127.0.0.1]:47896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIS9-0004Dx-MI for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:14:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:54396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMIS5-0004Dn-Vo for submit@debbugs.gnu.org; Sat, 26 Sep 2020 18:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMIS5-0006Li-QN for guix-patches@gnu.org; Sat, 26 Sep 2020 18:13:57 -0400 Received: from lepiller.eu ([89.234.186.109]:36666) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMIS2-0003El-WB for guix-patches@gnu.org; Sat, 26 Sep 2020 18:13:56 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 1c479136 for ; Sat, 26 Sep 2020 22:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type :content-transfer-encoding; s=dkim; bh=hpr1T0wI+wATH4vVOqjSllDQu 1VByZB7lM2VDb75zsQ=; b=Xx6buEFhnOOzlz5h0P+Icpx2Ag8c9meOhxyIj8CIY nxpyuPqP03c89G4vrbcV/cQ6FeyLhTB8SXbdj1rxmWT4qM5RAgdxlmg+F8fHHxNG OR+aMFQKEEIpBJkwOC9JZUqxe5tTpxTvNObJJR4z/LttSwFX/bnqjnpgJFwZ0ZYf VZY8Y3YX9ffw+7PJFO88wU7fwopcQbNM5pMf3pG9Bfoc1TEJ+kztZ562pqSCNn6Q vqI0rSTYjvsqokX/TBYvITbFav0T4CS7gvt8+Csbbc6GdjIIrG3yblBhGOBtVmdh kzwR5W34UM6a5HmLWm51QVLrPOw70uCjTpHgphiLfaXiA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 6403c8d5 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sat, 26 Sep 2020 22:13:49 +0000 (UTC) Date: Sun, 27 Sep 2020 00:13:35 +0200 From: Julien Lepiller To: guix-patches@gnu.org Subject: [PATCH] [staging] gnu: groovy: Update to 3.0.5. Message-ID: <20200927001335.40c2409a@tachikoma.lepiller.eu> X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=89.234.186.109; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/26 18:13:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi Guix! The following patch series updates groovy to 3.0.5. groovy-ant depends on a newer version of ant/java8 than we have in master, so I had to update it. This lead me to change the recipe slightly, which propagated to ant, so I thought I could as well update it as well. The change to ant's recipe (and version) leads to ~500 rebuilds, so this is going to staging. The first three patches are required, but already pushed in master. Then, I add asm-8 and 3 subpackages. Groovy requires a fork of antlr4, not antlr4 itself, but this fork has a cyclic dependency on itself. antlr4 has a runtime library and a binary that generates a parser. The binary depends on the runtime library. In that fork, the runtime requires the binary, to generate a parser. To break the cycle, I use an old version of antlr4 (4.1), and fix the parser (it generates the parser for a different runtime library after all). Then, I can use this runtime to build the binary. Now, the binary uses a runtime that doesn't fully work, so I rebuild the runtime with it (so this time it generates the parser properly), and use this runtime to rebuild the final binary. Then, there's java-javaparser and the actual update of groovy. I changed the way groovy subprojects are built, using a procedure (groovy-subproject) that returns a package that builds the subproject. I also added a few additional subprojects that didn't exist in the previous version. Unfortunately, I'm missing the junit5 and jaxb because of missing dependencies. ------------=_1602640022-6500-1--