From 1173a74a0f70ee732a8afc02d151b6c3640a68b9 Mon Sep 17 00:00:00 2001 From: Mervin M Fansler Date: Tue, 9 Jul 2024 23:21:50 +0200 Subject: [PATCH] ucrt updates --- run.R | 8 ++++++++ run.py | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/run.R b/run.R index a0aa3b5..855e193 100644 --- a/run.R +++ b/run.R @@ -81,6 +81,14 @@ for (fn in packages) { meta_raw <- readLines(meta_fname) meta_new <- meta_raw + # UCRT changes + meta_new <- str_replace(meta_new, fixed("{{ native }}"), "") + meta_new <- str_replace(meta_new, fixed("{{native}}"), "") + meta_new <- meta_new[!str_detect(meta_new, fixed("merge_build_host: "))] + meta_new <- meta_new[!str_detect(meta_new, fixed("- gcc-libs"))] + meta_new <- meta_new[!str_detect(meta_new, fixed("- posix"))] + meta_new <- meta_new[!str_detect(meta_new, fixed("set native ="))] + # Extract CRAN metadata cran_metadata_start <- str_which(meta_new, "^# Package: ") cran_metadata_lines <- cran_metadata_start:length(meta_new) diff --git a/run.py b/run.py index 12a5a08..1933489 100644 --- a/run.py +++ b/run.py @@ -92,6 +92,18 @@ cran_metadata = ['\n'] for line in f: + # UCRT changes + line = line.replace("{{ native }}", "") + line = line.replace("{{native}}", "") + if "merge_build_host: " in line: + continue + if "- gcc-libs" in line: + continue + if "- posix" in line: + continue + if "set native =" in line: + continue + # Extract CRAN metadata if line[:11] == '# Package: ': is_cran_metadata = True