* bug#30665: ant-build-system: use manifest task
@ 2018-03-01 17:42 Ricardo Wurmus
2018-06-18 8:31 ` bug#30665: [PATCH, STAGING] guix: ant-build-system: Use manifest task to create manifest Gábor Boskovits
2018-06-18 15:18 ` bug#30665: ant-build-system: use-manifest-task Gábor Boskovits
0 siblings, 2 replies; 4+ messages in thread
From: Ricardo Wurmus @ 2018-03-01 17:42 UTC (permalink / raw)
To: 30665
Hi Guix,
instead of using a custom target that uses the “echo” task to write the
manifest, the ant-build-system should use the “manifest” task directly.
It is documented here:
https://ant.apache.org/manual/Tasks/manifest.html
--
Ricardo
^ permalink raw reply [flat|nested] 4+ messages in thread* bug#30665: [PATCH, STAGING] guix: ant-build-system: Use manifest task to create manifest.
2018-03-01 17:42 bug#30665: ant-build-system: use manifest task Ricardo Wurmus
@ 2018-06-18 8:31 ` Gábor Boskovits
2018-06-18 13:49 ` Marius Bakke
2018-06-18 15:18 ` bug#30665: ant-build-system: use-manifest-task Gábor Boskovits
1 sibling, 1 reply; 4+ messages in thread
From: Gábor Boskovits @ 2018-06-18 8:31 UTC (permalink / raw)
To: 30665
---
guix/build/ant-build-system.scm | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
index 3ed12b9f4..87c782d85 100644
--- a/guix/build/ant-build-system.scm
+++ b/guix/build/ant-build-system.scm
@@ -68,14 +68,11 @@
(target (@ (name "manifest"))
(mkdir (@ (dir "${manifest.dir}")))
- (echo (@ (file "${manifest.file}")
- (message ,(string-append
- (if main-class
- (string-append
- "Main-Class: " main-class
- "${line.separator}")
- "")
- "")))))
+ (manifest (@ (file "${manifest.file}"))
+ ,(if main-class
+ `(attribute (@ (name "Main-Class")
+ (value ,main-class)))
+ "")))
(target (@ (name "compile"))
(mkdir (@ (dir "${classes.dir}")))
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* bug#30665: [PATCH, STAGING] guix: ant-build-system: Use manifest task to create manifest.
2018-06-18 8:31 ` bug#30665: [PATCH, STAGING] guix: ant-build-system: Use manifest task to create manifest Gábor Boskovits
@ 2018-06-18 13:49 ` Marius Bakke
0 siblings, 0 replies; 4+ messages in thread
From: Marius Bakke @ 2018-06-18 13:49 UTC (permalink / raw)
To: Gábor Boskovits, 30665
[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]
Gábor Boskovits <boskovits@gmail.com> writes:
> ---
> guix/build/ant-build-system.scm | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
> index 3ed12b9f4..87c782d85 100644
> --- a/guix/build/ant-build-system.scm
> +++ b/guix/build/ant-build-system.scm
> @@ -68,14 +68,11 @@
>
> (target (@ (name "manifest"))
> (mkdir (@ (dir "${manifest.dir}")))
> - (echo (@ (file "${manifest.file}")
> - (message ,(string-append
> - (if main-class
> - (string-append
> - "Main-Class: " main-class
> - "${line.separator}")
> - "")
> - "")))))
> + (manifest (@ (file "${manifest.file}"))
> + ,(if main-class
> + `(attribute (@ (name "Main-Class")
> + (value ,main-class)))
> + "")))
LGTM. I was about to push it and start the 'staging' jobset on Hydra,
but I'm not sure what to write in the commit message. Are you able to
push it soonish?
I'll start Hydra once the current 'master' evaluation finishes.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#30665: ant-build-system: use-manifest-task
2018-03-01 17:42 bug#30665: ant-build-system: use manifest task Ricardo Wurmus
2018-06-18 8:31 ` bug#30665: [PATCH, STAGING] guix: ant-build-system: Use manifest task to create manifest Gábor Boskovits
@ 2018-06-18 15:18 ` Gábor Boskovits
1 sibling, 0 replies; 4+ messages in thread
From: Gábor Boskovits @ 2018-06-18 15:18 UTC (permalink / raw)
To: 30665-done
[-- Attachment #1: Type: text/plain, Size: 68 bytes --]
Fixed on staging, commit:
90ea1006a86518e523c510eee1214fd81e71da74.
[-- Attachment #2: Type: text/html, Size: 103 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-06-18 15:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-01 17:42 bug#30665: ant-build-system: use manifest task Ricardo Wurmus
2018-06-18 8:31 ` bug#30665: [PATCH, STAGING] guix: ant-build-system: Use manifest task to create manifest Gábor Boskovits
2018-06-18 13:49 ` Marius Bakke
2018-06-18 15:18 ` bug#30665: ant-build-system: use-manifest-task Gábor Boskovits
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).