mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 07:16:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: opendjk11: Improve regular expressions.

Browse source 
* gnu/packages/java.scm (openjdk11)
[phases]{strip-archive-timestamps}: Replace '.*.' with '\\.' in regexps.
This commit is contained in:
Maxim Cournoyer 2022-09-26 20:01:30 -04:00
parent 7ac7a6d103
commit 6193d98717
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/java.scm
View file

@ -1946,7 +1946,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,9 +1959,9 @@ (define (icedtea-or-openjdk? path)
(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$"))
(for-each repack-archive (for-each repack-archive
(find-files #$output:jdk ".*.(zip|jar|diz)$")) (find-files #$output:jdk "\\.(zip|jar|diz)$"))
(repack-archive (string-append #$output:jdk "/lib/ct.sym")) (repack-archive (string-append #$output:jdk "/lib/ct.sym"))
(let ((repack-jmod (let ((repack-jmod
(lambda (file-name) (lambda (file-name)
@ -1992,7 +1992,7 @@ (define (icedtea-or-openjdk? path)
file temp-file file temp-file
(stat:size (stat temp-file)) 0))))))))))))) (stat:size (stat temp-file)) 0)))))))))))))
(for-each repack-jmod (for-each repack-jmod
(find-files #$output:jdk ".*.jmod$")))))) (find-files #$output:jdk "\\.jmod$"))))))
(add-after 'install 'remove-timestamp-from-api-summary (add-after 'install 'remove-timestamp-from-api-summary
(lambda _ (lambda _
(substitute* (string-append #$output:doc (substitute* (string-append #$output:doc