Attachment 370432 Details for Bug 198136 – Patch

[patch] Patch

bug-198136-20190522124143.patch (text/plain), 3.46 KB, created by Keith Rollin on 2019-05-22 12:41:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2019-05-22 12:41:44 PDT

Size: 3.46 KB

patch

obsolete

>Subversion Revision: 245569
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 81eabc75e282715dfd8c4ee93533903066283a7f..8c9e7ef0fa800fd1f074c4ee9327c35fe837265b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,22 @@
>+2019-05-22  Keith Rollin  <krollin@apple.com>
>+
>+        generate-xcfilelists should not store temporary build files in /tmp
>+        https://bugs.webkit.org/show_bug.cgi?id=198136
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Provide the build infrastructure control of the location of
>+        generate-xcfilelists' temporary files by creating them in the build
>+        directory when possible.
>+
>+        * Scripts/webkitpy/generate_xcfilelists_lib/application.py:
>+        (get_xcode_project_temp_dir):
>+        * Scripts/webkitpy/generate_xcfilelists_lib/generators.py:
>+        (BaseGenerator._generate_derived):
>+        (BaseGenerator._generate_unified):
>+        (BaseGenerator):
>+        (BaseGenerator._get_temp_dir):
>+
> 2019-05-21  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. Fix the build with HAVE(ACCESSIBILITY) disabled
>diff --git a/Tools/Scripts/webkitpy/generate_xcfilelists_lib/application.py b/Tools/Scripts/webkitpy/generate_xcfilelists_lib/application.py
>index 8089ace0062271a4cb061b703190cf7e6d0e6a92..9922aec539558c2d8cda3826500c364ce968bd5a 100644
>--- a/Tools/Scripts/webkitpy/generate_xcfilelists_lib/application.py
>+++ b/Tools/Scripts/webkitpy/generate_xcfilelists_lib/application.py
>@@ -459,6 +459,11 @@ specified on the command-line:
>         assert util.is_running_under_xcode()
>         return self._getenv("BUILT_PRODUCTS_DIR")
> 
>+    @util.LogEntryExit
>+    def get_xcode_project_temp_dir(self):
>+        assert util.is_running_under_xcode()
>+        return self._getenv("PROJECT_TEMP_DIR")
>+
>     # Return the named environment variable.
>     @util.LogEntryExit
>     def _getenv(self, variable_name):
>diff --git a/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py b/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py
>index 7a783c4e1fa49dfe799bd0cc463ca4463176f9a7..d862d4f1da87365dd00dd5882cc8e087d6edc5f6 100644
>--- a/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py
>+++ b/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py
>@@ -253,7 +253,8 @@ class BaseGenerator(object):
>         if not script:
>             return
> 
>-        with tempfile.NamedTemporaryFile() as input, tempfile.NamedTemporaryFile() as output:
>+        with tempfile.NamedTemporaryFile(dir=self._get_temp_dir()) as input, \
>+                tempfile.NamedTemporaryFile(dir=self._get_temp_dir()) as output:
>             (stdout, stderr) = util.subprocess_run(
>                     [script,
>                         "NO_SUPPLEMENTAL_FILES=1",
>@@ -308,7 +309,7 @@ class BaseGenerator(object):
>         if not script:
>             return
> 
>-        with tempfile.NamedTemporaryFile() as output:
>+        with tempfile.NamedTemporaryFile(dir=self._get_temp_dir()) as output:
> 
>             # We need to define BUILD_SCRIPTS_DIR so that the bash script we're
>             # invoking can find the ruby script that it invokes. If we don't
>@@ -641,6 +642,10 @@ class BaseGenerator(object):
>     def _get_generate_unified_sources_script(self):
>         return None
> 
>+    @util.LogEntryExit
>+    def _get_temp_dir(self):
>+        return self.application.get_xcode_project_temp_dir()
>+
> 
> class JavaScriptCoreGenerator(BaseGenerator):
>     VALID_PLATFORMS = ("macosx", "iosmac", "iphoneos", "iphonesimulator", "watchos", "watchsimulator")

Actions: View | Formatted Diff | Diff

Attachments on bug 198136: 370432 | 370444