Changeset 81717 in webkit


Ignore:
Timestamp:
Mar 22, 2011 4:23:15 PM (13 years ago)
Author:
eric@webkit.org
Message:

2011-03-22 Eric Seidel <eric@webkit.org>

Reviewed by Adam Barth.

Add support to build-webkit for building with gyp-generated project files
https://bugs.webkit.org/show_bug.cgi?id=56877

Found a couple missing Private headers while trying to make WebCore build.

2011-03-22 Eric Seidel <eric@webkit.org>

Reviewed by Adam Barth.

Add support to build-webkit for building with gyp-generated project files
https://bugs.webkit.org/show_bug.cgi?id=56877

build-webkit is a cesspool. This change just hacks in --gyp support for Mac.
Eventually we'll want to support gyp-generated projects in a more general manner.

  • Scripts/build-webkit:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r81708 r81717  
     12011-03-22  Eric Seidel  <eric@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Add support to build-webkit for building with gyp-generated project files
     6        https://bugs.webkit.org/show_bug.cgi?id=56877
     7
     8        Found a couple missing Private headers while trying to make WebCore build.
     9
     10        * JavaScriptCore.gypi:
     11
    1122011-03-22  Eric Seidel  <eric@webkit.org>
    213
  • trunk/Source/JavaScriptCore/JavaScriptCore.gypi

    r81694 r81717  
    6969            'runtime/FunctionConstructor.h',
    7070            'runtime/FunctionPrototype.h',
     71            'runtime/GCActivityCallback.h',
    7172            'runtime/Heap.h',
    7273            'runtime/Identifier.h',
     
    110111            'runtime/PutPropertySlot.h',
    111112            'runtime/RegExp.h',
     113            'runtime/RegExpKey.h',
    112114            'runtime/RegExpCache.h',
     115            'runtime/RegExpObject.h',
    113116            'runtime/RopeImpl.h',
    114117            'runtime/ScopeChain.h',
     
    476479            'runtime/FunctionPrototype.cpp',
    477480            'runtime/GCActivityCallback.cpp',
    478             'runtime/GCActivityCallback.h',
    479481            'runtime/GCActivityCallbackCF.cpp',
    480482            'runtime/GetterSetter.cpp',
     
    546548            'runtime/RegExpConstructor.cpp',
    547549            'runtime/RegExpConstructor.h',
    548             'runtime/RegExpKey.h',
    549550            'runtime/RegExpMatchesArray.h',
    550551            'runtime/RegExpObject.cpp',
    551             'runtime/RegExpObject.h',
    552552            'runtime/RegExpPrototype.cpp',
    553553            'runtime/RegExpPrototype.h',
  • trunk/Tools/ChangeLog

    r81690 r81717  
     12011-03-22  Eric Seidel  <eric@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Add support to build-webkit for building with gyp-generated project files
     6        https://bugs.webkit.org/show_bug.cgi?id=56877
     7
     8        build-webkit is a cesspool.  This change just hacks in --gyp support for Mac.
     9        Eventually we'll want to support gyp-generated projects in a more general manner.
     10
     11        * Scripts/build-webkit:
     12
    1132011-03-22  David Kilzer  <ddkilzer@apple.com>
    214
  • trunk/Tools/Scripts/build-webkit

    r81690 r81717  
    5353my $showHelp = 0;
    5454my $clean = 0;
     55my $useGYP = 0;
    5556my $minimal = 0;
    5657my $v8 = 0;
     
    339340  --clean                           Cleanup the build directory
    340341  --debug                           Compile in debug mode
     342  --gyp                             Use GYP-generated project files
    341343  --dsym                            Change debugging format to dwarf-with-dsym (Mac only)
    342344
     
    365367    'help' => \$showHelp,
    366368    'clean' => \$clean,
     369    'gyp' => \$useGYP,
    367370    'install-headers=s' => \$installHeaders,
    368371    'install-libs=s' => \$installLibs,
     
    417420        die "Error: No $dir directory found. Please do a fresh checkout.\n";
    418421    }
     422}
     423
     424# Generate the generate project files from .gyp files
     425if ($useGYP) {
     426    system("python", "Source/gyp/configure") == 0 or die "Failed to run Source/gyp/configure";
    419427}
    420428
     
    565573        my @local_options = @options;
    566574        push @local_options, XcodeCoverageSupportOptions() if $coverageSupport && $project ne "ANGLE";
    567         $result = buildXCodeProject($project, $clean, @local_options, @ARGV);
     575        my $useGYPProject = $useGYP && ($project =~ "WebCore|JavaScriptCore|JavaScriptGlue");
     576        my $projectPath = $useGYPProject ? "gyp/$project" : $project;
     577        $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
    568578    } elsif (isAppleWinWebKit()) {
    569579        if ($project eq "WebKit") {
Note: See TracChangeset for help on using the changeset viewer.