From cac0f67c402d107cdb10971b95719e2ff9c7c76b Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 5 Nov 2009 09:23:40 +0000 Subject: Merge webkit.org at r50258 : Initial merge by git. Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0 --- WebKitLibraries/ChangeLog | 48 +++++++++ WebKitLibraries/win/tools/scripts/auto-version.sh | 120 ++++++++++++--------- .../win/tools/vsprops/debug_all.vsprops | 26 +++++ .../win/tools/vsprops/debug_internal.vsprops | 9 +- .../win/tools/vsprops/debug_wincairo.vsprops | 2 + 5 files changed, 150 insertions(+), 55 deletions(-) create mode 100644 WebKitLibraries/win/tools/vsprops/debug_all.vsprops (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 6ad863d..50d4e19 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,51 @@ +2009-10-26 Mark Rowe + + Reviewed by Adam Roben. + + Clean up the regex madness in auto-version.sh to make it obvious what the script is doing. + + Also teaches auto-version.sh to handle RC_PROJECTSOURCEVERSION that has more than three digits + in the major component of the version number. + + * win/tools/scripts/auto-version.sh: + +2009-10-19 Marshall Culpepper + + Reviewed by Eric Seidel. + + added cairo include and lib directories to debug_wincairo.vsprops + https://bugs.webkit.org/show_bug.cgi?id=29831 + + * win/tools/vsprops/debug_wincairo.vsprops: + +2009-10-16 Steve Falkenburg + + Reviewed by Dan Bernstein. + + https://bugs.webkit.org/show_bug.cgi?id=30456 + Fixes for new Debug_All Windows build configuration. + + * win/tools/vsprops/debug_all.vsprops: + Define DEBUG_ALL in Debug_All configuration. + Continue to define USE_DEBUG_SAFARI_THEME for open source SafariTheme header usage. + +2009-10-16 Steve Falkenburg + + Reviewed by Adam Roben. + + Add a Debug_All configuration to build entire stack as debug. + Change Debug_Internal to: + - stop using _debug suffix for all WebKit/Safari binaries + - not use _debug as a DLL naming suffix + - use non-debug C runtime lib. + + * win/tools/vsprops/debug_all.vsprops: Added. + Use debug C runtime library in debug_all. + Specify USE_DEBUG_SAFARI_THEME to get "_debug" suffix for debug_all. + * win/tools/vsprops/debug_internal.vsprops: + Don't specify debug C runtime library in debug_internal. + Don't specify _debug suffix for standard debug_internal builds. + 2009-10-05 Pierre d'Herbemont Reviewed by Simon Fraser diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh index 2e9a9ed..a67184f 100755 --- a/WebKitLibraries/win/tools/scripts/auto-version.sh +++ b/WebKitLibraries/win/tools/scripts/auto-version.sh @@ -1,6 +1,6 @@ #!/usr/bin/bash -# Copyright (C) 2007 Apple Inc. All rights reserved. +# Copyright (C) 2007, 2009 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,60 +23,80 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -SRCPATH=`cygpath -u "$WEBKITLIBRARIESDIR\Tools\Scripts"` -VERSIONPATH=`cygpath -u "$1"` -VERSIONPATH=$VERSIONPATH/include -VERSIONFILE=$VERSIONPATH/autoversion.h -mkdir -p "$VERSIONPATH" -if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then - PROPOSEDVERSION=`cat $SRCPATH/VERSION` -else - PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION" -fi -PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.+?)[\r\n]*$/\1/'` +# Trim any trailing \r or \n from the given variable. +chomp() +{ + local old_value=$(eval echo "\$$1"); + local value=$(echo "$old_value" | sed 's/[\r\n]*$//') + eval $1=\$value; +} -BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` -BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'` -BLDVARIANTVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/'` -if [ "$BLDMINORVERSION" == "" ]; then - BLDMINORVERSION=0 -fi -if [ "$BLDVARIANTVERSION" == "" ]; then - BLDVARIANTVERSION=0 -fi -SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.+?)[\r\n]*$/\1/'` +FALLBACK_VERSION_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\VERSION"` +OUTPUT_FILE=$(cygpath -u "$1")/include/autoversion.h +mkdir -p $(dirname "$OUTPUT_FILE") -MAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\(.\)[^\.]*\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` -MINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/.\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` -TINYVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'` -if [ "$MINORVERSION" == "" ]; then - MINORVERSION=0 -fi -if [ "$TINYVERSION" == "" ]; then - TINYVERSION=0 -fi +# 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 + +# Split out the three components of the dotted version number. We pad +# the input with trailing dots to handle the case where the input version +# has fewer components than we expect. +BUILD_MAJOR_VERSION=$(echo "$PROPOSED_VERSION.." | cut -d '.' -f 1) +BUILD_MINOR_VERSION=$(echo "$PROPOSED_VERSION.." | cut -d '.' -f 2) +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 )) +BUILD_MAJOR_VERSION=${BUILD_MAJOR_VERSION:$CHARACTERS_TO_DROP} +PROPOSED_VERSION=${PROPOSED_VERSION:$CHARACTERS_TO_DROP} + +# Have the minor and tiny components default to zero if not present. +BUILD_MINOR_VERSION=${BUILD_MINOR_VERSION:-0} +BUILD_TINY_VERSION=${BUILD_TINY_VERSION:-0} + +# Split the first component further by using the first digit for the +# major version and the remaining two characters as the minor version. +# The minor version is shifted down to the tiny version, with the tiny +# version becoming the variant version. +MAJOR_VERSION=${BUILD_MAJOR_VERSION:0:1} +MINOR_VERSION=${BUILD_MAJOR_VERSION:1} +TINY_VERSION=${BUILD_MINOR_VERSION} +VARIANT_VERSION=${BUILD_TINY_VERSION} + +VERSION_TEXT=${PROPOSED_VERSION} +VERSION_TEXT_SHORT=${VERSION_TEXT} + +if [ -z ${ENVIRONMENT_VERSION} ]; then + # If we didn't pull the version number from the environment then we're doing + # an engineering build and we'll stamp the build with some more information. + + BUILD_DATE=$(date) + SVN_REVISION=$(svn info | grep '^Revision' | sed 's/^Revision: //') -BLDNMBR="$PROPOSEDVERSION" -BLDNMBRSHORT="$BLDNMBR" + chomp BUILD_DATE + chomp SVN_REVISION -if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then - BLDNMBRSHORT="$BLDNMBRSHORT+" - BLDUSERNAME=`echo "$(whoami)" | sed -r 's/(.+?)[\r\n]*$/\1/'` - BLDDATE=`echo "$(date)" | sed -r 's/(.+?)[\r\n]*$/\1/'` - BLDNMBR="$BLDNMBRSHORT $BLDUSERNAME - $BLDDATE - r$SVNOPENSOURCEREVISION" + VERSION_TEXT_SHORT="${VERSION_TEXT_SHORT}+" + VERSION_TEXT="${VERSION_TEXT_SHORT} ${USER} - ${BUILD_DATE} - r${SVN_REVISION}" fi -cat > "$VERSIONFILE" < "$OUTPUT_FILE" < + + + + + + diff --git a/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops b/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops index ef7674a..d0c61c1 100644 --- a/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops +++ b/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops @@ -6,21 +6,20 @@ > diff --git a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops index 0e7db13..7d424e6 100644 --- a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops @@ -10,10 +10,12 @@ MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo"" />