VS2010 WebCoreGenerated build scripts should use new feature-defines script.
authorroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Apr 2013 02:22:38 +0000 (02:22 +0000)
committerroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Apr 2013 02:22:38 +0000 (02:22 +0000)
Update FEATURE_DEFINES string generation for VS2010 solution.
https://bugs.webkit.org/show_bug.cgi?id=113737.

Reviewed by Timothy Horton.

* WebCore.vcxproj/build-generated-files.sh:
* win/tools/scripts/feature-defines2010.sh: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147375 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/build-generated-files.sh
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/scripts/feature-defines2010.sh [new file with mode: 0644]

index 4d071d4966f3459c3caaa60b94923b8ada40002f..06043bed401b9adc41b273ec620946729c9e95c8 100644 (file)
@@ -1,3 +1,12 @@
+2013-04-01  Roger Fong  <roger_fong@apple.com>
+
+        VS2010 WebCoreGenerated build scripts should use new feature-defines script.
+        https://bugs.webkit.org/show_bug.cgi?id=113737.
+
+        Reviewed by Timothy Horton.
+
+        * WebCore.vcxproj/build-generated-files.sh:
+
 2013-04-01  Tim Horton  <timothy_horton@apple.com>
 
         Autosize should use documentRect height instead of scrollHeight
index 675137c357560c2c1a17988b70d7bafcaea84824..ce36b89bec1d7f00ea0dd94313f281fae916ea06 100644 (file)
@@ -59,5 +59,5 @@ mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources"
 cd "${BUILT_PRODUCTS_DIR}/DerivedSources"
 
 export WebCore="${XSRCROOT}"
-export FEATURE_DEFINES=`$SDKROOT/tools/scripts/feature-defines.sh $SDKROOT $3`
+export FEATURE_DEFINES=`$SDKROOT/tools/scripts/feature-defines2010.sh $SDKROOT $3`
 make -f "$WebCore/DerivedSources.make" -j ${NUMCPUS} || exit 1
index afcbad3c2f25bd44a70ba64e3e6150e85fe289c0..07f3fc20d745a61c585b4bb405816022f40528b9 100644 (file)
@@ -1,3 +1,12 @@
+2013-04-01  Roger Fong  <roger_fong@apple.com>
+
+        Update FEATURE_DEFINES string generation for VS2010 solution.
+        https://bugs.webkit.org/show_bug.cgi?id=113737.
+
+        Reviewed by Timothy Horton.
+
+        * win/tools/scripts/feature-defines2010.sh: Added.
+
 2013-03-29  Roger Fong  <roger_fong@apple.com>
 
         Unreviewed. Rollout r146818.
diff --git a/WebKitLibraries/win/tools/scripts/feature-defines2010.sh b/WebKitLibraries/win/tools/scripts/feature-defines2010.sh
new file mode 100644 (file)
index 0000000..a6fdcaa
--- /dev/null
@@ -0,0 +1,32 @@
+#!/usr/bin/bash
+
+# Copyright (C) 2013 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+if [ "$2" = "cairo" ]; then
+    FeatureDefines=$1/tools/vsprops/FeatureDefinesCairo.props
+else
+    FeatureDefines=$1/tools/vsprops/FeatureDefines.props
+fi
+
+grep "<ENABLE_" $FeatureDefines | sed '/\/>/d' | sed 's/<\/.*>//' | sed 's/<.*>//' | tr -d '\n'
+