[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/72: gnu-maintenance: Consider Qt source tarballs as "release files".
From: |
guix-commits |
Subject: |
13/72: gnu-maintenance: Consider Qt source tarballs as "release files". |
Date: |
Wed, 16 Aug 2023 06:41:07 -0400 (EDT) |
apteryx pushed a commit to branch qt-updates
in repository guix.
commit 8e06a5301d2857027e6acf41c28173f9530e2c9a
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Aug 11 13:44:28 2023 -0400
gnu-maintenance: Consider Qt source tarballs as "release files".
* 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.
Series-to: 65230@debbugs.gnu.org
Series-version: 2
Series-changes: 2
- Also special case release file of Qt Creator
---
guix/gnu-maintenance.scm | 18 +++++++++++++-----
tests/gnu-maintenance.scm | 5 ++++-
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 2574e0f827..04827a9f27 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -258,8 +258,7 @@ network to check in GNU's database."
(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,21 @@ true."
;; 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"))
+ ;; For Qt Creator.
+ (string-ci=?
+ name (string-append
+ project "-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..61ae295b96 100644
--- a/tests/gnu-maintenance.scm
+++ b/tests/gnu-maintenance.scm
@@ -40,7 +40,10 @@
("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")
+ ("qt-creator" "qt-creator-opensource-src-11.0.1.tar.xz")))
(every (lambda (project+file)
(not (apply release-file? project+file)))
'(("guile" "guile-www-1.1.1.tar.gz")
- branch qt-updates created (now 7db63686ba), guix-commits, 2023/08/16
- 01/72: gnu-maintenance: Make base-url argument of import-html-release required., guix-commits, 2023/08/16
- 02/72: download: Add mirrors for Qt., guix-commits, 2023/08/16
- 06/72: gnu-maintenance: Extract url->links procedure., guix-commits, 2023/08/16
- 12/72: gnu-maintenance: Allow mirror URLs to fallback to the generic HTML updater., guix-commits, 2023/08/16
- 13/72: gnu-maintenance: Consider Qt source tarballs as "release files".,
guix-commits <=
- 07/72: gnu-maintenance: Fix indentation., guix-commits, 2023/08/16
- 09/72: gnu-maintenance: Document nested procedures in 'import-html-release'., guix-commits, 2023/08/16
- 28/72: gnu: qtmultimedia: Update to 6.5.2., guix-commits, 2023/08/16
- 29/72: gnu: qtwayland: Update to 6.5.2., guix-commits, 2023/08/16
- 33/72: gnu: qttranslations: Update to 6.5.2., guix-commits, 2023/08/16
- 10/72: gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release'., guix-commits, 2023/08/16
- 03/72: gnu: qt: Streamline qt-urls., guix-commits, 2023/08/16
- 04/72: gnu: qt-creator: Use mirror://qt for source URI., guix-commits, 2023/08/16
- 05/72: gnu-maintenance: Fix docstring., guix-commits, 2023/08/16
- 11/72: gnu-maintenance: Add support to rewrite version in URL path., guix-commits, 2023/08/16