Title: [123979] trunk/Tools
- Revision
- 123979
- Author
- [email protected]
- Date
- 2012-07-29 07:49:07 -0700 (Sun, 29 Jul 2012)
Log Message
Reviewed by Martin Robinson.
Make the jhbuild wrapper scripts become the jhbuild process
instead of starting it as a child. This should make it possible to
interrupt execution of jhbuild cleanly.
* gtk/run-with-jhbuild:
* jhbuild/jhbuild-wrapper:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (123978 => 123979)
--- trunk/Tools/ChangeLog 2012-07-29 09:49:14 UTC (rev 123978)
+++ trunk/Tools/ChangeLog 2012-07-29 14:49:07 UTC (rev 123979)
@@ -1,3 +1,14 @@
+2012-07-29 Gustavo Noronha Silva <[email protected]>
+
+ Reviewed by Martin Robinson.
+
+ Make the jhbuild wrapper scripts become the jhbuild process
+ instead of starting it as a child. This should make it possible to
+ interrupt execution of jhbuild cleanly.
+
+ * gtk/run-with-jhbuild:
+ * jhbuild/jhbuild-wrapper:
+
2012-07-29 Mike West <[email protected]>
Extend `application/x-webkit-test-netscape` plugins to better support multiple frames.
Modified: trunk/Tools/gtk/run-with-jhbuild (123978 => 123979)
--- trunk/Tools/gtk/run-with-jhbuild 2012-07-29 09:49:14 UTC (rev 123978)
+++ trunk/Tools/gtk/run-with-jhbuild 2012-07-29 14:49:07 UTC (rev 123979)
@@ -23,8 +23,8 @@
import sys
if not os.path.exists(common.top_level_path('WebKitBuild', 'Dependencies')):
- process = subprocess.Popen(sys.argv[1:])
+ os.execve(sys.argv[1], sys.argv[1])
else:
- process = subprocess.Popen([common.top_level_path('Tools', 'jhbuild', 'jhbuild-wrapper'), '--gtk', 'run'] + sys.argv[1:])
-process.wait()
-sys.exit(process.returncode)
+ wrapper = common.top_level_path('Tools', 'jhbuild', 'jhbuild-wrapper')
+ os.execve(wrapper, [wrapper, '--gtk', 'run'] + sys.argv[1:], os.environ)
+
Modified: trunk/Tools/jhbuild/jhbuild-wrapper (123978 => 123979)
--- trunk/Tools/jhbuild/jhbuild-wrapper 2012-07-29 09:49:14 UTC (rev 123978)
+++ trunk/Tools/jhbuild/jhbuild-wrapper 2012-07-29 14:49:07 UTC (rev 123979)
@@ -145,6 +145,5 @@
sys.exit(e)
ensure_jhbuild()
-process = subprocess.Popen([jhbuild_path, '--no-interact', '-f', top_level_path('Tools', platform, 'jhbuildrc')] + sys.argv[2:])
-process.wait()
-sys.exit(process.returncode)
+os.execve(jhbuild_path, [jhbuild_path, '--no-interact', '-f', top_level_path('Tools', platform, 'jhbuildrc')] + sys.argv[2:], os.environ)
+
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
