From unknown Sun Jun 22 22:42:22 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#53292 <53292@debbugs.gnu.org> To: bug#53292 <53292@debbugs.gnu.org> Subject: Status: [PATCH] build: clojure-build-system: Support compiling Java sources. Reply-To: bug#53292 <53292@debbugs.gnu.org> Date: Mon, 23 Jun 2025 05:42:22 +0000 retitle 53292 [PATCH] build: clojure-build-system: Support compiling Java s= ources. reassign 53292 guix-patches submitter 53292 Reily Siegel severity 53292 normal tag 53292 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 15 20:31:21 2022 Received: (at submit) by debbugs.gnu.org; 16 Jan 2022 01:31:21 +0000 Received: from localhost ([127.0.0.1]:42250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8uO8-000537-LD for submit@debbugs.gnu.org; Sat, 15 Jan 2022 20:31:21 -0500 Received: from lists.gnu.org ([209.51.188.17]:47866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8uO4-00052w-EZ for submit@debbugs.gnu.org; Sat, 15 Jan 2022 20:31:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8uO4-0002wi-9F for guix-patches@gnu.org; Sat, 15 Jan 2022 20:31:16 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:60018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1n8uO1-000374-Mp for guix-patches@gnu.org; Sat, 15 Jan 2022 20:31:15 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4JbyDH0Y2lzQk9y for ; Sun, 16 Jan 2022 02:31:11 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=reilysiegel.com; s=MBO0001; t=1642296669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=OhEdp9U6NE50rA2DWJFEorpH56JQ+lKxJzM8Awzikwo=; b=SGtLo/g1relnQQjDffaRmwPZnYArqMRE06nFC/pD0WiqPOjXewbfa3zum16TQTt4Ui3Dhv 2eT6hkp+lIIgZCXJ1GH1m/mY5bkGXfhxt/Z/cpIlh+zlQcENaGLYLe110BpOTEqNaRUMCa 095QOJCvHUpD+JRN6hiQHaPTZg3zTZguwU/aR02NzHKBEMJHv7TH4ONI3HP+13WOT+svUO tzpma8t3BbpU4C/zovBr6gvRNNRgKcESRDfG8cOyQWIT0iOp9F4ekNLEYzVW4mDtk0m8x6 hFMdlyaLqn/BSYpsp2V+lQuljfAb39m05Rga+LAmtMiZIayQIQs4DmZJKg0dFA== From: Reily Siegel To: guix-patches@gnu.org Subject: [PATCH] build: clojure-build-system: Support compiling Java sources. Date: Sat, 15 Jan 2022 20:31:02 -0500 Message-ID: <87pmosii09.fsf@reilysiegel.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=80.241.56.171; envelope-from=mail@reilysiegel.com; helo=mout-p-201.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) 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.6 (--) * guix/build/clojure-build-system.scm (compile-java): New variable. * guix/build/clojure-build-system.scm (build): Copy classes compiled from Java and optionally Java sources to the final jar. * guix/build/clojure-build-system.scm (%standard-phases): Add compile-java phase before build. * guix/build/clojure-utils.scm (%java-source-dirs): New variable. * guix/build/clojure-utils.scm (%java-compile-dir): New variable. * guix/build-system/clojure.scm (clojure-build): Include %java-source-dirs and %java-compile-dir. * guix/build-system/clojure.scm (builder): Include %java-source-dirs and %java-compile-dir. --- guix/build-system/clojure.scm | 6 ++++- guix/build/clojure-build-system.scm | 36 +++++++++++++++++++++++------ guix/build/clojure-utils.scm | 10 ++++++++ 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/guix/build-system/clojure.scm b/guix/build-system/clojure.scm index 634854cf1b..2a0713d297 100644 --- a/guix/build-system/clojure.scm +++ b/guix/build-system/clojure.scm @@ -107,8 +107,10 @@ (define* (clojure-build name inputs #:key source (source-dirs `',%source-dirs) + (java-source-dirs `',%java-source-dirs) (test-dirs `',%test-dirs) (compile-dir %compile-dir) + (java-compile-dir %java-compile-dir) (jar-names `',(package-name->jar-names name)) (main-class %main-class) @@ -142,9 +144,11 @@ (define builder #:source #+source #:source-dirs #$source-dirs + #:java-source-dirs #$java-source-dirs #:test-dirs #$test-dirs #:compile-dir #$compile-dir - + #:java-compile-dir #$java-compile-dir + #:jar-names #$jar-names #:main-class #$main-class #:omit-source? #$omit-source? diff --git a/guix/build/clojure-build-system.scm b/guix/build/clojure-build-system.scm index dd01f95de8..22e90581a5 100644 --- a/guix/build/clojure-build-system.scm +++ b/guix/build/clojure-build-system.scm @@ -34,8 +34,24 @@ (define-module (guix build clojure-build-system) ;; ;; Code: +(define* (compile-java #:key + java-source-dirs java-compile-dir + #:allow-other-keys) + "Compile java sources for use in clojure-build-system." + (let ((java-files (append-map (lambda (dir) + (find-files dir "\\.java$")) + java-source-dirs))) + (mkdir-p java-compile-dir) + (when (not (eq? java-files '())) + (apply invoke + "javac" + "-verbose" + "-d" java-compile-dir + java-files)))) + (define* (build #:key - source-dirs compile-dir + source-dirs java-source-dirs + compile-dir java-compile-dir jar-names main-class omit-source? aot-include aot-exclude #:allow-other-keys) @@ -46,19 +62,24 @@ (define* (build #:key #:all-list libs))) (mkdir-p compile-dir) (eval-with-clojure `(run! compile ',libs*) - source-dirs) + (cons* compile-dir + java-compile-dir + source-dirs)) (let ((source-dir-files-alist (map (lambda (dir) (cons dir (find-files* dir))) - source-dirs)) + (append source-dirs + java-source-dirs))) ;; workaround transitive compilation in Clojure (classes (filter (lambda (class) (any (cut compiled-from? class <>) libs*)) (find-files* compile-dir)))) - (for-each (cut create-jar <> (cons (cons compile-dir classes) - (if omit-source? - '() - source-dir-files-alist)) + (for-each (cut create-jar <> (cons* (cons compile-dir classes) + (cons java-compile-dir + (find-files* java-compile-dir)) + (if omit-source? + '() + source-dir-files-alist)) #:main-class main-class) jar-names) #t))) @@ -94,6 +115,7 @@ (define-with-docs install (define-with-docs %standard-phases "Standard build phases for clojure-build-system." (modify-phases %standard-phases@ant + (add-before 'build 'compile-java compile-java) (replace 'build build) (replace 'check check) (replace 'install install) diff --git a/guix/build/clojure-utils.scm b/guix/build/clojure-utils.scm index 8817cab52a..c5322141d3 100644 --- a/guix/build/clojure-utils.scm +++ b/guix/build/clojure-utils.scm @@ -32,8 +32,10 @@ (define-module (guix build clojure-utils) install-doc %source-dirs + %java-source-dirs %test-dirs %compile-dir + %java-compile-dir package-name->jar-names %main-class %omit-source? @@ -101,6 +103,10 @@ (define-with-docs %source-dirs "A default list of source directories." '("src/")) +(define-with-docs %java-source-dirs + "A default list of java source directories." + '()) + (define-with-docs %test-dirs "A default list of test directories." '("test/")) @@ -109,6 +115,10 @@ (define-with-docs %compile-dir "Default directory for holding class files." "classes/") +(define-with-docs %java-compile-dir + "Default directory for holding java class files." + "java-classes/") + (define (package-name->jar-names name) "Given NAME, a package name like \"foo-0.9.1b\", return the list of default jar names: (\"foo-0.9.1b.jar\" \"foo.jar\")." -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 16 05:47:56 2022 Received: (at 53292) by debbugs.gnu.org; 16 Jan 2022 10:47:56 +0000 Received: from localhost ([127.0.0.1]:42558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n934l-0005D8-Uv for submit@debbugs.gnu.org; Sun, 16 Jan 2022 05:47:56 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:47386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n934j-0005Cl-9P for 53292@debbugs.gnu.org; Sun, 16 Jan 2022 05:47:54 -0500 Received: from [192.168.157.254] ([213.119.167.246]) by michel.telenet-ops.be with bizsmtp id jNnr260015KJBlR06NnrUQ; Sun, 16 Jan 2022 11:47:51 +0100 Message-ID: Subject: Re: [bug#53292] [PATCH] build: clojure-build-system: Support compiling Java sources. From: Maxime Devos To: Reily Siegel , 53292@debbugs.gnu.org Date: Sun, 16 Jan 2022 11:47:41 +0100 In-Reply-To: <87pmosii09.fsf@reilysiegel.com> References: <87pmosii09.fsf@reilysiegel.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-1i3UJ1OGnr3oRiJ4m5ml" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1642330071; bh=IrydhBkEyklqRp0AmxY9zL5sL8NkSVpKnb9Yp427T9k=; h=Subject:From:To:Date:In-Reply-To:References; b=NslTqS8teQdBaRTLSBjrGTNWNhICeiRqYSqEAHucyrSmkLFoGPEOLMFKH5RyPMVEp B9AzG/UqRmufPWdJPqbsnQv0bNKai3EdDuPHU4/Cc2oTEnDgsx+pYTeTm+NpASaIfT PU8VgDtcftGQojCGzYPkWrnMWoG2r5dFN1NX+JAtblP4mcLunG4LcnSKzOX1gRjsDp +QAr0/KrHewgW0ZYXGTYlRbYrO4CTnDfZQeFMLl0K/D98/w7GmEuianiXB69ALabJX URiDYIePhozB/lX6cWjJ4+WNqG3hb+GC1uGghz1+hp4s+scp6eHUm6WCZVcVKtPIUn iu7Bo0aWAJPtg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53292 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.7 (-) --=-1i3UJ1OGnr3oRiJ4m5ml Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, Reily Siegel schreef op za 15-01-2022 om 20:31 [-0500]: > +=C2=A0=C2=A0=C2=A0 (when (not (eq? java-files '())) Maybe use the procedure 'null?' instead? (when (not (null? java-files)) [...]) Greetings, Maxime. --=-1i3UJ1OGnr3oRiJ4m5ml Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYeP3zRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7krKAP0cWnoOlpQon92bsIX20ha0Mw6t gDPdMOLWYuKTW5EscgEAvSWVaq/4/EhekGdxboD22mDUmte8gbU1Nni/ct0l+ww= =DLpC -----END PGP SIGNATURE----- --=-1i3UJ1OGnr3oRiJ4m5ml-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 18 13:17:44 2022 Received: (at 53292) by debbugs.gnu.org; 18 Jan 2022 18:17:44 +0000 Received: from localhost ([127.0.0.1]:51661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n9t39-0000kc-R5 for submit@debbugs.gnu.org; Tue, 18 Jan 2022 13:17:44 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:24302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n9t34-0000kK-TU for 53292@debbugs.gnu.org; Tue, 18 Jan 2022 13:17:42 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4JdcSX2NXVzQjx8; Tue, 18 Jan 2022 19:17:32 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=reilysiegel.com; s=MBO0001; t=1642529850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=L9m+SPlW6Cc+HK1OQ+1DvfNdm6LB8P9NeTaBrBojnqs=; b=NlG5Sx429nptwiF+3RaTQVbNbCweGjWXI2CMjQZp8Wvrpodal92nJMYDRY/Vyhge08rrVf gjVSBOvRvSAXG5ilj/PUMkMSzK9OUQQ5f/8UqEYFiErsFvdKRlJuwx9pthuo4WODWjedth 7L1l066nF18kIEE8j5OCr1QD3iqv2AoYYrIj0q76mu+LtOIeaR6GTuy+6gNmA3H717NzUE aDkpgvT4HsXTsmkB6tB45dqJzmDiYwpaO5RQtTZGeMTFlmcV8SmbYEhg2TEZiXkV2u7JW2 S27SZ6d58fYGJYGkuOlKSq8zcoRxHUbzwV9/VqNgqZWRy7he7J2cjOMdnKZ7OQ== From: Reily Siegel To: 53292@debbugs.gnu.org Subject: [PATCH v2] build: clojure-build-system: Support compiling Java Date: Tue, 18 Jan 2022 13:17:24 -0500 Message-ID: <8735lkzz63.fsf@reilysiegel.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53292 Cc: Maxime Devos 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.7 (-) * guix/build/clojure-build-system.scm (compile-java): New variable. * guix/build/clojure-build-system.scm (build): Copy classes compiled from Java and optionally Java sources to the final jar. * guix/build/clojure-build-system.scm (%standard-phases): Add compile-java phase before build. * guix/build/clojure-utils.scm (%java-source-dirs): New variable. * guix/build/clojure-utils.scm (%java-compile-dir): New variable. * guix/build-system/clojure.scm (clojure-build): Include %java-source-dirs and %java-compile-dir. * guix/build-system/clojure.scm (builder): Include %java-source-dirs and %java-compile-dir. --- guix/build-system/clojure.scm | 6 ++++- guix/build/clojure-build-system.scm | 36 +++++++++++++++++++++++------ guix/build/clojure-utils.scm | 10 ++++++++ 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/guix/build-system/clojure.scm b/guix/build-system/clojure.scm index 634854cf1b..2a0713d297 100644 --- a/guix/build-system/clojure.scm +++ b/guix/build-system/clojure.scm @@ -107,8 +107,10 @@ (define* (clojure-build name inputs #:key source (source-dirs `',%source-dirs) + (java-source-dirs `',%java-source-dirs) (test-dirs `',%test-dirs) (compile-dir %compile-dir) + (java-compile-dir %java-compile-dir) (jar-names `',(package-name->jar-names name)) (main-class %main-class) @@ -142,9 +144,11 @@ (define builder #:source #+source #:source-dirs #$source-dirs + #:java-source-dirs #$java-source-dirs #:test-dirs #$test-dirs #:compile-dir #$compile-dir - + #:java-compile-dir #$java-compile-dir + #:jar-names #$jar-names #:main-class #$main-class #:omit-source? #$omit-source? diff --git a/guix/build/clojure-build-system.scm b/guix/build/clojure-build-system.scm index dd01f95de8..7d494078ea 100644 --- a/guix/build/clojure-build-system.scm +++ b/guix/build/clojure-build-system.scm @@ -34,8 +34,24 @@ (define-module (guix build clojure-build-system) ;; ;; Code: +(define* (compile-java #:key + java-source-dirs java-compile-dir + #:allow-other-keys) + "Compile java sources for use in clojure-build-system." + (let ((java-files (append-map (lambda (dir) + (find-files dir "\\.java$")) + java-source-dirs))) + (mkdir-p java-compile-dir) + (when (not (null? java-files)) + (apply invoke + "javac" + "-verbose" + "-d" java-compile-dir + java-files)))) + (define* (build #:key - source-dirs compile-dir + source-dirs java-source-dirs + compile-dir java-compile-dir jar-names main-class omit-source? aot-include aot-exclude #:allow-other-keys) @@ -46,19 +62,24 @@ (define* (build #:key #:all-list libs))) (mkdir-p compile-dir) (eval-with-clojure `(run! compile ',libs*) - source-dirs) + (cons* compile-dir + java-compile-dir + source-dirs)) (let ((source-dir-files-alist (map (lambda (dir) (cons dir (find-files* dir))) - source-dirs)) + (append source-dirs + java-source-dirs))) ;; workaround transitive compilation in Clojure (classes (filter (lambda (class) (any (cut compiled-from? class <>) libs*)) (find-files* compile-dir)))) - (for-each (cut create-jar <> (cons (cons compile-dir classes) - (if omit-source? - '() - source-dir-files-alist)) + (for-each (cut create-jar <> (cons* (cons compile-dir classes) + (cons java-compile-dir + (find-files* java-compile-dir)) + (if omit-source? + '() + source-dir-files-alist)) #:main-class main-class) jar-names) #t))) @@ -94,6 +115,7 @@ (define-with-docs install (define-with-docs %standard-phases "Standard build phases for clojure-build-system." (modify-phases %standard-phases@ant + (add-before 'build 'compile-java compile-java) (replace 'build build) (replace 'check check) (replace 'install install) diff --git a/guix/build/clojure-utils.scm b/guix/build/clojure-utils.scm index 8817cab52a..c5322141d3 100644 --- a/guix/build/clojure-utils.scm +++ b/guix/build/clojure-utils.scm @@ -32,8 +32,10 @@ (define-module (guix build clojure-utils) install-doc %source-dirs + %java-source-dirs %test-dirs %compile-dir + %java-compile-dir package-name->jar-names %main-class %omit-source? @@ -101,6 +103,10 @@ (define-with-docs %source-dirs "A default list of source directories." '("src/")) +(define-with-docs %java-source-dirs + "A default list of java source directories." + '()) + (define-with-docs %test-dirs "A default list of test directories." '("test/")) @@ -109,6 +115,10 @@ (define-with-docs %compile-dir "Default directory for holding class files." "classes/") +(define-with-docs %java-compile-dir + "Default directory for holding java class files." + "java-classes/") + (define (package-name->jar-names name) "Given NAME, a package name like \"foo-0.9.1b\", return the list of default jar names: (\"foo-0.9.1b.jar\" \"foo.jar\")." -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 24 04:19:58 2022 Received: (at 53292-done) by debbugs.gnu.org; 24 Jan 2022 09:19:58 +0000 Received: from localhost ([127.0.0.1]:42065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBvW1-0005T8-V1 for submit@debbugs.gnu.org; Mon, 24 Jan 2022 04:19:58 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:41884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBvVz-0005Ss-Lc for 53292-done@debbugs.gnu.org; Mon, 24 Jan 2022 04:19:56 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 36026BD; Mon, 24 Jan 2022 10:19:49 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oQzLdik9GqoO; Mon, 24 Jan 2022 10:19:48 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id D742D8B; Mon, 24 Jan 2022 10:19:47 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Reily Siegel Subject: Re: bug#53292: [PATCH] build: clojure-build-system: Support compiling Java sources. References: <87pmosii09.fsf@reilysiegel.com> <8735lkzz63.fsf@reilysiegel.com> Date: Mon, 24 Jan 2022 10:19:47 +0100 In-Reply-To: <8735lkzz63.fsf@reilysiegel.com> (Reily Siegel's message of "Tue, 18 Jan 2022 13:17:24 -0500") Message-ID: <87tudtwkwc.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: 36026BD X-Spamd-Result: default: False [-0.10 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 53292-done Cc: Maxime Devos , 53292-done@debbugs.gnu.org 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: -0.0 (/) Reily Siegel skribis: > * guix/build/clojure-build-system.scm (compile-java): New variable. > * guix/build/clojure-build-system.scm (build): Copy classes compiled from= Java > and optionally Java sources to the final jar. > * guix/build/clojure-build-system.scm (%standard-phases): Add compile-java > phase before build. > * guix/build/clojure-utils.scm (%java-source-dirs): New variable. > * guix/build/clojure-utils.scm (%java-compile-dir): New variable. > * guix/build-system/clojure.scm (clojure-build): Include %java-source-dir= s and > %java-compile-dir. > * guix/build-system/clojure.scm (builder): Include %java-source-dirs and > %java-compile-dir. I tweaked the commit log (no need to repeat file names) and applied it. Thank you, and thanks Maxime! Ludo=E2=80=99. From unknown Sun Jun 22 22:42:22 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 21 Feb 2022 12:24:17 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator