Changeset 245692 in webkit

Timestamp:

May 23, 2019, 10:33:26 AM (7 years ago)

Author:

Keith Rollin

Message:

generate-xcfilelists should not store temporary build files in /tmp
​https://bugs.webkit.org/show_bug.cgi?id=198136

Reviewed by Jonathan Bedard.

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/generate_xcfilelists_lib/application.py (modified) (1 diff)
• Scripts/webkitpy/generate_xcfilelists_lib/generators.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-23  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 Jonathan Bedard.
+
+        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-23  Philippe Normand  <philn@igalia.com>
 

trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/application.py

@@ -460 +460 @@
         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

trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py

@@ -254 +254 @@
             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,
@@ -309 +310 @@
             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
@@ -642 +643 @@
         return None
 
+    @util.LogEntryExit
+    def _get_temp_dir(self):
+        return self.application.get_xcode_project_temp_dir()
+
 
 class JavaScriptCoreGenerator(BaseGenerator):