me/guix
Archived
1
0
Fork 0
Code Activity

gnu: java-cisd-jhdf5: Remove trailing #T.

Browse source 
* gnu/packages/java.scm (java-cisd-jhdf5)[source]: Remove trailing #T from
snippet.
[arguments]: Remove trailing #T from build phases.
This commit is contained in:
Ricardo Wurmus 2023-01-09 00:39:43 +01:00
parent 3b62c2804c
commit a4eb83fee7
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/java.scm
View file

@ -2565,8 +2565,7 @@ libraries from the SIS division at ETH Zurich like jHDF5.")
;; Delete included gradle jar ;; Delete included gradle jar
(delete-file-recursively "gradle/wrapper") (delete-file-recursively "gradle/wrapper")
;; Delete pre-built native libraries ;; Delete pre-built native libraries
(delete-file-recursively "libs") (delete-file-recursively "libs")))))
#t))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:make-flags '("-file" "build/build.xml") `(#:make-flags '("-file" "build/build.xml")
@ -2582,8 +2581,7 @@ libraries from the SIS division at ETH Zurich like jHDF5.")
(lambda _ (lambda _
(substitute* "build/build.xml" (substitute* "build/build.xml"
(("\"jar-test\" depends=\"clean, ") (("\"jar-test\" depends=\"clean, ")
"\"jar-test\" depends=\"")) "\"jar-test\" depends=\""))))
#t))
(add-after 'unpack 'unpack-build-resources (add-after 'unpack 'unpack-build-resources
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "build-resources") (copy-recursively (assoc-ref inputs "build-resources")
@ -2600,8 +2598,7 @@ libraries from the SIS division at ETH Zurich like jHDF5.")
(("<build-info.*") "") (("<build-info.*") "")
(("\\$\\{revision.number\\}") (("\\$\\{revision.number\\}")
,(number->string revision)) ,(number->string revision))
(("\\$\\{version.number\\}") ,base-version)) (("\\$\\{version.number\\}") ,base-version))))
#t))
(add-after 'unpack-build-resources 'fix-dependencies (add-after 'unpack-build-resources 'fix-dependencies
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "../build_resources/ant/build-common.xml" (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 ;; Remove leftovers from removing @Friend
(substitute* "h5ar/HDF5ArchiverTest.java" (substitute* "h5ar/HDF5ArchiverTest.java"
(("\\{ HDF5Archiver.class, IdCache.class, LinkRecord.class \\}\\)") (("\\{ HDF5Archiver.class, IdCache.class, LinkRecord.class \\}\\)")
""))) "")))))
#t))
(add-before 'configure 'build-native-library (add-before 'configure 'build-native-library
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((jdk (assoc-ref inputs "jdk")) (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") ,(string-append hdf5 "/lib/libhdf5.a")
"-o" "libjhdf5.so" "-lz"))) "-o" "libjhdf5.so" "-lz")))
(install-file "source/c/libjhdf5.so" (install-file "source/c/libjhdf5.so"
(string-append "libs/native/jhdf5/" dir)) (string-append "libs/native/jhdf5/" dir)))))
#t)))
;; In the "check" phase we only build the test executable. ;; In the "check" phase we only build the test executable.
(add-after 'check 'run-tests (add-after 'check 'run-tests
(lambda _ (lambda _
(invoke "java" "-jar" "targets/dist/sis-jhdf5-test.jar") (invoke "java" "-jar" "targets/dist/sis-jhdf5-test.jar")
(delete-file "targets/dist/sis-jhdf5-test.jar") (delete-file "targets/dist/sis-jhdf5-test.jar")))
#t))
(replace 'install (replace 'install
(install-jars "targets/dist"))))) (install-jars "targets/dist")))))
(inputs (inputs