diff options
Diffstat (limited to 'WebKitLibraries')
| -rw-r--r-- | WebKitLibraries/ChangeLog | 33 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/scripts/VERSION | 2 | ||||
| -rwxr-xr-x | WebKitLibraries/win/tools/scripts/auto-version.sh | 22 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops | 7 |
4 files changed, 55 insertions, 9 deletions
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 4f8f848..8eccc7d 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,36 @@ +2010-02-11 Brian Weinstein <bweinstein@apple.com> + + Rubber-stamped by Eric Seidel. + + Turn back on SVG Filters on Windows, as they were accidentally disabled and cause + test breakage. + + * win/tools/vsprops/FeatureDefines.vsprops: + +2010-02-08 Maciej Stachowiak <mjs@apple.com> + + Reviewed by Cameron Zwarich. + + Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose. + https://bugs.webkit.org/show_bug.cgi?id=34698 + + * win/tools/vsprops/FeatureDefines.vsprops: + +2010-02-04 Mark Rowe <mrowe@apple.com> + + Reviewed by Steve Falkenburg. + + Update auto-version.sh to better handle major version numbers with fewer than three digits, + and the case when WEBKITLIBRARIESDIR is not set. + + * win/tools/scripts/auto-version.sh: + +2010-02-04 Steve Falkenburg <sfalken@apple.com> + + Windows build fix for projects not defining WebKitLibrariesDir. + + * win/tools/scripts/auto-version.sh: + 2010-02-03 Dan Bernstein <mitz@apple.com> Reviewed by Anders Carlsson. diff --git a/WebKitLibraries/win/tools/scripts/VERSION b/WebKitLibraries/win/tools/scripts/VERSION index 625c09b..910fbe3 100644 --- a/WebKitLibraries/win/tools/scripts/VERSION +++ b/WebKitLibraries/win/tools/scripts/VERSION @@ -1 +1 @@ -532 +533 diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh index cbdc1af..acb1c61 100755 --- a/WebKitLibraries/win/tools/scripts/auto-version.sh +++ b/WebKitLibraries/win/tools/scripts/auto-version.sh @@ -32,14 +32,21 @@ chomp() eval $1=\$value; } -FALLBACK_VERSION_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\VERSION"` +if [[ -n "$WEBKITLIBRARIESDIR" ]]; then + FALLBACK_VERSION_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\VERSION"` + FALLBACK_VERSION=$(cat "$FALLBACK_VERSION_PATH"); + + COPYRIGHT_END_YEAR_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\COPYRIGHT-END-YEAR"` + COPYRIGHT_END_YEAR=$(cat "$COPYRIGHT_END_YEAR_PATH"); + chomp COPYRIGHT_END_YEAR +fi + OUTPUT_FILE=$(cygpath -u "$1")/include/autoversion.h mkdir -p "$(dirname "$OUTPUT_FILE")" # Take the initial version number from RC_PROJECTSOURCEVERSION if it # exists, otherwise fall back to the version number stored in the source. ENVIRONMENT_VERSION="$RC_PROJECTSOURCEVERSION"; -FALLBACK_VERSION=$(cat "$FALLBACK_VERSION_PATH"); PROPOSED_VERSION=${ENVIRONMENT_VERSION:-$FALLBACK_VERSION} chomp PROPOSED_VERSION @@ -53,7 +60,7 @@ BUILD_TINY_VERSION=$(echo "$PROPOSED_VERSION.." | cut -d '.' -f 3) # Cut the major component down to three characters by dropping any # extra leading digits, then adjust the major version portion of the # version string to match. -CHARACTERS_TO_DROP=$(( ${#BUILD_MAJOR_VERSION} - 3 )) +CHARACTERS_TO_DROP=$(( ${#BUILD_MAJOR_VERSION} > 3 ? ${#BUILD_MAJOR_VERSION} - 3 : 0 )) BUILD_MAJOR_VERSION=${BUILD_MAJOR_VERSION:$CHARACTERS_TO_DROP} PROPOSED_VERSION=${PROPOSED_VERSION:$CHARACTERS_TO_DROP} @@ -87,10 +94,6 @@ if [ -z ${ENVIRONMENT_VERSION} ]; then VERSION_TEXT="${VERSION_TEXT_SHORT} ${USER} - ${BUILD_DATE} - r${SVN_REVISION}" fi -COPYRIGHT_END_YEAR_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\COPYRIGHT-END-YEAR"` -COPYRIGHT_END_YEAR=$(cat "$COPYRIGHT_END_YEAR_PATH"); -chomp COPYRIGHT_END_YEAR - cat > "$OUTPUT_FILE" <<EOF #define __VERSION_TEXT__ "${VERSION_TEXT}" #define __BUILD_NUMBER__ "${VERSION_TEXT}" @@ -103,5 +106,10 @@ cat > "$OUTPUT_FILE" <<EOF #define __BUILD_NUMBER_MINOR__ ${BUILD_MINOR_VERSION} #define __BUILD_NUMBER_VARIANT__ ${BUILD_TINY_VERSION} #define __SVN_REVISION__ ${SVN_REVISION} +EOF + +if [[ -n "${COPYRIGHT_END_YEAR}" ]]; then +cat >> "$OUTPUT_FILE" <<EOF #define __COPYRIGHT_YEAR_END_TEXT__ "${COPYRIGHT_END_YEAR}" EOF +fi diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops index 45495a3..e3893f2 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -9,7 +9,7 @@ > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)" + PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_RUBY);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)" /> <UserMacro Name="ENABLE_3D_CANVAS" @@ -97,6 +97,11 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_RUBY" + Value="ENABLE_RUBY" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_SHARED_WORKERS" Value="ENABLE_SHARED_WORKERS" PerformEnvironmentSet="true" |