Title: [271050] trunk/Tools
Revision
271050
Author
[email protected]
Date
2020-12-22 04:22:49 -0800 (Tue, 22 Dec 2020)

Log Message

[Flapak SDK] Allow setting custom SDK repository locations and other small fixes
https://bugs.webkit.org/show_bug.cgi?id=219884

Reviewed by Philippe Normand.

Tools:

- Update envvar to match the WEBKIT_FLATPAK prefix
- Give precedence to the verbose flag instead of envvar
- Enable logging earlier to be used in the parse step
- Error out if the user provides an user repo that is not accessible.

* flatpak/flatpakutils.py:
(WebkitFlatpak.load_from_args):
(WebkitFlatpak.clean_args):

Tools/buildstream:

- Allow inheriting the RSYNC info from envvar for local testing.
- Add a 'dry-push-repo' command to be able to perform push-repo dry-runs.

* Makefile:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (271049 => 271050)


--- trunk/Tools/ChangeLog	2020-12-22 10:11:23 UTC (rev 271049)
+++ trunk/Tools/ChangeLog	2020-12-22 12:22:49 UTC (rev 271050)
@@ -1,3 +1,19 @@
+2020-12-22  Lauro Moura  <[email protected]>
+
+        [Flapak SDK] Allow setting custom SDK repository locations and other small fixes
+        https://bugs.webkit.org/show_bug.cgi?id=219884
+
+        Reviewed by Philippe Normand.
+
+        - Update envvar to match the WEBKIT_FLATPAK prefix
+        - Give precedence to the verbose flag instead of envvar
+        - Enable logging earlier to be used in the parse step
+        - Error out if the user provides an user repo that is not accessible.
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.load_from_args):
+        (WebkitFlatpak.clean_args):
+
 2020-12-21  Simon Fraser  <[email protected]>
 
         [macOS MiniBrowser] Add menu items to reset all experimental and internal debug features to defaults

Modified: trunk/Tools/buildstream/ChangeLog (271049 => 271050)


--- trunk/Tools/buildstream/ChangeLog	2020-12-22 10:11:23 UTC (rev 271049)
+++ trunk/Tools/buildstream/ChangeLog	2020-12-22 12:22:49 UTC (rev 271050)
@@ -1,3 +1,15 @@
+2020-12-22  Lauro Moura  <[email protected]>
+
+        [Flapak SDK] Allow setting custom SDK repository locations and other small fixes
+        https://bugs.webkit.org/show_bug.cgi?id=219884
+
+        Reviewed by Philippe Normand.
+
+        - Allow inheriting the RSYNC info from envvar for local testing.
+        - Add a 'dry-push-repo' command to be able to perform push-repo dry-runs.
+
+        * Makefile:
+
 2020-12-14  Lauro Moura  <[email protected]>
 
         [Flatpak SDK] Update GTK4 to 3.99.5

Modified: trunk/Tools/buildstream/Makefile (271049 => 271050)


--- trunk/Tools/buildstream/Makefile	2020-12-22 10:11:23 UTC (rev 271049)
+++ trunk/Tools/buildstream/Makefile	2020-12-22 12:22:49 UTC (rev 271050)
@@ -17,8 +17,8 @@
 # EXPORT_ARGS ?= --gpg-sign=${GPG_KEY} --gpg-homedir=gpg
 EXPORT_ARGS ?=
 
-RSYNC_HOST = software.igalia.com
-RSYNC_REMOTE_DIR = /var/www/software/webkit-sdk-repo
+RSYNC_HOST ?= software.igalia.com
+RSYNC_REMOTE_DIR ?= /var/www/software/webkit-sdk-repo
 
 FLATPAK_RUNTIMES_REPO = $(CACHEDIR)/flatpak-runtimes-repo
 FLATPAK_PLATFORM_EXTENSIONS_REPO = $(CACHEDIR)/flatpak-platform-extensions-repo
@@ -122,3 +122,6 @@
 
 push-repo:
 	./ostree-releng-scripts/rsync-repos --rsync-opts="-vz" --src ${REPO}/ --dest ${RSYNC_HOST}:${RSYNC_REMOTE_DIR}
+
+dry-push-repo:
+	./ostree-releng-scripts/rsync-repos --rsync-opts="-vzn" --src ${REPO}/ --dest ${RSYNC_HOST}:${RSYNC_REMOTE_DIR}

Modified: trunk/Tools/flatpak/flatpakutils.py (271049 => 271050)


--- trunk/Tools/flatpak/flatpakutils.py	2020-12-22 10:11:23 UTC (rev 271049)
+++ trunk/Tools/flatpak/flatpakutils.py	2020-12-22 12:22:49 UTC (rev 271050)
@@ -468,10 +468,17 @@
         if os.environ.get('CCACHE_PREFIX') == 'icecc':
             self.use_icecream = True
 
-        verbose = os.environ.get('WEBKIT_SDK_VERBOSE')
-        if verbose is not None:
+        verbose = os.environ.get('WEBKIT_FLATPAK_SDK_VERBOSE')
+        if (not self.verbose) and (verbose is not None):
             self.verbose = verbose != '0'
 
+        configure_logging(logging.DEBUG if self.verbose else logging.INFO)
+
+        if self.user_repo:
+            if not os.path.exists(self.user_repo):
+                _log.error('User repo at %s is not accessible\n' % self.user_repo)
+                sys.exit(1)
+
         return self
 
     def __init__(self):
@@ -539,8 +546,6 @@
             os.makedirs(self.flatpak_build_path)
         except OSError as e:
             pass
-
-        configure_logging(logging.DEBUG if self.verbose else logging.INFO)
         _log.debug("Using flatpak user dir: %s" % self.flatpak_build_path)
 
         self.platform = self.platform.upper()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to