[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65230] [PATCH 13/13] gnu-maintenance: Consider Qt source tarballs a
From: |
Maxim Cournoyer |
Subject: |
[bug#65230] [PATCH 13/13] gnu-maintenance: Consider Qt source tarballs as "release files". |
Date: |
Fri, 11 Aug 2023 14:45:00 -0400 |
* guix/gnu-maintenance.scm (release-file?): Use positive logic in doc.
Add a special case for Qt source archives.
* tests/gnu-maintenance.scm ("release-file?"): Update test.
---
guix/gnu-maintenance.scm | 14 +++++++++-----
tests/gnu-maintenance.scm | 4 +++-
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 2574e0f827..1661ae3bf3 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -258,8 +258,7 @@ (define %alpha-tarball-rx
(make-regexp
"^.*-.*[0-9](-|~|\\.)?(alpha|beta|rc|RC|cvs|svn|git)-?[0-9\\.]*\\.tar\\."))
(define (release-file? project file)
- "Return #f if FILE is not a release tarball of PROJECT, otherwise return
-true."
+ "Return true if FILE is a release tarball of PROJECT."
(and (not (member (file-extension file)
'("sig" "sign" "asc"
"md5sum" "sha1sum" "sha256sum")))
@@ -268,12 +267,17 @@ (define (release-file? project file)
;; Filter out unrelated files, like `guile-www-1.1.1'.
;; Case-insensitive for things like "TeXmacs" vs. "texmacs".
;; The "-src" suffix is for "freefont-src-20120503.tar.gz".
+ ;; The '-everywhere-src' suffix is for Qt modular components.
(and=> (match:substring match 1)
(lambda (name)
(or (string-ci=? name project)
- (string-ci=? name
- (string-append project
- "-src")))))))
+ (string-ci=? name (string-append project "-src"))
+ (string-ci=?
+ name (string-append project "-everywhere-src"))
+ ;; For older Qt releases such as version 5.
+ (string-ci=?
+ name (string-append
+ project "-everywhere-opensource-src")))))))
(not (regexp-exec %alpha-tarball-rx file))
(let ((s (tarball-sans-extension file)))
(regexp-exec %package-name-rx s))))
diff --git a/tests/gnu-maintenance.scm b/tests/gnu-maintenance.scm
index 196a6f9092..5e9c006ee9 100644
--- a/tests/gnu-maintenance.scm
+++ b/tests/gnu-maintenance.scm
@@ -40,7 +40,9 @@ (define-module (test-gnu-maintenance)
("exiv2" "exiv2-0.27.3-Source.tar.gz")
("mpg321" "mpg321_0.3.2.orig.tar.gz")
("bvi" "bvi-1.4.1.src.tar.gz")
- ("hostscope" "hostscope-V2.1.tgz")))
+ ("hostscope" "hostscope-V2.1.tgz")
+ ("qtbase" "qtbase-everywhere-src-6.5.2.tar.xz")
+ ("qtbase" "qtbase-everywhere-opensource-src-5.15.10.tar.xz")))
(every (lambda (project+file)
(not (apply release-file? project+file)))
'(("guile" "guile-www-1.1.1.tar.gz")
--
2.41.0
- [bug#65230] [PATCH 07/13] gnu-maintenance: Fix indentation., (continued)
- [bug#65230] [PATCH 07/13] gnu-maintenance: Fix indentation., Maxim Cournoyer, 2023/08/11
- [bug#65230] [PATCH 03/13] gnu: qt: Streamline qt-urls., Maxim Cournoyer, 2023/08/11
- [bug#65230] [PATCH 05/13] gnu-maintenance: Fix docstring., Maxim Cournoyer, 2023/08/11
- [bug#65230] [PATCH 11/13] gnu-maintenance: Add support to rewrite version in URL path., Maxim Cournoyer, 2023/08/11
- [bug#65230] [PATCH 09/13] gnu-maintenance: Document nested procedures in 'import-html-release'., Maxim Cournoyer, 2023/08/11
- [bug#65230] [PATCH 10/13] gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release'., Maxim Cournoyer, 2023/08/11
- [bug#65230] [PATCH 06/13] gnu-maintenance: Extract url->links procedure., Maxim Cournoyer, 2023/08/11
- [bug#65230] [PATCH 12/13] gnu-maintenance: Allow mirror URLs to fallback to the generic HTML updater., Maxim Cournoyer, 2023/08/11
- [bug#65230] [PATCH 04/13] gnu: qt-creator: Use mirror://qt for source URI., Maxim Cournoyer, 2023/08/11
- [bug#65230] [PATCH 08/13] gnu-maintenance: Accept package object in 'import-html-release' procedure., Maxim Cournoyer, 2023/08/11
- [bug#65230] [PATCH 13/13] gnu-maintenance: Consider Qt source tarballs as "release files".,
Maxim Cournoyer <=
- [bug#65230] [PATCH v2 01/13] gnu-maintenance: Make base-url argument of import-html-release required., Maxim Cournoyer, 2023/08/15
- [bug#65230] [PATCH v2 05/13] gnu-maintenance: Fix docstring., Maxim Cournoyer, 2023/08/15
- [bug#65230] [PATCH v2 06/13] gnu-maintenance: Extract url->links procedure., Maxim Cournoyer, 2023/08/15
- [bug#65230] [PATCH v2 03/13] gnu: qt: Streamline qt-urls., Maxim Cournoyer, 2023/08/15
- [bug#65230] [PATCH v2 04/13] gnu: qt-creator: Use mirror://qt for source URI., Maxim Cournoyer, 2023/08/15
- [bug#65230] [PATCH v2 08/13] gnu-maintenance: Accept package object in 'import-html-release' procedure., Maxim Cournoyer, 2023/08/15
- [bug#65230] [PATCH v2 07/13] gnu-maintenance: Fix indentation., Maxim Cournoyer, 2023/08/15
- [bug#65230] [PATCH v2 11/13] gnu-maintenance: Add support to rewrite version in URL path., Maxim Cournoyer, 2023/08/15
- [bug#65230] [PATCH v2 09/13] gnu-maintenance: Document nested procedures in 'import-html-release'., Maxim Cournoyer, 2023/08/15
- [bug#65230] [PATCH v2 13/13] gnu-maintenance: Consider Qt source tarballs as "release files"., Maxim Cournoyer, 2023/08/15