GitLab

https://bugs.webkit.org/show_bug.cgi?id=113396

Reviewed by Philippe Normand.

So far, we were using the `MAKEFLAGS' environment variable to pass the
number of compilation jobs we wanted to jhbuild. jhbuild itself, on the
other hand, prefers to use the `jobs' variable from jhbuildrc for that.

We now behave more closely to the rest of the WebKit tools by first
checking the `NUMBER_OF_PROCESSORS' environment variable and, if it is
not set, just letting jhbuild itself figure out how many jobs to use.

* efl/jhbuildrc:
* gtk/jhbuildrc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146979 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=84707

Reviewed by Gustavo Noronha Silva.

Most of the warnings have been fixed now that FindCairo.cmake and
FindGLIB.cmake have been rewritten. The remaining one, related to
FindFontconfig.cmake, shows up when building on a 64-bit
Debian-based systems.

jhbuild installs libraries into lib64/ by default on 64-bit Linux
installations, while CMake does not look for libraries in lib64/
when /etc/debian_version exists on the system. The FIND_LIBRARY()
would then sometimes end up using the system installation instead of
the jhbuild one, causing mismatches and, when pkg-config is not used
at all, failing to find libraries altogether.

* efl/jhbuildrc: Set the CMAKE_LIBRARY_PATH environment variable
when use_lib64 is set to force CMake to look into lib64/ regardless
of the presence of /etc/debian_version.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127003 268f45cc-cd09-0410-ab3c-d52691b4dbfc

http://trac.webkit.org/changeset/120113
https://bugs.webkit.org/show_bug.cgi?id=95320

Wrong fix for the problem, experimentally rolling it out for
bug 95237. (Requested by rakuco on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-08-29

* efl/jhbuildrc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@126985 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=84707

Fixing CMAKE prefix path for 64bit systems to avoid CMAKE warnings on those.
use_lib64 variable is preconfigured to True by jhbuild.

Patch by Dominik Röttsches <dominik.rottsches@intel.com> on 2012-06-12
Reviewed by Dirk Pranke.

* efl/jhbuildrc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@120113 268f45cc-cd09-0410-ab3c-d52691b4dbfc

http://trac.webkit.org/changeset/116223
https://bugs.webkit.org/show_bug.cgi?id=85718

The bots need to set XDG_DATA_DIRS (Requested by rakuco on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-05-05

* efl/jhbuildrc:
* gtk/jhbuildrc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@116224 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=85717

Reviewed by Martin Robinson.

After r116209, the XDG_DATA_DIRS environment variable is now
passed by webkitpy's layout_tests code to run-with-jhbuild, so
instead of setting a few defaults in jhbuildrc we can now rely on
the values set and really used by each system.

* efl/jhbuildrc:
* gtk/jhbuildrc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@116223 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=76161

Reviewed by Martin Robinson.

* Scripts/webkitdirs.pm:
(getJhbuildPath): New method to obtain the jhbuild base directory,
using the product base directory
(jhbuildConfigurationChanged): Use the new method
(buildAutotoolsProject): Ditto.
* efl/jhbuildrc: Use WEBKITOUTPUTDIR when calculating the path.
* gtk/jhbuildrc: Ditto.
* jhbuild/jhbuild-wrapper: Ditto.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@115532 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=82252

Reviewed by Gustavo Noronha Silva.

Appending the directory containing common.py may be problematic if
another path in sys.path also contains either a common.py or a
common/ module, so prepend to select our version instead. This is
the case with fail2ban, which has a common/ directory which may
end up being in Python's default path.

* efl/jhbuildrc:
* gtk/jhbuildrc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@112309 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=81585

Reviewed by Martin Robinson.

Now that support for Python 2.5 has been dropped, we can safely
use multiprocessing.cpu_count() to obtain the current number of
CPUs in the system instead of running a webkitperl script for
that.

* efl/common.py:
(top_level_path):
* efl/jhbuildrc:
* gtk/common.py:
(build_path):
* gtk/jhbuildrc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@111313 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=81491

Reviewed by Philippe Normand.

For the find_path(), find_library() etc CMake calls to find the
dependencies built with jhbuild, CMAKE_PREFIX_PATH must be properly
set, otherwise CMake cannot know the dependencies exist and will only
look in the standard directories.

* efl/jhbuildrc: Set the CMAKE_PREFIX_PATH environment variable with
the jhbuild Root directory.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@111187 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=81510

Needed to ensure correct glib behaviour in jhbuild environment.

Patch by Dominik Röttsches <dominik.rottsches@linux.intel.com> on 2012-03-19
Reviewed by Philippe Normand.

* efl/jhbuildrc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@111186 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=79904

build-webkit --efl will use jhbuild for fetching and building dependencies.

Patch by Dominik Röttsches <dominik.rottsches@linux.intel.com> on 2012-03-17
Reviewed by Gustavo Noronha Silva.

* Scripts/update-webkitefl-libs: Added.
* Scripts/webkitdirs.pm:
(jhbuildWrapperPrefixIfNeeded):
(generateBuildSystemFromCMakeProject):
(buildCMakeGeneratedProject):
* efl/common.py: Added.
(script_path):
(top_level_path):
(number_of_cpus):
* efl/jhbuild.modules: Added.
* efl/jhbuildrc: Added.
* efl/run-with-jhbuild: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@111115 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=76691

Reviewed by Gustavo Noronha Silva.

* gtk/jhbuildrc: Extra modulesets and modules can be added in
JHBuild using the WEBKIT_EXTRA_MODULESETS and WEBKIT_EXTRA_MODULES
env variables respectively. Use comma-separated values. Example:
WEBKIT_EXTRA_MODULES=file:///path/to/module.set,file:///other/path.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105519 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=76284

Patch by Mario Sanchez Prada <msanchez@igalia.com> on 2012-01-16
Reviewed by Philippe Normand.

* gtk/jhbuild.modules: Add some gtk+3 to the jhbuild moduleset.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105075 268f45cc-cd09-0410-ab3c-d52691b4dbfc

https://bugs.webkit.org/show_bug.cgi?id=73425

Reviewed by Gustavo Noronha Silva.

Add initial jhbuild support to the GTK+ port. update-webkitgtk-libs will
ensure that the jhbuild root is up-to-date. Currently the only module is
the font module.

* Scripts/update-webkitgtk-libs: Added.
* gtk/common.py: Added a helper to get the number of CPUs.
* gtk/jhbuild.modules: Added.
* gtk/jhbuildrc: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@101523 268f45cc-cd09-0410-ab3c-d52691b4dbfc