summaryrefslogtreecommitdiff
path: root/WebKitLibraries/win/tools/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'WebKitLibraries/win/tools/scripts')
-rw-r--r--WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR2
-rwxr-xr-xWebKitLibraries/win/tools/scripts/auto-version.sh6
-rwxr-xr-xWebKitLibraries/win/tools/scripts/feature-defines.sh9
3 files changed, 9 insertions, 8 deletions
diff --git a/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR b/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR
index a43b7bf66..e355f6dc2 100644
--- a/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR
+++ b/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR
@@ -1 +1 @@
-2012
+2013
diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh
index acb1c6125..b5c25f353 100755
--- a/WebKitLibraries/win/tools/scripts/auto-version.sh
+++ b/WebKitLibraries/win/tools/scripts/auto-version.sh
@@ -32,11 +32,11 @@ chomp()
eval $1=\$value;
}
-if [[ -n "$WEBKITLIBRARIESDIR" ]]; then
- FALLBACK_VERSION_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\VERSION"`
+if [[ -n "$WEBKIT_LIBRARIES" ]]; then
+ FALLBACK_VERSION_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools\\scripts\\VERSION"`
FALLBACK_VERSION=$(cat "$FALLBACK_VERSION_PATH");
- COPYRIGHT_END_YEAR_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\COPYRIGHT-END-YEAR"`
+ COPYRIGHT_END_YEAR_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools\\scripts\\COPYRIGHT-END-YEAR"`
COPYRIGHT_END_YEAR=$(cat "$COPYRIGHT_END_YEAR_PATH");
chomp COPYRIGHT_END_YEAR
fi
diff --git a/WebKitLibraries/win/tools/scripts/feature-defines.sh b/WebKitLibraries/win/tools/scripts/feature-defines.sh
index 71c3a9b22..a6fdcaa36 100755
--- a/WebKitLibraries/win/tools/scripts/feature-defines.sh
+++ b/WebKitLibraries/win/tools/scripts/feature-defines.sh
@@ -1,6 +1,6 @@
#!/usr/bin/bash
-# Copyright (C) 2010 Apple Inc. All rights reserved.
+# 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
@@ -23,9 +23,10 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
if [ "$2" = "cairo" ]; then
- FeatureDefines=$1/tools/vsprops/FeatureDefinesCairo.vsprops
+ FeatureDefines=$1/tools/vsprops/FeatureDefinesCairo.props
else
- FeatureDefines=$1/tools/vsprops/FeatureDefines.vsprops
+ FeatureDefines=$1/tools/vsprops/FeatureDefines.props
fi
-grep Value=\"ENABLE_ $FeatureDefines | sed 's/^.*Value\=\"/ /' | sed 's/\"//' | tr -d '\n'
+grep "<ENABLE_" $FeatureDefines | sed '/\/>/d' | sed 's/<\/.*>//' | sed 's/<.*>//' | tr -d '\n'
+