[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00
mrowe at apple.com
mrowe at apple.com
Wed Mar 17 18:19:20 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 9517eaea4ac5cb44681f0b903c9b78b8b186cbfb
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 5 03:42:54 2010 +0000
Find the framework relative to TARGET_BUILD_DIR as that has a more obvious value during production builds.
Rubber-stamped by Alice Liu.
* Scripts/check-for-webkit-framework-include-consistency:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55565 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c23faea..331acf6 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-04 Mark Rowe <mrowe at apple.com>
+
+ Rubber-stamped by Alice Liu.
+
+ Find the framework relative to TARGET_BUILD_DIR as that has a more obvious value during production builds.
+
+ * Scripts/check-for-webkit-framework-include-consistency:
+
2010-03-04 Kent Tamura <tkent at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebKitTools/Scripts/check-for-webkit-framework-include-consistency b/WebKitTools/Scripts/check-for-webkit-framework-include-consistency
index 3a1a438..693dd6a 100755
--- a/WebKitTools/Scripts/check-for-webkit-framework-include-consistency
+++ b/WebKitTools/Scripts/check-for-webkit-framework-include-consistency
@@ -24,10 +24,10 @@
# THE POSSIBILITY OF SUCH DAMAGE.
-base_directory = ENV['CONFIGURATION_BUILD_DIR']
+base_directory = ENV['TARGET_BUILD_DIR']
unless base_directory
- throw "Unable to find CONFIGURATION_BUILD_DIR in the environment!"
+ throw "Unable to find TARGET_BUILD_DIR in the environment!"
end
Dir.chdir base_directory
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list