Changeset 151523 in webkit
- Timestamp:
- Jun 12, 2013 1:46:18 PM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r151521 r151523 1 2013-06-12 Hugo Parente Lima <hugo.lima@openbossa.org> 2 3 Remove last bits of GYP from build-webkit and update-webkit scripts 4 https://bugs.webkit.org/show_bug.cgi?id=117557 5 6 Reviewed by Ryosuke Niwa. 7 8 * Scripts/build-webkit: 9 * Scripts/update-webkit: 10 1 11 2013-06-12 Hugo Parente Lima <hugo.lima@openbossa.org> 2 12 -
trunk/Tools/Scripts/build-webkit
r151465 r151523 52 52 my $showHelp = 0; 53 53 my $clean = 0; 54 my $useGYP = 0;55 54 my $minimal = 0; 56 55 my $installHeaders; … … 114 113 --device Use the current iphoneos.internal SDK (iOS only) 115 114 --simulator Use the current iphonesimulator SDK (iOS only) 116 --gyp Use GYP-generated project files117 115 --coverage Enable Code Coverage support (Mac only) 118 116 … … 145 143 'help' => \$showHelp, 146 144 'clean' => \$clean, 147 'gyp' => \$useGYP,148 145 'install-headers=s' => \$installHeaders, 149 146 'install-libs=s' => \$installLibs, … … 206 203 if (!isQt() && !-d "WebKitLibraries") { 207 204 die "Error: No WebKitLibraries directory found. Please do a fresh checkout.\n"; 208 }209 210 # Generate the generate project files from .gyp files211 if ($useGYP) {212 system("perl", "Tools/Scripts/generate-project-files") == 0 or die "Failed to run generate-project-files";213 205 } 214 206 … … 335 327 my @local_options = @options; 336 328 push @local_options, XcodeCoverageSupportOptions() if $coverageSupport && $project ne "ANGLE"; 337 my $useGYPProject = $useGYP && ($project =~ "WebCore|JavaScriptCore"); 338 my $projectPath = $useGYPProject ? "gyp/$project" : $project; 339 $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project; 329 my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project; 340 330 $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV); 341 331 } elsif (isAppleWinWebKit()) { -
trunk/Tools/Scripts/update-webkit
r149166 r151523 46 46 my $quiet = ''; 47 47 my $showHelp; 48 my $useGYP = 0;49 48 50 49 determineIsQt(); … … 56 55 'h|help' => \$showHelp, 57 56 'q|quiet' => \$quiet, 58 'gyp' => \$useGYP,59 57 ); 60 58 … … 64 62 -h|--help show the help message 65 63 -q|--quiet pass -q to svn update for quiet updates 66 --gyp generate project files from gyp after update67 64 --wincairo also update dependencies of the WinCairo port 68 65 __END__ … … 94 91 95 92 setupAppleWinEnv() if isAppleWinWebKit(); 96 97 if ($useGYP) {98 print "Generating Project Files\n";99 system("perl", "Tools/Scripts/generate-project-files") == 0 or die "Failed to run generate-project-files";100 }101 93 102 94 exit 0;
Note: See TracChangeset
for help on using the changeset viewer.