Title: [118624] trunk/Source/WebCore
- Revision
- 118624
- Author
- [email protected]
- Date
- 2012-05-27 04:35:40 -0700 (Sun, 27 May 2012)
Log Message
Use xcrun to find gperf path on platforms that use Xcode
<http://webkit.org/b/87587>
Reviewed by Dan Bernstein.
* WebCore.xcodeproj/project.pbxproj:
(Generate Derived Sources): Set GPERF environment variable using
xcrun.
* css/makeprop.pl: Use GPERF environment variable if set, else
"gperf".
* css/makevalues.pl: Ditto.
* make-hash-tools.pl: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (118623 => 118624)
--- trunk/Source/WebCore/ChangeLog 2012-05-27 07:40:39 UTC (rev 118623)
+++ trunk/Source/WebCore/ChangeLog 2012-05-27 11:35:40 UTC (rev 118624)
@@ -1,3 +1,18 @@
+2012-05-27 David Kilzer <[email protected]>
+
+ Use xcrun to find gperf path on platforms that use Xcode
+ <http://webkit.org/b/87587>
+
+ Reviewed by Dan Bernstein.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ (Generate Derived Sources): Set GPERF environment variable using
+ xcrun.
+ * css/makeprop.pl: Use GPERF environment variable if set, else
+ "gperf".
+ * css/makevalues.pl: Ditto.
+ * make-hash-tools.pl: Ditto.
+
2012-05-27 Li Yin <[email protected]>
[FileAPI] FileReader should fire progress event when blob has been completely read into memory
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (118623 => 118624)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-05-27 07:40:39 UTC (rev 118623)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-05-27 11:35:40 UTC (rev 118624)
@@ -25286,7 +25286,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\n\nif [ ! $CC ]; then\n case $TARGET_GCC_VERSION in\n (GCC_42)\n export CC=\"`xcrun -find gcc-4.2`\";;\n (LLVM_GCC_42)\n export CC=\"`xcrun -find llvm-gcc-4.2`\";;\n (LLVM_COMPILER)\n export CC=\"`xcrun -find clang`\";;\n esac\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make --no-builtin-rules -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\n\nif [ ! $CC ]; then\n case $TARGET_GCC_VERSION in\n (GCC_42)\n export CC=\"`xcrun -find gcc-4.2`\";;\n (LLVM_GCC_42)\n export CC=\"`xcrun -find llvm-gcc-4.2`\";;\n (LLVM_COMPILER)\n export CC=\"`xcrun -find clang`\";;\n esac\nfi\n\nif [ ! $GPERF ]; then\n export GPERF=\"`xcrun -find gperf`\"\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make --no-builtin-rules -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: trunk/Source/WebCore/css/makeprop.pl (118623 => 118624)
--- trunk/Source/WebCore/css/makeprop.pl 2012-05-27 07:40:39 UTC (rev 118623)
+++ trunk/Source/WebCore/css/makeprop.pl 2012-05-27 11:35:40 UTC (rev 118624)
@@ -3,7 +3,7 @@
# This file is part of the WebKit project
#
# Copyright (C) 1999 Waldo Bastian ([email protected])
-# Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+# Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
# Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
# Copyright (C) 2010 Andras Becsi ([email protected]), University of Szeged
#
@@ -222,4 +222,5 @@
close HEADER;
-system("gperf --key-positions=\"*\" -D -n -s 2 CSSPropertyNames.gperf --output-file=CSSPropertyNames.cpp") == 0 || die "calling gperf failed: $?";
+my $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
+system("\"$gperf\" --key-positions=\"*\" -D -n -s 2 CSSPropertyNames.gperf --output-file=CSSPropertyNames.cpp") == 0 || die "calling gperf failed: $?";
Modified: trunk/Source/WebCore/css/makevalues.pl (118623 => 118624)
--- trunk/Source/WebCore/css/makevalues.pl 2012-05-27 07:40:39 UTC (rev 118623)
+++ trunk/Source/WebCore/css/makevalues.pl 2012-05-27 11:35:40 UTC (rev 118624)
@@ -3,7 +3,7 @@
# This file is part of the WebKit project
#
# Copyright (C) 1999 Waldo Bastian ([email protected])
-# Copyright (C) 2007 Apple Inc. All rights reserved.
+# Copyright (C) 2007, 2012 Apple Inc. All rights reserved.
# Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
# Copyright (C) 2010 Andras Becsi ([email protected]), University of Szeged
#
@@ -160,4 +160,5 @@
EOF
close HEADER;
-system("gperf --key-positions=\"*\" -D -n -s 2 CSSValueKeywords.gperf --output-file=CSSValueKeywords.cpp") == 0 || die "calling gperf failed: $?";
+my $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
+system("\"$gperf\" --key-positions=\"*\" -D -n -s 2 CSSValueKeywords.gperf --output-file=CSSValueKeywords.cpp") == 0 || die "calling gperf failed: $?";
Modified: trunk/Source/WebCore/make-hash-tools.pl (118623 => 118624)
--- trunk/Source/WebCore/make-hash-tools.pl 2012-05-27 07:40:39 UTC (rev 118623)
+++ trunk/Source/WebCore/make-hash-tools.pl 2012-05-27 11:35:40 UTC (rev 118624)
@@ -3,6 +3,7 @@
# This file is part of the WebKit project
#
# Copyright (C) 2010 Andras Becsi ([email protected]), University of Szeged
+# Copyright (C) 2012 Apple Inc. All rights reserved.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
@@ -26,14 +27,13 @@
shift;
my $option = basename($ARGV[0],".gperf");
-
if ($option eq "ColorData") {
-
my $colorDataGenerated = "$outdir/ColorData.cpp";
my $colorDataGperf = $ARGV[0];
shift;
- system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf --output-file=$colorDataGenerated") == 0 || die "calling gperf failed: $?";
+ my $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
+ system("\"$gperf\" --key-positions=\"*\" -D -s 2 $colorDataGperf --output-file=$colorDataGenerated") == 0 || die "calling gperf failed: $?";
} else {
die "Unknown option.";
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
