Changeset 175555 in webkit

Timestamp:

Nov 4, 2014, 11:05:42 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[jhbuild] Make it possible to build GTK/EFL in same repository
​https://bugs.webkit.org/show_bug.cgi?id=137448

Patch by Tibor Meszaros <​tmeszaros.u-szeged@partner.samsung.com> on 2014-11-04
Reviewed by Martin Robinson.

• Scripts/webkitdirs.pm:

(getJhbuildPath):

• WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp:

(getPlatformFontsPath):

• WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:

(WTR::getFontsPath):

• jhbuild/jhbuild-wrapper:

(determine_platform):
(install_jhbuild):

• jhbuild/jhbuildrc_common.py:

(init):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp (modified) (1 diff)
• jhbuild/jhbuild-wrapper (modified) (3 diffs)
• jhbuild/jhbuildrc_common.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-11-04  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
+
+        [jhbuild] Make it possible to build GTK/EFL in same repository
+        https://bugs.webkit.org/show_bug.cgi?id=137448
+
+        Reviewed by Martin Robinson.
+
+        * Scripts/webkitdirs.pm:
+        (getJhbuildPath):
+        * WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp:
+        (getPlatformFontsPath):
+        * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
+        (WTR::getFontsPath):
+        * jhbuild/jhbuild-wrapper:
+        (determine_platform):
+        (install_jhbuild):
+        * jhbuild/jhbuildrc_common.py:
+        (init):
+
 2014-11-04  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1637 +1637 @@
         pop(@jhbuildPath);
     }
-    push(@jhbuildPath, "Dependencies");
+    if (isEfl()) {
+        push(@jhbuildPath, "DependenciesEFL");
+    } elsif (isGtk()) {
+        push(@jhbuildPath, "DependenciesGTK");
+    } else {
+        die "Cannot get JHBuild path for platform that isn't GTK+ or EFL.\n";
+    }
     return File::Spec->catdir(@jhbuildPath);
 }

trunk/Tools/WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp

@@ -103 +103 @@
     CString customBuildDir = getCustomBuildDir();
     if (!customBuildDir.isNull()) {
-        CString fontsPath = buildPath(customBuildDir.data(), "Dependencies", "Root", "webkitgtk-test-fonts", 0);
+        CString fontsPath = buildPath(customBuildDir.data(), "DependenciesEFL", "Root", "webkitgtk-test-fonts", 0);
         if (!ecore_file_exists(fontsPath.data()))
             fprintf(stderr, "WEBKIT_OUTPUTDIR set to '%s', but could not local test fonts.\n", customBuildDir.data());

trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp

@@ -69 +69 @@
 {
     CString webkitOutputDir = getOutputDir();
-    GUniquePtr<char> fontsPath(g_build_filename(webkitOutputDir.data(), "Dependencies", "Root", "webkitgtk-test-fonts", nullptr));
+    GUniquePtr<char> fontsPath(g_build_filename(webkitOutputDir.data(), "DependenciesGTK", "Root", "webkitgtk-test-fonts", nullptr));
     if (g_file_test(fontsPath.get(), static_cast<GFileTest>(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
         return fontsPath.get();

trunk/Tools/jhbuild/jhbuild-wrapper

@@ -27 +27 @@
 jhbuild_revision = 'c0cb46177d79189ffe0f760703c732f1c7ea8b29'
 
+def determine_platform():
+    if '--efl' in sys.argv:
+        return "efl";
+    if '--gtk' in sys.argv:
+        return "gtk";
+    raise ValueError('No platform specified for jhbuild-wrapper.')
+
+try:
+    platform = determine_platform()
+except ValueError as e:
+    sys.exit(e)
+
 dependencies_path = jhbuildutils.get_dependencies_path()
-installation_prefix = os.path.abspath(os.path.join(dependencies_path, 'Root'))
-source_path = os.path.abspath(os.path.join(dependencies_path, 'Source'))
+installation_prefix = os.path.abspath(os.path.join(dependencies_path + platform.upper(), 'Root'))
+source_path = os.path.abspath(os.path.join(dependencies_path + platform.upper(), 'Source'))
 jhbuild_source_path = os.path.join(source_path, 'jhbuild')
 jhbuild_path = os.path.join(installation_prefix, 'bin', 'jhbuild')
@@ -93 +105 @@
         raise Exception('jhbuild configure failed with return code: %i' % process.returncode)
 
-
-def determine_platform():
-    if '--efl' in sys.argv:
-        return "efl";
-    if '--gtk' in sys.argv:
-        return "gtk";
-    raise ValueError('No platform specified for jhbuild-wrapper.')
-
-
 def ensure_jhbuild(platform):
     if not jhbuild_cloned():
@@ -117 +120 @@
     del os.environ['ACLOCAL_FLAGS']
 
-try:
-    platform = determine_platform()
-except ValueError as e:
-    sys.exit(e)
 ensure_jhbuild(platform)
 

trunk/Tools/jhbuild/jhbuildrc_common.py

@@ -55 +55 @@
 
     if 'WEBKIT_OUTPUTDIR' in os.environ:
-        jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Source'))
-        jhbuildrc_globals["prefix"] = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Root'))
+        jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies' + platform.upper(), 'Source'))
+        jhbuildrc_globals["prefix"] = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies' + platform.upper(), 'Root'))
     else:
-        jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies', 'Source'))
-        jhbuildrc_globals["prefix"] = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies', 'Root'))
+        jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies' + platform.upper(), 'Source'))
+        jhbuildrc_globals["prefix"] = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies' + platform.upper(), 'Root'))
 
     jhbuildrc_globals["nonotify"] = True