From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:33039) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffo-0005qJ-3K for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffl-00066W-Ni for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58173) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffh-00061y-Uo 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 1hlffh-0006z4-K8 for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:05 -0400 Subject: [bug#36605] [PATCH 01/12] guix: ant-bulild-sytem: allow specifying the source directory. Resent-Message-ID: From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:23 +0200 Message-Id: <20190711202644.32014-15-h.goebel@crazy-compilers.com> 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 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36605@debbugs.gnu.org * guix/build-system/ant.scm (ant-build) Add parameter src-dir. * guix/build/ant-build-system.scm (default-build.xml): New parameter src-dir. (configure): pass src-dir on to default-build.xml. * doc/guix.texi (Build Systems): Add description. --- doc/guix.texi | 3 ++- guix/build-system/ant.scm | 2 ++ guix/build/ant-build-system.scm | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b6ca34a..19c70ad 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2956,7 +2956,8 @@ parameters, respectively. When the original package does not provide a suitable Ant build file, the parameter @code{#:jar-name} can be used to generate a minimal Ant build file @file{build.xml} with tasks to build the specified jar -archive. +archive. In this case the parameter @code{#:src-dir} can be used to +specify the source sub-directory, defaulting to ``src''. The parameter @code{#:build-target} can be used to specify the Ant task that should be run during the @code{build} phase. By default the diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 550f92b..cd544ad 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -98,6 +98,7 @@ (make-flags ''()) (build-target "jar") (jar-name #f) + (src-dir "src") (phases '(@ (guix build ant-build-system) %standard-phases)) (outputs '("out")) @@ -126,6 +127,7 @@ #:test-target ,test-target #:build-target ,build-target #:jar-name ,jar-name + #:src-dir ,src-dir #:phases ,phases #:outputs %outputs #:search-paths ',(map search-path-specification->sexp diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index 2cc6bb9..651150d 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -35,7 +35,7 @@ ;; ;; Code: -(define (default-build.xml jar-name prefix) +(define (default-build.xml src-dir jar-name prefix) "Create a simple build.xml with standard targets for Ant." (call-with-output-file "build.xml" (lambda (port) @@ -59,7 +59,7 @@ (target (@ (name "compile")) (mkdir (@ (dir "${classes.dir}"))) (javac (@ (includeantruntime "false") - (srcdir "src") + (srcdir ,src-dir) (destdir "${classes.dir}") (classpath (@ (refid "classpath")))))) @@ -100,9 +100,9 @@ to the default GNU unpack strategy." ((assq-ref gnu:%standard-phases 'unpack) #:source source))) (define* (configure #:key inputs outputs (jar-name #f) - #:allow-other-keys) + (src-dir "src") #:allow-other-keys) (when jar-name - (default-build.xml jar-name + (default-build.xml src-dir jar-name (string-append (assoc-ref outputs "out") "/share/java"))) (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) -- 2.7.4