[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
sfalken at apple.com
sfalken at apple.com
Thu Feb 4 21:37:24 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 3e8afe8e777511ca97adbb272d25ca83b832550b
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 3 00:25:32 2010 +0000
2010-02-02 Steve Falkenburg <sfalken at 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
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc:
2010-02-02 Steve Falkenburg <sfalken at 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 Steve Falkenburg <sfalken at 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
* WebKit.vcproj/WebKit.rc:
2010-02-02 Steve Falkenburg <sfalken at 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
* WebCore.vcproj/QTMovieWin.rc:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54263 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 34943c0..3aecad3 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-02 Steve Falkenburg <sfalken at 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
+
+ * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc:
+
2010-02-02 Kwang Yul Seo <skyul at company100.net>
Reviewed by Eric Seidel.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc
index 861fa3a..e09e26e 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc
@@ -34,7 +34,7 @@ BEGIN
VALUE "FileVersion", __VERSION_TEXT__
VALUE "CompanyName", "Apple Inc."
VALUE "InternalName", "JavaScriptCore"
- VALUE "LegalCopyright", "Copyright Apple Inc. 2003-2010"
+ VALUE "LegalCopyright", "Copyright Apple Inc. 2003-" __COPYRIGHT_YEAR_END_TEXT__
VALUE "OriginalFilename", "JavaScriptCore.dll"
VALUE "ProductName", " JavaScriptCore"
VALUE "ProductVersion", __VERSION_TEXT__
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4be3308..67f5b56 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-02 Steve Falkenburg <sfalken at 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
+
+ * WebCore.vcproj/QTMovieWin.rc:
+
2010-02-02 Dimitri Glazkov <dglazkov at chromium.org>
No review, rolling out r54257.
diff --git a/WebCore/WebCore.vcproj/QTMovieWin.rc b/WebCore/WebCore.vcproj/QTMovieWin.rc
index 459679b..ee374e1 100644
--- a/WebCore/WebCore.vcproj/QTMovieWin.rc
+++ b/WebCore/WebCore.vcproj/QTMovieWin.rc
@@ -34,7 +34,7 @@ BEGIN
VALUE "FileVersion", __VERSION_TEXT__
VALUE "CompanyName", "Apple Inc."
VALUE "InternalName", "WebKit"
- VALUE "LegalCopyright", "Copyright Apple Inc. 2007-2010"
+ VALUE "LegalCopyright", "Copyright Apple Inc. 2007-" __COPYRIGHT_YEAR_END_TEXT__
VALUE "OriginalFilename", "QTMovieWin.dll"
VALUE "ProductName", "WebKit"
VALUE "ProductVersion", __VERSION_TEXT__
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index eab3718..ef08bf3 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-02 Steve Falkenburg <sfalken at 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
+
+ * WebKit.vcproj/WebKit.rc:
+
2010-02-02 Adam Roben <aroben at apple.com>
Stop copying WebCore's IDL files from SRCROOT to OBJROOT
diff --git a/WebKit/win/WebKit.vcproj/WebKit.rc b/WebKit/win/WebKit.vcproj/WebKit.rc
index fa57ca3..92d1e6c 100644
--- a/WebKit/win/WebKit.vcproj/WebKit.rc
+++ b/WebKit/win/WebKit.vcproj/WebKit.rc
@@ -42,7 +42,7 @@ BEGIN
VALUE "FileVersion", __VERSION_TEXT__
VALUE "CompanyName", "Apple Inc."
VALUE "InternalName", "WebKit"
- VALUE "LegalCopyright", "Copyright Apple Inc. 2003-2010"
+ VALUE "LegalCopyright", "Copyright Apple Inc. 2003-" __COPYRIGHT_YEAR_END_TEXT__
VALUE "OriginalFilename", "WebKit.dll"
VALUE "ProductName", "WebKit"
VALUE "ProductVersion", __BUILD_NUMBER_SHORT__
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 97f12b3..ac54f04 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-02 Steve Falkenburg <sfalken at 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 at webkit.org>
Unreviewed build fix.
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
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list