Changeset 51788 in webkit

Timestamp:

Dec 7, 2009 12:17:20 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-07 Yaar Schnitman <​yaar@chromium.org>

Reviewed by Darin Fisher.

fixes to build-webkit --chromium
​https://bugs.webkit.org/show_bug.cgi?id=32179

• DEPS:
• WebKit.gyp:
• gyp_webkit:

2009-12-07 Yaar Schnitman <​yaar@chromium.org>

Reviewed by Darin Fisher.

fixes to build-webkit --chromium
​https://bugs.webkit.org/show_bug.cgi?id=32179

• Scripts/webkitdirs.pm:

Location:

trunk

Files:

• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/DEPS (modified) (1 diff)
• WebKit/chromium/WebKit.gyp (modified) (2 diffs)
• WebKit/chromium/gyp_webkit (modified) (3 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/Scripts/webkitdirs.pm (modified) (3 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2009-12-07  Yaar Schnitman  <yaar@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        fixes to build-webkit --chromium
+        https://bugs.webkit.org/show_bug.cgi?id=32179
+
+        * DEPS:
+        * WebKit.gyp:
+        * gyp_webkit:
+
 2009-12-07  Mikhail Naganov  <mnaganov@chromium.org>
 

trunk/WebKit/chromium/DEPS

@@ -144 +144 @@
       Var('chromium_deps_svn')+'/pthreads-win32@'+Var('pthreads-win32_rev'),
   },
+  'unix': {
+    # Linux, actually.
+    'third_party/harfbuzz':
+      Var('chromium_svn')+'/third_party/harfbuzz@'+Var('chromium_rev'),
+
+    'tools/xdisplaycheck':
+      Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'),
+  },
 }
 

trunk/WebKit/chromium/WebKit.gyp

@@ -41 +41 @@
                 # e.g. via build-webkit --chromium
                 'chromium_src_dir': '.',
+                # FIXME: To enable shared_library in linux all code (including
+                # dependencies) must be complied with -fPIC flag. That is
+                # pending on changes in gyp.
                 'webkit_target_type': 'shared_library',
             },{
@@ -51 +54 @@
             ['OS=="mac"', {
                 'chromium_code': 1,
+            }],
+            # FIXME: To enable shared_library in linux all code (including
+            # dependencies) must be complied with -fPIC flag. That is
+            # pending on changes in gyp.
+            ['OS=="linux" or OS=="freebsd"', {
+              'webkit_target_type': 'static_library',
             }],
         ],

trunk/WebKit/chromium/gyp_webkit

@@ -33 +33 @@
 import glob
 import os
+import platform
 import shlex
 import sys
@@ -77 +78 @@
   args.extend(['-I' + i for i in additional_include_files(args)])
 
+  # On linux, we want gyp to output a makefile (default is scons).
+  if (platform.system() == 'Linux'):
+    args.extend(['-fmake'])
+
   # Other command args:
   args.extend([
@@ -88 +93 @@
 
                # gyp file to execute.
-               'webkit.gyp'])
+               'WebKit.gyp'])
 
   print 'Updating webkit projects from gyp files...'

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-07  Yaar Schnitman  <yaar@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        fixes to build-webkit --chromium
+        https://bugs.webkit.org/show_bug.cgi?id=32179
+
+        * Scripts/webkitdirs.pm:
+
 2009-12-07  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -1132 +1132 @@
 
     my $useenv = "/useenv";
-    if (isChromium()) {
-        $useenv = "";
-    }
 
     my @command = ($vcBuildPath, $useenv, $winProjectPath, $action, $config);
@@ -1406 +1403 @@
 }
 
+sub buildChromiumMakefile($$$)
+{
+    my ($dir, $target, $clean) = @_;
+    chdir $dir;
+    if ($clean) {
+        return system qw(rm -rf out);
+    }
+    my $config = configuration();
+    my @command = ("make", "-j4", "BUILDTYPE=$config", $target);
+    print join(" ", @command) . "\n";
+    return system @command;
+}
+
+sub buildChromiumVisualStudioProject($$)
+{
+    my ($projectPath, $clean) = @_;
+
+    my $config = configuration();
+    my $action = "/build";
+    $action = "/clean" if $clean;
+
+    # Find Visual Studio installation.
+    my $vsInstallDir;
+    my $programFilesPath = $ENV{'PROGRAMFILES'} || "C:\\Program Files";
+    if ($ENV{'VSINSTALLDIR'}) {
+        $vsInstallDir = $ENV{'VSINSTALLDIR'};
+    } else {
+        $vsInstallDir = "$programFilesPath/Microsoft Visual Studio 8";
+    }
+    $vsInstallDir = `cygpath "$vsInstallDir"` if isCygwin();
+    chomp $vsInstallDir;
+    $vcBuildPath = "$vsInstallDir/Common7/IDE/devenv.com";
+
+    # Create command line and execute it.
+    my @command = ($vcBuildPath, $projectPath, $action, $config);
+    print "Building results into: ", baseProductDir(), "\n";
+    print join(" ", @command), "\n";
+    return system @command;
+}
+
 sub buildChromium($@)
 {
@@ -1413 +1450 @@
     if (isDarwin()) {
         # Mac build - builds the root xcode project.
-        $result = buildXCodeProject("WebKit/chromium/webkit",
-                                    $clean,
-                                    (@options));
-    } elsif (isCygwin()) {
+        $result = buildXCodeProject("WebKit/chromium/WebKit", $clean, (@options));
+    } elsif (isCygwin() || isWindows()) {
         # Windows build - builds the root visual studio solution.
-        $result = buildVisualStudioProject("WebKit/chromium/webkit.sln",
-                                           $clean);
+        $result = buildChromiumVisualStudioProject("WebKit/chromium/WebKit.sln", $clean);
     } elsif (isLinux()) {
-        # Linux build
-        # FIXME support linux.
-        print STDERR "Linux build is not supported. Yet.";
+        # Linux build - build using make.
+        $ result = buildChromiumMakefile("WebKit/chromium/", "WebKit", $clean);
     } else {
-        print STDERR "This platform is not supported by chromium.";
+        print STDERR "This platform is not supported by chromium.\n";
     }
     return $result;