diff options
| author | Steve Block <steveblock@google.com> | 2010-02-05 14:27:46 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-15 10:49:50 +0000 |
| commit | 5e2bc6953fe6923165b8a5d7679939693a1d58d6 (patch) | |
| tree | 6ccb8c24bc2bf5e8f413e6cfae250b729b426631 /WebKitLibraries | |
| parent | 4a00f4fccc3cb7e9996749a05631f5d7b9de756e (diff) | |
| download | external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.zip external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.gz external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.bz2 | |
Merge webkit.org at r54340 : Initial merge by git
Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
Diffstat (limited to 'WebKitLibraries')
| -rw-r--r-- | WebKitLibraries/ChangeLog | 25 | ||||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceLeopard.a | bin | 2524760 -> 2523720 bytes | |||
| -rw-r--r-- | WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR | 1 | ||||
| -rwxr-xr-x | WebKitLibraries/win/tools/scripts/auto-version.sh | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | WebKitLibraries/win/tools/scripts/feature-defines.sh | 0 |
5 files changed, 31 insertions, 0 deletions
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index b4d72ac..4f8f848 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,28 @@ +2010-02-03 Dan Bernstein <mitz@apple.com> + + Reviewed by Anders Carlsson. + + Fixed a bug where WKSetNSURLConnectionDefersCallbacks(true) did not defer callbacks during modal dialogs. + + * libWebKitSystemInterfaceLeopard.a: + +2010-02-02 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Darin Adler. + + Copyright year updating for Windows version resources should be automatic + https://bugs.webkit.org/show_bug.cgi?id=34503 + + * win/tools/scripts/auto-version.sh: + +2010-02-02 Martin Robinson <mrobinson@webkit.org> + + Unreviewed build fix. + + The WinCairo build requires this script to be executable. + + * win/tools/scripts/feature-defines.sh: Added property svn:executable. + 2010-01-29 Mark Rowe <mrowe@apple.com> Keep the Windows feature defines in sync with FeatureDefines.xcconfig. diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a Binary files differindex a9d0480..722044f 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a +++ b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a diff --git a/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR b/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR new file mode 100644 index 0000000..48ad625 --- /dev/null +++ b/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR @@ -0,0 +1 @@ +2010 diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh index c448db7..cbdc1af 100755 --- a/WebKitLibraries/win/tools/scripts/auto-version.sh +++ b/WebKitLibraries/win/tools/scripts/auto-version.sh @@ -87,6 +87,10 @@ 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}" @@ -99,4 +103,5 @@ cat > "$OUTPUT_FILE" <<EOF #define __BUILD_NUMBER_MINOR__ ${BUILD_MINOR_VERSION} #define __BUILD_NUMBER_VARIANT__ ${BUILD_TINY_VERSION} #define __SVN_REVISION__ ${SVN_REVISION} +#define __COPYRIGHT_YEAR_END_TEXT__ "${COPYRIGHT_END_YEAR}" EOF diff --git a/WebKitLibraries/win/tools/scripts/feature-defines.sh b/WebKitLibraries/win/tools/scripts/feature-defines.sh index 71c3a9b..71c3a9b 100644..100755 --- a/WebKitLibraries/win/tools/scripts/feature-defines.sh +++ b/WebKitLibraries/win/tools/scripts/feature-defines.sh |