- Revision
- 193639
- Author
- mcatanz...@igalia.com
- Date
- 2015-12-07 10:54:33 -0800 (Mon, 07 Dec 2015)
Log Message
'jhbuild build' should fail immediately when building any module fails
https://bugs.webkit.org/show_bug.cgi?id=145697
Reviewed by Carlos Garcia Campos.
* efl/jhbuildrc: Update jhbuildrc to account for the removal of the use_lib64 option.
* gtk/jhbuildrc: Update jhbuildrc to account for the removal of the use_lib64 option.
Everything is placed under lib instead of lib64 now.
* jhbuild/jhbuild-wrapper: Update jhbuild to the latest upstream commit, and pass
--exit-on-error when running 'jhbuild build'.
* jhbuild/jhbuildrc_common.py:
(init): Don't override PKG_CONFIG_PATH, CMAKE_PREFIX_PATH, or CMAKE_LIBRARY_PATH. Modern
jhbuild should be able to handle these for us without breaking things....
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (193638 => 193639)
--- trunk/Tools/ChangeLog 2015-12-07 18:49:59 UTC (rev 193638)
+++ trunk/Tools/ChangeLog 2015-12-07 18:54:33 UTC (rev 193639)
@@ -1,3 +1,19 @@
+2015-12-07 Michael Catanzaro <mcatanz...@igalia.com>
+
+ 'jhbuild build' should fail immediately when building any module fails
+ https://bugs.webkit.org/show_bug.cgi?id=145697
+
+ Reviewed by Carlos Garcia Campos.
+
+ * efl/jhbuildrc: Update jhbuildrc to account for the removal of the use_lib64 option.
+ * gtk/jhbuildrc: Update jhbuildrc to account for the removal of the use_lib64 option.
+ Everything is placed under lib instead of lib64 now.
+ * jhbuild/jhbuild-wrapper: Update jhbuild to the latest upstream commit, and pass
+ --exit-on-error when running 'jhbuild build'.
+ * jhbuild/jhbuildrc_common.py:
+ (init): Don't override PKG_CONFIG_PATH, CMAKE_PREFIX_PATH, or CMAKE_LIBRARY_PATH. Modern
+ jhbuild should be able to handle these for us without breaking things....
+
2015-12-07 Xabier Rodriguez Calvar <calva...@igalia.com>
Add support to import w3c tests from a repository with a different root that the main repo dir
Modified: trunk/Tools/efl/jhbuildrc (193638 => 193639)
--- trunk/Tools/efl/jhbuildrc 2015-12-07 18:49:59 UTC (rev 193638)
+++ trunk/Tools/efl/jhbuildrc 2015-12-07 18:54:33 UTC (rev 193639)
@@ -22,10 +22,6 @@
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild") )
import jhbuildrc_common
-# Setting use_lib64 to False is necessary, otherwise CMake will not find
-# the lib64/cmake/<name> folder that contains the <Name>Config.cmake files.
-use_lib64 = False
-
jhbuildrc_common.init(globals(), "efl")
addpath('XDG_DATA_DIRS', '/usr/share')
Modified: trunk/Tools/gtk/jhbuildrc (193638 => 193639)
--- trunk/Tools/gtk/jhbuildrc 2015-12-07 18:49:59 UTC (rev 193638)
+++ trunk/Tools/gtk/jhbuildrc 2015-12-07 18:54:33 UTC (rev 193639)
@@ -37,7 +37,4 @@
# for a module, so we do it here globally since it's a good idea for all other modules as well.
buildroot = os.path.join(os.path.dirname(checkoutroot), "Build")
-if use_lib64:
- os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(buildroot, 'Mesa', 'lib64', 'gallium'))
-else:
- os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(buildroot, 'Mesa', 'lib', 'gallium'))
+os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(buildroot, 'Mesa', 'lib', 'gallium'))
Modified: trunk/Tools/jhbuild/jhbuild-wrapper (193638 => 193639)
--- trunk/Tools/jhbuild/jhbuild-wrapper 2015-12-07 18:49:59 UTC (rev 193638)
+++ trunk/Tools/jhbuild/jhbuild-wrapper 2015-12-07 18:54:33 UTC (rev 193639)
@@ -24,8 +24,8 @@
import subprocess
import sys
-# 3.12.0
-jhbuild_revision = '5f42e91b05f55bcf1346899fa39fee4e3becca6f'
+# First release to support --exit-on-error option
+jhbuild_revision = 'f524fbe120ebb4b7d209ce0d035cd3d2e4a66bd4'
def determine_platform():
if '--efl' in sys.argv:
@@ -123,4 +123,4 @@
ensure_jhbuild(platform)
-os.execve(jhbuild_path, [jhbuild_path, '--no-interact', '-f', jhbuildutils.get_config_file_for_platform(platform)] + sys.argv[2:], os.environ)
+os.execve(jhbuild_path, [jhbuild_path, '--exit-on-error', '--no-interact', '-f', jhbuildutils.get_config_file_for_platform(platform)] + sys.argv[2:], os.environ)
Modified: trunk/Tools/jhbuild/jhbuildrc_common.py (193638 => 193639)
--- trunk/Tools/jhbuild/jhbuildrc_common.py 2015-12-07 18:49:59 UTC (rev 193638)
+++ trunk/Tools/jhbuild/jhbuildrc_common.py 2015-12-07 18:54:33 UTC (rev 193639)
@@ -72,17 +72,15 @@
os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''
# Use system libraries while building.
- if jhbuildrc_globals['use_lib64']:
- _library_dir = 'lib64'
- else:
- _library_dir = 'lib'
addpath = jhbuildrc_globals['addpath']
- addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', _library_dir, 'pkgconfig'))
+ system_libdirs = jhbuildrc_globals['system_libdirs']
+ for libdir in system_libdirs:
+ addpath('PKG_CONFIG_PATH', os.path.join(libdir, 'pkgconfig'))
addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
prefix = jhbuildrc_globals['prefix']
addpath('CMAKE_PREFIX_PATH', prefix)
- addpath('CMAKE_LIBRARY_PATH', os.path.join(prefix, _library_dir))
+ addpath('CMAKE_LIBRARY_PATH', os.path.join(prefix, 'lib'))
if 'JHBUILD_MIRROR' in os.environ:
jhbuildrc_globals['dvcs_mirror_dir'] = os.environ['JHBUILD_MIRROR']
