[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/07: gnu: openjdk11: Fix find-files syntax.
From: |
guix-commits |
Subject: |
02/07: gnu: openjdk11: Fix find-files syntax. |
Date: |
Tue, 20 Dec 2022 10:12:38 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit c8ebfa0dd9514affbc30ca56f9f8cce0fc7550dc
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Dec 19 16:00:23 2022 +0200
gnu: openjdk11: Fix find-files syntax.
* gnu/packages/java.scm (openjdk11)[source]: Remove extra characters
from find-files invocation.
[arguments]: Remove extra characters from find-files invocations in
multiple phases.
---
gnu/packages/java.scm | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index fa4d2d3bd0..e06020eedf 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1772,7 +1772,7 @@ new Date();"))
"1prvqy0ysz0999wrhsrbz6vrknpqfihl9l74l16ph93g89dqi5ia"))
(modules '((guix build utils)))
(snippet
- '(for-each delete-file (find-files "." ".*.(bin|exe|jar)$")))))
+ '(for-each delete-file (find-files "." "\\.(bin|exe|jar)$")))))
(build-system gnu-build-system)
(outputs '("out" "jdk" "doc"))
(arguments
@@ -1851,8 +1851,7 @@ new Date();"))
(format (current-error-port)
"warning: failed to substitute: ~a~%"
file))))
- (find-files "."
- "\\.c$|\\.h$")))))
+ (find-files "." "\\.c$|\\.h$")))))
(add-before 'build 'write-source-revision-file
(lambda _
(with-output-to-file ".src-rev"
@@ -1879,7 +1878,7 @@ new Date();"))
,@make-flags))))
(replace 'install
(lambda _
- (let ((images (car (find-files "build" ".*-server-release"
+ (let ((images (car (find-files "build" "-server-release"
#:directories? #t))))
(copy-recursively (string-append images "/images/jdk")
#$output:jdk)
@@ -1913,7 +1912,7 @@ new Date();"))
(invoke "unzip" archive))
(delete-file archive)
(with-directory-excursion dir
- (let ((char-data-files (find-files "." "CharacterData.*")))
+ (let ((char-data-files (find-files "." "CharacterData")))
(for-each (lambda (file)
(substitute* file
(((string-append "This file was generated "
@@ -1924,7 +1923,7 @@ new Date();"))
"file"))))
char-data-files)))
(with-directory-excursion dir
- (let ((files (find-files "." ".*" #:directories? #t)))
+ (let ((files (find-files "." #:directories? #t)))
(apply invoke "zip" "-0" "-X" archive files))))))
(add-after 'strip-character-data-timestamps 'remove-extraneous-files
(lambda* (#:key outputs #:allow-other-keys)
@@ -1949,7 +1948,7 @@ new Date();"))
(invoke "unzip" archive))
(delete-file archive)
(for-each (compose repack-archive
canonicalize-path)
- (find-files dir "(ct.sym|\\.jar)$"))
+ (find-files dir "(ct\\.sym|\\.jar)$"))
(let ((reset-file-timestamp
(lambda (file)
(let ((s (lstat file)))
@@ -1959,7 +1958,7 @@ new Date();"))
(for-each reset-file-timestamp
(find-files dir #:directories? #t)))
(with-directory-excursion dir
- (let ((files (find-files "." ".*" #:directories?
#t)))
+ (let ((files (find-files "." #:directories? #t)))
(apply invoke "zip" "-0" "-X" archive
files)))))))
(for-each repack-archive
(find-files #$output:doc "\\.zip$"))
- branch master updated (1a3d8b9228 -> fc4eef7506), guix-commits, 2022/12/20
- 02/07: gnu: openjdk11: Fix find-files syntax.,
guix-commits <=
- 04/07: gnu: openjdk15: Update to 15.0.9., guix-commits, 2022/12/20
- 03/07: gnu: openjdk13: Update to 13.0.13., guix-commits, 2022/12/20
- 01/07: gnu: openjdk11: Update to 11.0.17., guix-commits, 2022/12/20
- 06/07: gnu: openjdk17: Update to 17.0.5., guix-commits, 2022/12/20
- 05/07: gnu: openjdk16: Update to 16.0.2., guix-commits, 2022/12/20
- 07/07: gnu: openjdk18: Update to 18.0.2., guix-commits, 2022/12/20