From patchwork Fri Apr 28 13:13:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Svoboda X-Patchwork-Id: 49648 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9451427BBEA; Fri, 28 Apr 2023 14:14:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B0CF327BBE2 for ; Fri, 28 Apr 2023 14:14:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psNvI-0003mW-7P; Fri, 28 Apr 2023 09:14:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psNvH-0003mM-5F for guix-patches@gnu.org; Fri, 28 Apr 2023 09:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psNvG-0008Aa-LO for guix-patches@gnu.org; Fri, 28 Apr 2023 09:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psNvG-0008JP-Gd for guix-patches@gnu.org; Fri, 28 Apr 2023 09:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63145] [PATCH 1/3] gnu: maven-*-*: Fix - add missing shebang to the sisu.sh. Resent-From: Rostislav Svoboda Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 13:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63145@debbugs.gnu.org Cc: Rostislav Svoboda X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168268763231924 (code B ref -1); Fri, 28 Apr 2023 13:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2023 13:13:52 +0000 Received: from localhost ([127.0.0.1]:60748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNv5-0008Ip-QE for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:13:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:51950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNv3-0008Ig-Tr for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:13:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psNv2-0003k1-VJ for guix-patches@gnu.org; Fri, 28 Apr 2023 09:13:48 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psNv0-00084K-SY for guix-patches@gnu.org; Fri, 28 Apr 2023 09:13:48 -0400 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-504ecbfddd5so14712102a12.0 for ; Fri, 28 Apr 2023 06:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682687624; x=1685279624; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8pfsvOSs9zoCCBq3h1Vm5byWcN1bay9cB0MbdlrFmkI=; b=NWkUvSxKkSRdVc37m6A371THehCB0ULf2m36pCY5v5SRKD/uJftI4to9rUd7hwhZ1J 8U4v4hmPRDplkc43ZmpmV9mjMrTZnV0vJnjkckQr9ozrTWoTjvBfsS/koySf8YVTnBPv T5N4zTYlIdm1wVd/Cx0uVucunU1yR1dc169D8HIheFxQO+z6NjXMBTIAyMsGze1dbYSz 2829K8sqg8CrGQZZXFkehD3M5gvFDECD8DI6ChbjOIi/Q7DaIUI9YizJ3q9DojVzP66e 251FFZ2tp/eG6JUWTzo3w7WI/LOYrHlQeNeRTHaa9pJ0+Sjo+vm6Bj47amtb1mKhmZwE rZjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682687624; x=1685279624; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8pfsvOSs9zoCCBq3h1Vm5byWcN1bay9cB0MbdlrFmkI=; b=bMcwFv3ic/jcNn/9pWjOffZt2D1lvVkhS6QA+b6SuYNFX+goMpn6v4GTczZ9XmjE/R /seHtxHXwNBp+fImOp0ewlUmCo37NPS3T18ktmnuvrrMhkvoC22Ogeca6tpJeN1oo49V HWOrG0NUZccbphNIZfObqVR61zPbOd7FCfgDboG+9gCT6aCGrZ+WC8bCazSw07/KTF+L JbLUJoMwF7T+fduKVkTQ5CTvlACdvFTJXxY+3TVKvYQmhqHPHF3c3Mb6P2ABtXSPkov/ JSBrwCY9XglG1dydcRxGLEZ5djE226gfkDUrwKgWLHXrmARhR/Y98V+Iy/15Ly66+u7K +LYA== X-Gm-Message-State: AC+VfDwAm4Ec8aaYJFJYapNRXlbw3UwhIIYrVVgSytescvY50h+YlrNA /pHCcsb6VOrFtBciFliKGJQFcfPZM1RGxQ== X-Google-Smtp-Source: ACHHUZ4hEwEBzwelw+cR+AxF8m7iwg3uWljWxLwS6kGzTzszdBJ6NRmJlfv+tI7UF583tmtPCMBQBg== X-Received: by 2002:aa7:c586:0:b0:504:9349:7901 with SMTP id g6-20020aa7c586000000b0050493497901mr3920862edq.38.1682687623673; Fri, 28 Apr 2023 06:13:43 -0700 (PDT) Received: from ecke.fritz.box (dynamic-077-181-028-154.77.181.pool.telefonica.de. [77.181.28.154]) by smtp.googlemail.com with ESMTPSA id p6-20020aa7d306000000b004fd1ee3f723sm9063902edq.67.2023.04.28.06.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 06:13:42 -0700 (PDT) From: Rostislav Svoboda X-Google-Original-From: Rostislav Svoboda Date: Fri, 28 Apr 2023 15:13:10 +0200 Message-Id: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=rostislav.svoboda@gmail.com; helo=mail-ed1-x52b.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven.scm - maven-settings-builder - maven-model-builder - maven-resolver-provider - maven-core-bootstrap - maven-embedder The sisu.sh script must have a shebang on the first line, otherwise an 'In execvp of ...: Exec format error' is indicated. --- gnu/packages/maven.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index fc3a63c263..a3122bfa32 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1365,6 +1365,9 @@ (define-public maven-settings-builder #:test-dir "maven-settings-builder/src/test" #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'add-missing-shebang + (lambda _ + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") @@ -1396,6 +1399,9 @@ (define-public maven-model-builder #:test-dir "src/test" #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'add-missing-shebang + (lambda _ + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) (add-before 'configure 'chdir (lambda _ ;; Required for tests that rely on the package's default @@ -1501,6 +1507,9 @@ (define-public maven-resolver-provider #:tests? #f; dependency loop on maven-core (@Component RepositorySystem) #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'add-missing-shebang + (lambda _ + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") @@ -1591,6 +1600,9 @@ (define-public maven-core-bootstrap #:tests? #f #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'add-missing-shebang + (lambda _ + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) (add-before 'configure 'chdir (lambda _ ;; Required for generating components.xml in maven-core @@ -1822,6 +1834,9 @@ (define-public maven-embedder #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'add-missing-shebang + (lambda _ + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") From patchwork Fri Apr 28 13:13:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Svoboda X-Patchwork-Id: 49649 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6BA1A27BBEA; Fri, 28 Apr 2023 14:15:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8967827BBE2 for ; Fri, 28 Apr 2023 14:15:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psNwM-0003yV-2v; Fri, 28 Apr 2023 09:15:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psNwF-0003wp-OW for guix-patches@gnu.org; Fri, 28 Apr 2023 09:15:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psNwF-0008JP-4b for guix-patches@gnu.org; Fri, 28 Apr 2023 09:15:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psNwE-0008M8-Ms for guix-patches@gnu.org; Fri, 28 Apr 2023 09:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63145] [PATCH 2/3] gnu: maven-*-*: DRY add-missing-shebangs. Resent-From: Rostislav Svoboda Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 13:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63145@debbugs.gnu.org Cc: Rostislav Svoboda X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168268766732037 (code B ref -1); Fri, 28 Apr 2023 13:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2023 13:14:27 +0000 Received: from localhost ([127.0.0.1]:60753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNvf-0008Ke-AA for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:14:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:48264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNvd-0008KW-Dw for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:14:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psNvd-0003qn-1a for guix-patches@gnu.org; Fri, 28 Apr 2023 09:14:25 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psNvb-0008F9-AS for guix-patches@gnu.org; Fri, 28 Apr 2023 09:14:24 -0400 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-506b20efd4cso16730872a12.3 for ; Fri, 28 Apr 2023 06:14:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682687661; x=1685279661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QSqPM5e2hTSEvUkdngLmcpj5fZ0DWcp1QRnOhCLKYMY=; b=ZDXpUzEk6srRXL6Fo3LJYmDdc9BiBe/kpnXsyZzWmSf/yJBvfPoSPMJX5i9KRD15eV eKkmV7Iidv6DGg6zcxnAg/5A+meAJo2fpkKeotZR0tUVcRSWNw506ET3UQq2KO5GaEXm 0xXzNM866ch7nuQIkyoeacaWeg/pmyX0NI3VzPHBbFyAjVdfvDtuj6OG2ZIRljtBVmhV JIFKi/sGjxcvlWqfADweC1Z5TaQu1kZrsXQigQRaTvLlU6edg3uwDv8dJftxYUemL1ZW cHRBO6ylS7ZZR6oGslqkO/mp9DDohiUyey0/hZ8MnQH8a0PlxxilFFtKQu3evC+7ImYQ sC2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682687661; x=1685279661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QSqPM5e2hTSEvUkdngLmcpj5fZ0DWcp1QRnOhCLKYMY=; b=j7yGWapMDaoAHPSqsX6oEIgTcASSR+o7FbgALPfpWcE54XyeX9eTOw+rxk2YRfLJfJ 14DiDXPBWjdzssK2OGvkMRI64MxeiFpsmbz8b9BUuVDF1iGt4gv+AIomy9kSFIMhkNfe W5bGsDkuQyG4gUr7CoSgaUw8mwqtGw+Xg/tjzzAgyG8GEShFqcpDWVtVX561F+ARXQHo cYdltkGozDBpPlITc8Nzmu7Ri4gfZklNCWe8N6h4+e49ZSHgfHPq5Foa3uDj9Yyjdgxe ZJXVP1c3xpS7wTFQZ50wx7Bw7u5/c7c0SudPdu6RbvVw+5Dt8duMD4QgGXcOLu5O/mV1 uu1A== X-Gm-Message-State: AC+VfDyOwC8Ss9oZIcakaW6nEdCLNuRdOoRT3j+cMOfWKUxsaHUBAqQ6 5mLO8C53+JGpaFtzpR3cTx2kWn6LL6/y0w== X-Google-Smtp-Source: ACHHUZ5BZOcV/TmMFD3+rKBNs9VZUG8/d/59iBLNwmEPYsOyXcDDbt+yNDpzhQgFjXS0e1oJGPJl2w== X-Received: by 2002:aa7:d84d:0:b0:508:470a:d5eb with SMTP id f13-20020aa7d84d000000b00508470ad5ebmr4605987eds.17.1682687661359; Fri, 28 Apr 2023 06:14:21 -0700 (PDT) Received: from ecke.fritz.box (dynamic-077-181-028-154.77.181.pool.telefonica.de. [77.181.28.154]) by smtp.googlemail.com with ESMTPSA id p6-20020aa7d306000000b004fd1ee3f723sm9063902edq.67.2023.04.28.06.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 06:14:21 -0700 (PDT) From: Rostislav Svoboda X-Google-Original-From: Rostislav Svoboda Date: Fri, 28 Apr 2023 15:13:11 +0200 Message-Id: <20230428131312.4604-2-Rostislav.Svoboda@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> References: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=rostislav.svoboda@gmail.com; helo=mail-ed1-x52f.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven.scm - maven-settings-builder - maven-model-builder - maven-resolver-provider - maven-core-bootstrap - maven-embedder Implement common functionality just once in the `add-missing-shebangs`. --- gnu/packages/maven.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index a3122bfa32..6990d091cf 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1354,6 +1354,11 @@ (define-public maven-settings tool. This package contains strictly the model for Maven settings, that is simply plain java objects."))) +(define add-missing-shebang + `(lambda _ + ;; -i, --in-place edit files in place + (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + (define-public maven-settings-builder (package (inherit maven-artifact) @@ -1366,8 +1371,7 @@ (define-public maven-settings-builder #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'add-missing-shebang - (lambda _ - (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + ,add-missing-shebang) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") @@ -1400,8 +1404,7 @@ (define-public maven-model-builder #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'add-missing-shebang - (lambda _ - (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + ,add-missing-shebang) (add-before 'configure 'chdir (lambda _ ;; Required for tests that rely on the package's default @@ -1508,8 +1511,7 @@ (define-public maven-resolver-provider #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'add-missing-shebang - (lambda _ - (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + ,add-missing-shebang) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") @@ -1601,8 +1603,7 @@ (define-public maven-core-bootstrap #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'add-missing-shebang - (lambda _ - (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + ,add-missing-shebang) (add-before 'configure 'chdir (lambda _ ;; Required for generating components.xml in maven-core @@ -1835,8 +1836,7 @@ (define-public maven-embedder #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'add-missing-shebang - (lambda _ - (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) + ,add-missing-shebang) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") From patchwork Fri Apr 28 13:13:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Svoboda X-Patchwork-Id: 49650 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CD7A927BBEA; Fri, 28 Apr 2023 14:15:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B370B27BBE2 for ; Fri, 28 Apr 2023 14:15:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psNwL-0003yK-Oh; Fri, 28 Apr 2023 09:15:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psNwF-0003wq-OU for guix-patches@gnu.org; Fri, 28 Apr 2023 09:15:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psNwF-0008JS-D6 for guix-patches@gnu.org; Fri, 28 Apr 2023 09:15:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psNwF-0008MG-93 for guix-patches@gnu.org; Fri, 28 Apr 2023 09:15:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63145] [PATCH 3/3] gnu: maven-*-*: DRY generate-sisu-named. Resent-From: Rostislav Svoboda Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 13:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63145@debbugs.gnu.org Cc: Rostislav Svoboda X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168268770032090 (code B ref -1); Fri, 28 Apr 2023 13:15:03 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2023 13:15:00 +0000 Received: from localhost ([127.0.0.1]:60756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNwB-0008LW-OF for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:15:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:34374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psNw9-0008LH-PQ for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:14:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psNvs-0003rq-Ro for guix-patches@gnu.org; Fri, 28 Apr 2023 09:14:42 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psNvp-0008GR-3r for guix-patches@gnu.org; Fri, 28 Apr 2023 09:14:38 -0400 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5067736607fso17116895a12.0 for ; Fri, 28 Apr 2023 06:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682687670; x=1685279670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jn7y9jPu8hHantJH2XCzrIJUPJc/I7LifVXznR6yIKw=; b=Ky0cBJap6QYPwY54jgfiyrQ0E0A97dCBAJPZqorSYNyCqu6RrQO7G2wKAF42j5gj6h OPxNMw1dV7kMToe2rN1nNP5lspkVnw/rB7560NgTFp7O5f8e/kPlYe+dxrAfNRd55JA1 r8Rpb7YfYXtmuHIzwVEND6SlKMNroj5DNqVMQaD6GLA70jfciHzcekt60VAfFexDCwEp FTmzxK5uAeGSaxZ7FUbvTvpmJ1Yi8pf2X8kVQjKHvwm79yPjZNxH0AZOkcaC1ICylS6F 0mkg/YxnEXA9sH39Qps6YeWuPkzl7uzWsF/niYO9hcj8CYk645ZwAnevsMtLGVhfVRtE V19A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682687670; x=1685279670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jn7y9jPu8hHantJH2XCzrIJUPJc/I7LifVXznR6yIKw=; b=MEdKoGO1tWfyhWWrcMHwApS4IQH/Zh0BmDNN+5jZ5tLoZEfkCUtXKNtmFiTiz+OdVQ udcoImpbZDlTgBjDvG72MbQIuNwDs7wBTxejMwRHt+r+hVWamXuXey4dxzpdYCmANHhi 7w+gXYIwPUdA4DpE2CzaKQvpCJWOdVAoTdOXEAMuSYmWITI0cSKdm1MPz/tA3LpMeMBw g5WpF4YPP5K8azIp7MS9GRfGaCFBBgiQvQPmBQEB1hgjfrcmLV49ihN23tBcLqnJyju5 cP0UGpC9LEz6hGVR2e/3bjCiO4UiaZOPylbtaJ2OeW1B5NdFoIGZOOI9tM3fMCUyKVyy S5QA== X-Gm-Message-State: AC+VfDzQJx0IJKNJT6LYNNewiUZDcDMYuOLVRwH8vYzSdsYQyGk7QgJ/ RtRKao0PGujzMiFTuiPkrkOIpDZcGPRsaA== X-Google-Smtp-Source: ACHHUZ4wdO1uLE2ViDr4gfPQl4ocdC/78kd2AULUbGae6byPtVq+HU1rbNf09lc7f1az7eCXB/mGDw== X-Received: by 2002:a05:6402:2029:b0:509:f31f:b570 with SMTP id ay9-20020a056402202900b00509f31fb570mr5050017edb.23.1682687669374; Fri, 28 Apr 2023 06:14:29 -0700 (PDT) Received: from ecke.fritz.box (dynamic-077-181-028-154.77.181.pool.telefonica.de. [77.181.28.154]) by smtp.googlemail.com with ESMTPSA id p6-20020aa7d306000000b004fd1ee3f723sm9063902edq.67.2023.04.28.06.14.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 06:14:29 -0700 (PDT) From: Rostislav Svoboda X-Google-Original-From: Rostislav Svoboda Date: Fri, 28 Apr 2023 15:13:12 +0200 Message-Id: <20230428131312.4604-3-Rostislav.Svoboda@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> References: <20230428131312.4604-1-Rostislav.Svoboda@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=rostislav.svoboda@gmail.com; helo=mail-ed1-x52a.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven.scm - maven-settings-builder - maven-model-builder - maven-resolver-provider - maven-core-bootstrap - maven-embedder Implement common functionality just once in the `generate-sisu-named`. --- gnu/packages/maven.scm | 41 +++++++++++++---------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 6990d091cf..34a1fae4b5 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1359,6 +1359,14 @@ (define add-missing-shebang ;; -i, --in-place edit files in place (invoke "sed" "-i" "1s;^;#!/bin/sh\\n\\n;" "./sisu.sh"))) +(define* (generate-sisu-named sisu-path #:optional (src-path "")) + (let ((sisu-sh (string-append sisu-path "sisu.sh"))) + `(lambda _ + (mkdir-p "build/classes/META-INF/sisu") + (chmod ,sisu-sh #o755) + (invoke ,sisu-sh ,(string-append src-path "src/main/java") + "build/classes/META-INF/sisu/javax.inject.Named")))) + (define-public maven-settings-builder (package (inherit maven-artifact) @@ -1373,11 +1381,7 @@ (define-public maven-settings-builder (add-before 'patch-source-shebangs 'add-missing-shebang ,add-missing-shebang) (add-before 'build 'generate-sisu-named - (lambda _ - (mkdir-p "build/classes/META-INF/sisu") - (chmod "sisu.sh" #o755) - (invoke "./sisu.sh" "maven-settings-builder/src/main/java" - "build/classes/META-INF/sisu/javax.inject.Named"))) + ,(generate-sisu-named "./" "maven-settings-builder/")) (replace 'install (install-from-pom "maven-settings-builder/pom.xml"))))) (propagated-inputs (list java-plexus-utils @@ -1416,11 +1420,7 @@ (define-public maven-model-builder "build/classes") #t)) (add-before 'build 'generate-sisu-named - (lambda _ - (mkdir-p "build/classes/META-INF/sisu") - (chmod "../sisu.sh" #o755) - (invoke "../sisu.sh" "src/main/java" - "build/classes/META-INF/sisu/javax.inject.Named"))) + ,(generate-sisu-named "../")) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs @@ -1513,12 +1513,7 @@ (define-public maven-resolver-provider (add-before 'patch-source-shebangs 'add-missing-shebang ,add-missing-shebang) (add-before 'build 'generate-sisu-named - (lambda _ - (mkdir-p "build/classes/META-INF/sisu") - (chmod "./sisu.sh" #o755) - (invoke "./sisu.sh" "maven-resolver-provider/src/main/java" - "build/classes/META-INF/sisu/javax.inject.Named") - #t)) + ,(generate-sisu-named "./" "maven-resolver-provider/")) (replace 'install (install-from-pom "maven-resolver-provider/pom.xml"))))) (propagated-inputs @@ -1627,12 +1622,7 @@ (define-public maven-core-bootstrap (("\\$\\{distributionName\\}") "Apache Maven")) #t)) (add-before 'build 'generate-sisu-named - (lambda _ - (mkdir-p "build/classes/META-INF/sisu") - (chmod "../sisu.sh" #o755) - (invoke "../sisu.sh" "src/main/java" - "build/classes/META-INF/sisu/javax.inject.Named") - #t)) + ,(generate-sisu-named "../")) (add-before 'build 'generate-models (lambda* (#:key inputs #:allow-other-keys) (define (modello-single-mode file version mode) @@ -1838,12 +1828,7 @@ (define-public maven-embedder (add-before 'patch-source-shebangs 'add-missing-shebang ,add-missing-shebang) (add-before 'build 'generate-sisu-named - (lambda _ - (mkdir-p "build/classes/META-INF/sisu") - (chmod "sisu.sh" #o755) - (invoke "./sisu.sh" "maven-embedder/src/main/java" - "build/classes/META-INF/sisu/javax.inject.Named") - #t)) + ,(generate-sisu-named "./" "maven-embeder/")) (add-before 'build 'copy-resources (lambda _ (mkdir-p "build/classes/")