Changeset 60884 in webkit
- Timestamp:
- Jun 9, 2010 12:22:39 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/chromium/ChangeLog
r60879 r60884 1 2010-06-08 Tony Chang <tony@chromium.org> 2 3 Reviewed by David Levin. 4 5 [chromium] compile linux chromium in WebKit/out instead of WebKit/WebKit/chromium/out 6 https://bugs.webkit.org/show_bug.cgi?id=40285 7 8 Take 2 at landing this patch, this time rolling DEPS just a bit 9 further to pick up some chromium fixes. 10 11 * DEPS 12 * gyp_webkit: 13 1 14 2010-06-08 Sheriff Bot <webkit.review.bot@gmail.com> 2 15 -
trunk/WebKit/chromium/DEPS
r60879 r60884 33 33 vars = { 34 34 'chromium_svn': 'http://src.chromium.org/svn/trunk/src', 35 'chromium_rev': '49 128',35 'chromium_rev': '49224', 36 36 } 37 37 -
trunk/WebKit/chromium/gyp_webkit
r60879 r60884 79 79 # On linux, we want gyp to output a makefile (default is scons). 80 80 if sys.platform == 'linux2': 81 args.extend(['-fmake']) 81 args.extend(['-fmake', 82 '--suffix=.chromium', 83 '--toplevel-dir=../..', 84 # auto_regeneration doesn't work with toplevel-dir 85 '-Gauto_regeneration=0']) 82 86 83 87 # Other command args: … … 91 95 '--depth=./', 92 96 93 # gyp file sto execute.97 # gyp file to execute. 94 98 'WebKit.gyp']) 95 99 -
trunk/WebKitTools/ChangeLog
r60883 r60884 1 2010-06-08 Tony Chang <tony@chromium.org> 2 3 Reviewed by David Levin. 4 5 [chromium] compile linux chromium in WebKit/out instead of WebKit/WebKit/chromium/out 6 https://bugs.webkit.org/show_bug.cgi?id=40285 7 8 * Scripts/webkitdirs.pm: 9 * Scripts/webkitpy/layout_tests/port/chromium_linux.py: 10 1 11 2010-06-03 Roland Steiner <rolandsteiner@chromium.org> 2 12 -
trunk/WebKitTools/Scripts/webkitdirs.pm
r60879 r60884 1435 1435 } 1436 1436 1437 sub buildChromiumMakefile($$$) 1438 { 1439 my ($dir, $target, $clean) = @_; 1440 chdir $dir; 1437 sub buildChromiumMakefile($$) 1438 { 1439 my ($target, $clean) = @_; 1441 1440 if ($clean) { 1442 1441 return system qw(rm -rf out); … … 1444 1443 my $config = configuration(); 1445 1444 my $numCpus = (grep /processor/, `cat /proc/cpuinfo`) || 1; 1446 my @command = ("make", "- j$numCpus", "BUILDTYPE=$config", $target);1445 my @command = ("make", "-fMakefile.chromium", "-j$numCpus", "BUILDTYPE=$config", $target); 1447 1446 print join(" ", @command) . "\n"; 1448 1447 return system @command; … … 1502 1501 } elsif (isLinux()) { 1503 1502 # Linux build - build using make. 1504 $ result = buildChromiumMakefile(" WebKit/chromium/", "all", $clean);1503 $ result = buildChromiumMakefile("all", $clean); 1505 1504 } else { 1506 1505 print STDERR "This platform is not supported by chromium.\n"; -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
r60879 r60884 83 83 def _build_path(self, *comps): 84 84 if self._options.use_drt: 85 base = os.path.join(self.path_from_webkit_base(), 'WebKit', 86 'chromium') 85 base = os.path.join(self.path_from_webkit_base()) 87 86 else: 88 87 base = self.path_from_chromium_base()
Note: See TracChangeset
for help on using the changeset viewer.