ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openjdk11: Fix find-files syntax.

Browse source 
* gnu/packages/java.scm (openjdk11)[source]: Remove extra characters
from find-files invocation.
[arguments]: Remove extra characters from find-files invocations in
multiple phases.
This commit is contained in:
Efraim Flashner 2022-12-19 16:00:23 +02:00
parent f667aeb642
commit c8ebfa0dd9
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/java.scm
View file

@ -1772,7 +1772,7 @@ (define-public openjdk11
"1prvqy0ysz0999wrhsrbz6vrknpqfihl9l74l16ph93g89dqi5ia")) "1prvqy0ysz0999wrhsrbz6vrknpqfihl9l74l16ph93g89dqi5ia"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))))) '(for-each delete-file (find-files "." "\\.(bin|exe|jar)$")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "jdk" "doc")) (outputs '("out" "jdk" "doc"))
(arguments (arguments
@ -1851,8 +1851,7 @@ (define (icedtea-or-openjdk? path)
(format (current-error-port) (format (current-error-port)
"warning: failed to substitute: ~a~%" "warning: failed to substitute: ~a~%"
file)))) file))))
(find-files "." (find-files "." "\\.c$|\\.h$")))))
"\\.c$|\\.h$")))))
(add-before 'build 'write-source-revision-file (add-before 'build 'write-source-revision-file
(lambda _ (lambda _
(with-output-to-file ".src-rev" (with-output-to-file ".src-rev"
@ -1879,7 +1878,7 @@ (define (icedtea-or-openjdk? path)
,@make-flags)))) ,@make-flags))))
(replace 'install (replace 'install
(lambda _ (lambda _
(let ((images (car (find-files "build" ".*-server-release" (let ((images (car (find-files "build" "-server-release"
#:directories? #t)))) #:directories? #t))))
(copy-recursively (string-append images "/images/jdk") (copy-recursively (string-append images "/images/jdk")
#$output:jdk) #$output:jdk)
@ -1913,7 +1912,7 @@ (define (icedtea-or-openjdk? path)
(invoke "unzip" archive)) (invoke "unzip" archive))
(delete-file archive) (delete-file archive)
(with-directory-excursion dir (with-directory-excursion dir
(let ((char-data-files (find-files "." "CharacterData.*"))) (let ((char-data-files (find-files "." "CharacterData")))
(for-each (lambda (file) (for-each (lambda (file)
(substitute* file (substitute* file
(((string-append "This file was generated " (((string-append "This file was generated "
@ -1924,7 +1923,7 @@ (define (icedtea-or-openjdk? path)
"file")))) "file"))))
char-data-files))) char-data-files)))
(with-directory-excursion dir (with-directory-excursion dir
(let ((files (find-files "." ".*" #:directories? #t))) (let ((files (find-files "." #:directories? #t)))
(apply invoke "zip" "-0" "-X" archive files)))))) (apply invoke "zip" "-0" "-X" archive files))))))
(add-after 'strip-character-data-timestamps 'remove-extraneous-files (add-after 'strip-character-data-timestamps 'remove-extraneous-files
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -1949,7 +1948,7 @@ (define (icedtea-or-openjdk? path)
(invoke "unzip" archive)) (invoke "unzip" archive))
(delete-file archive) (delete-file archive)
(for-each (compose repack-archive canonicalize-path) (for-each (compose repack-archive canonicalize-path)
(find-files dir "(ct.sym|\\.jar)$")) (find-files dir "(ct\\.sym|\\.jar)$"))
(let ((reset-file-timestamp (let ((reset-file-timestamp
(lambda (file) (lambda (file)
(let ((s (lstat file))) (let ((s (lstat file)))
@ -1959,7 +1958,7 @@ (define (icedtea-or-openjdk? path)
(for-each reset-file-timestamp (for-each reset-file-timestamp
(find-files dir #:directories? #t))) (find-files dir #:directories? #t)))
(with-directory-excursion dir (with-directory-excursion dir
(let ((files (find-files "." ".*" #:directories? #t))) (let ((files (find-files "." #:directories? #t)))
(apply invoke "zip" "-0" "-X" archive files))))))) (apply invoke "zip" "-0" "-X" archive files)))))))
(for-each repack-archive (for-each repack-archive
(find-files #$output:doc "\\.zip$")) (find-files #$output:doc "\\.zip$"))