Changeset 51788 in webkit
- Timestamp:
- Dec 7, 2009 12:17:20 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/chromium/ChangeLog
r51766 r51788 1 2009-12-07 Yaar Schnitman <yaar@chromium.org> 2 3 Reviewed by Darin Fisher. 4 5 fixes to build-webkit --chromium 6 https://bugs.webkit.org/show_bug.cgi?id=32179 7 8 * DEPS: 9 * WebKit.gyp: 10 * gyp_webkit: 11 1 12 2009-12-07 Mikhail Naganov <mnaganov@chromium.org> 2 13 -
trunk/WebKit/chromium/DEPS
r51623 r51788 144 144 Var('chromium_deps_svn')+'/pthreads-win32@'+Var('pthreads-win32_rev'), 145 145 }, 146 'unix': { 147 # Linux, actually. 148 'third_party/harfbuzz': 149 Var('chromium_svn')+'/third_party/harfbuzz@'+Var('chromium_rev'), 150 151 'tools/xdisplaycheck': 152 Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'), 153 }, 146 154 } 147 155 -
trunk/WebKit/chromium/WebKit.gyp
r51720 r51788 41 41 # e.g. via build-webkit --chromium 42 42 'chromium_src_dir': '.', 43 # FIXME: To enable shared_library in linux all code (including 44 # dependencies) must be complied with -fPIC flag. That is 45 # pending on changes in gyp. 43 46 'webkit_target_type': 'shared_library', 44 47 },{ … … 51 54 ['OS=="mac"', { 52 55 'chromium_code': 1, 56 }], 57 # FIXME: To enable shared_library in linux all code (including 58 # dependencies) must be complied with -fPIC flag. That is 59 # pending on changes in gyp. 60 ['OS=="linux" or OS=="freebsd"', { 61 'webkit_target_type': 'static_library', 53 62 }], 54 63 ], -
trunk/WebKit/chromium/gyp_webkit
r49032 r51788 33 33 import glob 34 34 import os 35 import platform 35 36 import shlex 36 37 import sys … … 77 78 args.extend(['-I' + i for i in additional_include_files(args)]) 78 79 80 # On linux, we want gyp to output a makefile (default is scons). 81 if (platform.system() == 'Linux'): 82 args.extend(['-fmake']) 83 79 84 # Other command args: 80 85 args.extend([ … … 88 93 89 94 # gyp file to execute. 90 ' webkit.gyp'])95 'WebKit.gyp']) 91 96 92 97 print 'Updating webkit projects from gyp files...' -
trunk/WebKitTools/ChangeLog
r51787 r51788 1 2009-12-07 Yaar Schnitman <yaar@chromium.org> 2 3 Reviewed by Darin Fisher. 4 5 fixes to build-webkit --chromium 6 https://bugs.webkit.org/show_bug.cgi?id=32179 7 8 * Scripts/webkitdirs.pm: 9 1 10 2009-12-07 Eric Seidel <eric@webkit.org> 2 11 -
trunk/WebKitTools/Scripts/webkitdirs.pm
r51585 r51788 1132 1132 1133 1133 my $useenv = "/useenv"; 1134 if (isChromium()) {1135 $useenv = "";1136 }1137 1134 1138 1135 my @command = ($vcBuildPath, $useenv, $winProjectPath, $action, $config); … … 1406 1403 } 1407 1404 1405 sub buildChromiumMakefile($$$) 1406 { 1407 my ($dir, $target, $clean) = @_; 1408 chdir $dir; 1409 if ($clean) { 1410 return system qw(rm -rf out); 1411 } 1412 my $config = configuration(); 1413 my @command = ("make", "-j4", "BUILDTYPE=$config", $target); 1414 print join(" ", @command) . "\n"; 1415 return system @command; 1416 } 1417 1418 sub buildChromiumVisualStudioProject($$) 1419 { 1420 my ($projectPath, $clean) = @_; 1421 1422 my $config = configuration(); 1423 my $action = "/build"; 1424 $action = "/clean" if $clean; 1425 1426 # Find Visual Studio installation. 1427 my $vsInstallDir; 1428 my $programFilesPath = $ENV{'PROGRAMFILES'} || "C:\\Program Files"; 1429 if ($ENV{'VSINSTALLDIR'}) { 1430 $vsInstallDir = $ENV{'VSINSTALLDIR'}; 1431 } else { 1432 $vsInstallDir = "$programFilesPath/Microsoft Visual Studio 8"; 1433 } 1434 $vsInstallDir = `cygpath "$vsInstallDir"` if isCygwin(); 1435 chomp $vsInstallDir; 1436 $vcBuildPath = "$vsInstallDir/Common7/IDE/devenv.com"; 1437 1438 # Create command line and execute it. 1439 my @command = ($vcBuildPath, $projectPath, $action, $config); 1440 print "Building results into: ", baseProductDir(), "\n"; 1441 print join(" ", @command), "\n"; 1442 return system @command; 1443 } 1444 1408 1445 sub buildChromium($@) 1409 1446 { … … 1413 1450 if (isDarwin()) { 1414 1451 # Mac build - builds the root xcode project. 1415 $result = buildXCodeProject("WebKit/chromium/webkit", 1416 $clean, 1417 (@options)); 1418 } elsif (isCygwin()) { 1452 $result = buildXCodeProject("WebKit/chromium/WebKit", $clean, (@options)); 1453 } elsif (isCygwin() || isWindows()) { 1419 1454 # Windows build - builds the root visual studio solution. 1420 $result = buildVisualStudioProject("WebKit/chromium/webkit.sln", 1421 $clean); 1455 $result = buildChromiumVisualStudioProject("WebKit/chromium/WebKit.sln", $clean); 1422 1456 } elsif (isLinux()) { 1423 # Linux build 1424 # FIXME support linux. 1425 print STDERR "Linux build is not supported. Yet."; 1457 # Linux build - build using make. 1458 $ result = buildChromiumMakefile("WebKit/chromium/", "WebKit", $clean); 1426 1459 } else { 1427 print STDERR "This platform is not supported by chromium. ";1460 print STDERR "This platform is not supported by chromium.\n"; 1428 1461 } 1429 1462 return $result;
Note: See TracChangeset
for help on using the changeset viewer.