From patchwork Thu Jul 11 20:26:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14584 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 4D30217203; Thu, 11 Jul 2019 21:28:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 06211171FE for ; Thu, 11 Jul 2019 21:28:16 +0100 (BST) Received: from localhost ([::1]:45100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffr-000611-Mh for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33012) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffn-0005o0-Hx for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffl-00066n-RV for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58175) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffi-00062K-Cm for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffi-0006zB-7X for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 02/12] guix: ant-build-system: use abs path as basedir Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683326549 (code B ref 36605); Thu, 11 Jul 2019 20:28:06 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:13 +0000 Received: from localhost ([127.0.0.1]:38713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeq-0006u3-T3 for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:13 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:49103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfep-0006tX-3R for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:11 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zf4h9Mz1rB8y for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:10 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zf4brVz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id XRDB-hdv12E3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:09 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:09 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 1CC30607D4 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:24 +0200 Message-Id: <20190711202644.32014-16-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches This allows to chdir into some sub-project prior to building. * guix/build/ant-build-system.scm (default-build.xml): Add parameter. (configure): Pass current directory as base-dir to default-build.xml. --- guix/build/ant-build-system.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index 651150d..f28182a 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -35,12 +35,12 @@ ;; ;; Code: -(define (default-build.xml src-dir jar-name prefix) +(define (default-build.xml base-dir src-dir jar-name prefix) "Create a simple build.xml with standard targets for Ant." (call-with-output-file "build.xml" (lambda (port) (sxml->xml - `(project (@ (basedir ".") + `(project (@ (basedir ,base-dir) (name ,jar-name)) (property (@ (name "classes.dir") (value "${basedir}/build/classes"))) @@ -102,7 +102,7 @@ to the default GNU unpack strategy." (define* (configure #:key inputs outputs (jar-name #f) (src-dir "src") #:allow-other-keys) (when jar-name - (default-build.xml src-dir jar-name + (default-build.xml (getcwd) src-dir jar-name (string-append (assoc-ref outputs "out") "/share/java"))) (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))