From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: Vivien Kraus <vivien@planete-kraus.eu>, 60358@debbugs.gnu.org
Subject: [bug#60358] [PATCH v7 3/5] gnu: UCD: Add version 3.0-update1.
Date: Sun, 01 Jan 2023 02:28:36 +0100 [thread overview]
Message-ID: <73cdf6ccd738d27a1b92bf106f91f9a8a6662559.camel@gmail.com> (raw)
In-Reply-To: <2206897d7f4826d78caf52b1b7eca47c92313255.camel@planete-kraus.eu>
Am Sonntag, dem 01.01.2023 um 01:24 +0100 schrieb Vivien Kraus:
> Happy new year!
>
> Le samedi 31 décembre 2022 à 20:17 +0100, Liliana Marie Prikler a
> écrit :
> > Am Freitag, dem 30.12.2022 um 22:20 +0100 schrieb Vivien Kraus:
> > > * gnu/packages/unicode.scm (ucd3.0-update1): New variable.
> > Once again, do you need all of these, or just a single file? (Or
> > indeed none at all?)
>
> The build fails if I pass an empty file or a file with just the
> header.
>
> I switched to an unnamed origin in the build phase, is that better?
Yes, that is better – an outside variable would also have been, but it
works for now.
> + (("sc_check_sym_list")
> + "disabled_check_sym_list")
> + (("sc_cpp_indent_check")
> + "disabled_cpp_indent_check")
> + (("sc_check_copyright")
> + "disabled_check_copyright")
> + (("sc_prohibit_AC_LIBOBJ_in_m4")
> + "disabled_prohibit_AC_LIBOBJ_in_m4")
> + (("sc_prefer_ac_check_funcs_once")
> + "disabled_prefer_ac_check_funcs_once")
> + (("sc_prohibit_leading_TABs")
> + "disabled_prohibit_leading_TABs"))))
I think matching the name and then doing (string-append "disabled_"
test) should work better and possibly lets you group some.
> + (define (find-ucd-file name)
> + (search-input-file inputs (string-append
> "share/ucd/" name)))
I think you should also
(define (find-ucd-files . files)
(map find-ucd-file files))
Then you can
> + (apply invoke
> + "./gen-uni-tables"
> + `(,@(map find-ucd-file
> + '("UnicodeData.txt"
> + "PropList.txt"
> + "DerivedCoreProperties.txt"
> + "emoji/emoji-data.txt"
> + "ArabicShaping.txt"
> + "Scripts.txt"
> + "Blocks.txt"))
> + ,PropList-3.0.1.txt
> + ,@(map find-ucd-file
> + '("EastAsianWidth.txt"
> + "LineBreak.txt"
> + "auxiliary/WordBreakProperty.txt"
> +
> "auxiliary/GraphemeBreakProperty.txt"
> + "CompositionExclusions.txt"
> + "SpecialCasing.txt"
> + "CaseFolding.txt"))
(apply invoke
(append
(find-ucd-files "UnicodeData.txt"
"PropList.txt"
...)
(list PropList-3.0.1.txt) ; or inline the origin here
(find-ucd-files "EastAsianWidth.txt"
...)))
> + (copy-file (search-input-file inputs
> "share/ucd/NameAliases.txt")
> + "../tests/uniname/NameAliases.txt")
> + (copy-file (search-input-file inputs
> "share/ucd/UnicodeData.txt")
> + "../tests/uniname/UnicodeData.txt")
> + (copy-file (search-input-file inputs
> "share/ucd/NormalizationTest.txt")
> + "../tests/uninorm/NormalizationTest.txt")
> + (copy-file (search-input-file inputs
> "share/ucd/auxiliary/GraphemeBreakTest.txt")
> + "../tests/unigbrk/GraphemeBreakTest.txt")
> + (copy-file (search-input-file inputs
> "share/ucd/auxiliary/WordBreakTest.txt")
> + "../tests/uniwbrk/WordBreakTest.txt")
Can we simplify this in terms of for-each and directory excursions?
Also reuse find-ucd-file(s).
> + (replace 'install
> + (lambda _
> + (install-file "gnulib-tool"
> + (string-append #$output "/bin"))
> + (delete-file-recursively ".git")
> + (copy-recursively "." (string-append #$output
> "/src/gnulib/")))))))
Should we perhaps use copy-build-system instead and just copy over
gnu:build and gnu:test?
Cheers
next prev parent reply other threads:[~2023-01-01 1:29 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-27 16:23 [bug#60358] [PATCH] gnu: Add gnulib Vivien Kraus via Guix-patches via
2022-12-27 16:23 ` [bug#60358] [PATCH v10 3/4] " Vivien Kraus via Guix-patches via
2022-12-27 16:23 ` [bug#60358] [PATCH v9 " Vivien Kraus via Guix-patches via
2023-01-01 16:25 ` Liliana Marie Prikler
2023-01-01 16:55 ` Vivien Kraus via Guix-patches via
2023-01-01 17:31 ` Liliana Marie Prikler
2022-12-27 16:23 ` [bug#60358] [PATCH v4 1/3] " Vivien Kraus via Guix-patches via
2022-12-27 16:23 ` [bug#60358] [PATCH v5 1/5] " Vivien Kraus via Guix-patches via
2022-12-31 6:53 ` Liliana Marie Prikler
2022-12-27 16:23 ` [bug#60358] [PATCH v7 4/5] " Vivien Kraus via Guix-patches via
2022-12-31 19:26 ` Liliana Marie Prikler
2022-12-27 16:23 ` [bug#60358] [PATCH v6 2/3] " Vivien Kraus via Guix-patches via
2022-12-27 16:23 ` [bug#60358] [PATCH v11 3/4] " Vivien Kraus via Guix-patches via
2023-01-01 20:48 ` Vivien Kraus via Guix-patches via
2022-12-27 16:23 ` [bug#60358] [PATCH v8 " Vivien Kraus via Guix-patches via
2022-12-27 17:33 ` [bug#60358] Providing gnulib Vivien Kraus via Guix-patches via
2022-12-27 18:44 ` [bug#60358] [PATCH] gnu: Add gnulib Simon Josefsson via Guix-patches via
2022-12-28 1:57 ` Vivien Kraus via Guix-patches via
2022-12-29 14:44 ` Simon Josefsson via Guix-patches via
2022-12-29 15:56 ` Simon Josefsson via Guix-patches via
2022-12-27 20:45 ` Liliana Marie Prikler
2022-12-27 16:23 ` [bug#60358] [PATCH v2 1/2] " Vivien Kraus via Guix-patches via
2022-12-28 2:20 ` [bug#60358] [PATCH v2 2/2] gnu: guile-gnutls: Update to 3.7.11 Vivien Kraus via Guix-patches via
2022-12-28 2:50 ` Vivien Kraus via Guix-patches via
2022-12-29 14:55 ` Simon Josefsson via Guix-patches via
2022-12-27 16:23 ` [bug#60358] [PATCH v3 1/2] gnu: Add gnulib Vivien Kraus via Guix-patches via
2022-12-29 20:02 ` Liliana Marie Prikler
2022-12-30 11:45 ` Vivien Kraus via Guix-patches via
2022-12-30 19:35 ` Liliana Marie Prikler
2022-12-28 2:20 ` [bug#60358] [PATCH v3 2/2] gnu: guile-gnutls: Update to 3.7.11 Vivien Kraus via Guix-patches via
2022-12-29 15:25 ` Vivien Kraus via Guix-patches via
2022-12-29 15:37 ` Simon Josefsson via Guix-patches via
2022-12-29 16:06 ` Vivien Kraus via Guix-patches via
2022-12-29 16:14 ` Simon Josefsson via Guix-patches via
2022-12-28 2:20 ` [bug#60358] [PATCH v5 5/5] " Vivien Kraus via Guix-patches via
2022-12-31 6:53 ` Liliana Marie Prikler
2022-12-28 2:20 ` [bug#60358] [PATCH v7 " Vivien Kraus via Guix-patches via
2022-12-28 2:20 ` [bug#60358] [PATCH v6 3/3] " Vivien Kraus via Guix-patches via
2022-12-28 2:20 ` [bug#60358] [PATCH v4 " Vivien Kraus via Guix-patches via
2022-12-28 2:20 ` [bug#60358] [PATCH v9 4/4] " Vivien Kraus via Guix-patches via
2022-12-28 2:20 ` [bug#60358] [PATCH v11 " Vivien Kraus via Guix-patches via
2022-12-28 2:20 ` [bug#60358] [PATCH v8 " Vivien Kraus via Guix-patches via
2022-12-28 2:20 ` [bug#60358] [PATCH v10 " Vivien Kraus via Guix-patches via
2023-01-15 7:07 ` bug#60358: " Liliana Marie Prikler
2022-12-30 11:30 ` [bug#60358] [PATCH v4 2/3] gnu: gnulib: Enable tests Vivien Kraus via Guix-patches via
2022-12-30 11:30 ` [bug#60358] [PATCH v5 2/5] " Vivien Kraus via Guix-patches via
2022-12-30 21:20 ` [bug#60358] [PATCH v5 3/5] gnu: UCD: Add version 3.0-update1 Vivien Kraus via Guix-patches via
2022-12-31 6:49 ` Liliana Marie Prikler
2022-12-31 10:56 ` Vivien Kraus via Guix-patches via
2022-12-31 14:07 ` Liliana Marie Prikler
2022-12-30 21:20 ` [bug#60358] [PATCH v7 " Vivien Kraus via Guix-patches via
2022-12-31 19:17 ` Liliana Marie Prikler
2023-01-01 0:24 ` Vivien Kraus via Guix-patches via
2023-01-01 1:28 ` Liliana Marie Prikler [this message]
2022-12-30 21:20 ` [bug#60358] [PATCH v6 1/3] " Vivien Kraus via Guix-patches via
2022-12-30 22:05 ` [bug#60358] [PATCH v5 4/5] gnu: gnulib: Regenerate the unicode data Vivien Kraus via Guix-patches via
2022-12-31 17:33 ` [bug#60358] [PATCH v7 1/5] gnu: libunibreak: Use ucd instead of ucd-next Vivien Kraus via Guix-patches via
2022-12-31 17:33 ` [bug#60358] [PATCH v9 1/4] " Vivien Kraus via Guix-patches via
2022-12-31 17:33 ` [bug#60358] [PATCH v8 " Vivien Kraus via Guix-patches via
2022-12-31 17:33 ` [bug#60358] [PATCH v11 " Vivien Kraus via Guix-patches via
2022-12-31 17:33 ` [bug#60358] [PATCH v10 " Vivien Kraus via Guix-patches via
2022-12-31 17:34 ` [bug#60358] [PATCH v8 2/4] gnu: ucd-next: Update to 15.0.0 Vivien Kraus via Guix-patches via
2022-12-31 17:34 ` [bug#60358] [PATCH v9 " Vivien Kraus via Guix-patches via
2022-12-31 17:34 ` [bug#60358] [PATCH v7 2/5] " Vivien Kraus via Guix-patches via
2022-12-31 17:34 ` [bug#60358] [PATCH v10 2/4] " Vivien Kraus via Guix-patches via
2022-12-31 17:34 ` [bug#60358] [PATCH v11 " Vivien Kraus via Guix-patches via
2023-01-01 21:45 ` [bug#60358] [PATCH v11 0/4] Use a cover letter Vivien Kraus via Guix-patches via
2022-12-31 17:33 ` [bug#60358] [PATCH v11 1/4] gnu: libunibreak: Use ucd instead of ucd-next Vivien Kraus via Guix-patches via
2022-12-31 17:34 ` [bug#60358] [PATCH v11 2/4] gnu: ucd-next: Update to 15.0.0 Vivien Kraus via Guix-patches via
2022-12-27 16:23 ` [bug#60358] [PATCH v11 3/4] gnu: Add gnulib Vivien Kraus via Guix-patches via
2022-12-28 2:20 ` [bug#60358] [PATCH v11 4/4] gnu: guile-gnutls: Update to 3.7.11 Vivien Kraus via Guix-patches via
2023-01-01 21:59 ` [bug#60358] [PATCH v11 0/4] Using a cover letter with a shallow thread style Vivien Kraus via Guix-patches via
2022-12-27 16:23 ` [bug#60358] [PATCH v11 3/4] gnu: Add gnulib Vivien Kraus via Guix-patches via
2022-12-28 2:20 ` [bug#60358] [PATCH v11 4/4] gnu: guile-gnutls: Update to 3.7.11 Vivien Kraus via Guix-patches via
2022-12-31 17:33 ` [bug#60358] [PATCH v11 1/4] gnu: libunibreak: Use ucd instead of ucd-next Vivien Kraus via Guix-patches via
2022-12-31 17:34 ` [bug#60358] [PATCH v11 2/4] gnu: ucd-next: Update to 15.0.0 Vivien Kraus via Guix-patches via
2023-01-02 19:43 ` [bug#60358] [PATCH v12 0/4] Add my name to the copyright line Vivien Kraus via Guix-patches via
2022-12-27 16:23 ` [bug#60358] [PATCH v12 3/4] gnu: Add gnulib Vivien Kraus via Guix-patches via
2023-01-16 11:59 ` [bug#60358] [PATCH] " Ludovic Courtès
2022-12-28 2:20 ` [bug#60358] [PATCH v12 4/4] gnu: guile-gnutls: Update to 3.7.11 Vivien Kraus via Guix-patches via
2022-12-31 17:33 ` [bug#60358] [PATCH v12 1/4] gnu: libunibreak: Use ucd instead of ucd-next Vivien Kraus via Guix-patches via
2022-12-31 17:34 ` [bug#60358] [PATCH v12 2/4] gnu: ucd-next: Update to 15.0.0 Vivien Kraus via Guix-patches via
2023-01-07 10:21 ` [bug#60358] gnulib: Should this be in its own module? Vivien Kraus via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=73cdf6ccd738d27a1b92bf106f91f9a8a6662559.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=60358@debbugs.gnu.org \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).