[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/11: gnu: java-cisd-jhdf5: Remove trailing #T.
From: |
guix-commits |
Subject: |
08/11: gnu: java-cisd-jhdf5: Remove trailing #T. |
Date: |
Sun, 8 Jan 2023 18:49:47 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit a4eb83fee76e5e3002d22441b09c1c833ff801e6
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Mon Jan 9 00:39:43 2023 +0100
gnu: java-cisd-jhdf5: Remove trailing #T.
* gnu/packages/java.scm (java-cisd-jhdf5)[source]: Remove trailing #T from
snippet.
[arguments]: Remove trailing #T from build phases.
---
gnu/packages/java.scm | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7c35f146a7..6595fb5ae4 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2565,8 +2565,7 @@ libraries from the SIS division at ETH Zurich like
jHDF5.")
;; Delete included gradle jar
(delete-file-recursively "gradle/wrapper")
;; Delete pre-built native libraries
- (delete-file-recursively "libs")
- #t))))
+ (delete-file-recursively "libs")))))
(build-system ant-build-system)
(arguments
`(#:make-flags '("-file" "build/build.xml")
@@ -2582,8 +2581,7 @@ libraries from the SIS division at ETH Zurich like
jHDF5.")
(lambda _
(substitute* "build/build.xml"
(("\"jar-test\" depends=\"clean, ")
- "\"jar-test\" depends=\""))
- #t))
+ "\"jar-test\" depends=\""))))
(add-after 'unpack 'unpack-build-resources
(lambda* (#:key inputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "build-resources")
@@ -2600,8 +2598,7 @@ libraries from the SIS division at ETH Zurich like
jHDF5.")
(("<build-info.*") "")
(("\\$\\{revision.number\\}")
,(number->string revision))
- (("\\$\\{version.number\\}") ,base-version))
- #t))
+ (("\\$\\{version.number\\}") ,base-version))))
(add-after 'unpack-build-resources 'fix-dependencies
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "../build_resources/ant/build-common.xml"
@@ -2651,8 +2648,7 @@ libraries from the SIS division at ETH Zurich like
jHDF5.")
;; Remove leftovers from removing @Friend
(substitute* "h5ar/HDF5ArchiverTest.java"
(("\\{ HDF5Archiver.class, IdCache.class, LinkRecord.class
\\}\\)")
- "")))
- #t))
+ "")))))
(add-before 'configure 'build-native-library
(lambda* (#:key inputs #:allow-other-keys)
(let ((jdk (assoc-ref inputs "jdk"))
@@ -2677,14 +2673,12 @@ libraries from the SIS division at ETH Zurich like
jHDF5.")
,(string-append hdf5 "/lib/libhdf5.a")
"-o" "libjhdf5.so" "-lz")))
(install-file "source/c/libjhdf5.so"
- (string-append "libs/native/jhdf5/" dir))
- #t)))
+ (string-append "libs/native/jhdf5/" dir)))))
;; In the "check" phase we only build the test executable.
(add-after 'check 'run-tests
(lambda _
(invoke "java" "-jar" "targets/dist/sis-jhdf5-test.jar")
- (delete-file "targets/dist/sis-jhdf5-test.jar")
- #t))
+ (delete-file "targets/dist/sis-jhdf5-test.jar")))
(replace 'install
(install-jars "targets/dist")))))
(inputs
- branch master updated (aac0605de3 -> 9e14a7b4d2), guix-commits, 2023/01/08
- 08/11: gnu: java-cisd-jhdf5: Remove trailing #T.,
guix-commits <=
- 01/11: gnu: java-jgit-4.2: Do not build with icedtea-7., guix-commits, 2023/01/08
- 02/11: gnu: java-jgit-4.2: Remove trailing #T from build phase., guix-commits, 2023/01/08
- 03/11: gnu: java-cisd-args4j: Remove trailing #T from build phase., guix-commits, 2023/01/08
- 04/11: gnu: java-cisd-args4j: Use later version of ECJ., guix-commits, 2023/01/08
- 05/11: gnu: java-cisd-args4j: Do not build with icedtea-7., guix-commits, 2023/01/08
- 06/11: gnu: Remove java-ecj-3.5., guix-commits, 2023/01/08
- 09/11: gnu: java-cisd-jhdf5: Do not override default JDK., guix-commits, 2023/01/08
- 10/11: gnu: ant-apache-bcel: Fix inheritance by using gexp., guix-commits, 2023/01/08
- 07/11: gnu: java-ecj: Do not inherit from java-ecj-3., guix-commits, 2023/01/08
- 11/11: gnu: ant-junit: Fix inheritance by using gexp., guix-commits, 2023/01/08