Changeset 118624 in webkit

Timestamp:

May 27, 2012, 4:35:40 AM (14 years ago)

Author:

ddkilzer@apple.com

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• css/makeprop.pl (modified) (2 diffs)
• css/makevalues.pl (modified) (2 diffs)
• make-hash-tools.pl (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-27  David Kilzer  <ddkilzer@apple.com>
+
+        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  <li.yin@intel.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -25287 +25287 @@
                         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 */

trunk/Source/WebCore/css/makeprop.pl

@@ -4 +4 @@
 #
 #   Copyright (C) 1999 Waldo Bastian (bastian@kde.org)
-#   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 (abecsi@inf.u-szeged.hu), University of Szeged
@@ -223 +223 @@
 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: $?";

trunk/Source/WebCore/css/makevalues.pl

@@ -4 +4 @@
 #
 #   Copyright (C) 1999 Waldo Bastian (bastian@kde.org)
-#   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 (abecsi@inf.u-szeged.hu), University of Szeged
@@ -161 +161 @@
 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: $?";

trunk/Source/WebCore/make-hash-tools.pl

@@ -4 +4 @@
 #
 #   Copyright (C) 2010 Andras Becsi (abecsi@inf.u-szeged.hu), University of Szeged
+#   Copyright (C) 2012 Apple Inc. All rights reserved.
 #
 #   This library is free software; you can redistribute it and/or
@@ -27 +28 @@
 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 {