[gnome-builder/gnome-builder-42] plugins/meson: be tolerant of newlines



commit e2ee7109d80e85ca5b076e3dc63a75eeef7fe747
Author: Christian Hergert <chergert redhat com>
Date:   Wed Apr 20 15:13:21 2022 -0700

    plugins/meson: be tolerant of newlines
    
    Some meson.build files may have # comments above the project() line.
    
    Fixes #1656

 src/plugins/meson/gbp-meson-build-system.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/src/plugins/meson/gbp-meson-build-system.c b/src/plugins/meson/gbp-meson-build-system.c
index 71914b263..ee7dfd18e 100644
--- a/src/plugins/meson/gbp-meson-build-system.c
+++ b/src/plugins/meson/gbp-meson-build-system.c
@@ -865,7 +865,7 @@ extract_metadata (GbpMesonBuildSystem *self,
         }
     }
 
-  regex = g_regex_new ("^project\\((.*)\\)", G_REGEX_DOTALL | G_REGEX_UNGREEDY, 0, NULL);
+  regex = g_regex_new ("^project\\((.*)\\)", G_REGEX_DOTALL | G_REGEX_MULTILINE | G_REGEX_UNGREEDY, 0, NULL);
   g_regex_match (regex, contents, 0, &match_info);
   while (g_match_info_matches (match_info))
     {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]