[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
aroben at apple.com
aroben at apple.com
Fri Jan 21 15:08:34 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit e01b3a6cc285a17d844539ad1f72bb2e1f5ba064
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 7 21:21:01 2011 +0000
Update react-to-vsprops-changes.py after r74855
* JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75269 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 52dc6a9..25b0dce 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-07 Adam Roben <aroben at apple.com>
+
+ Update react-to-vsprops-changes.py after r74855
+
+ * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:
+
2011-01-07 Carlos Garcia Campos <cgarcia at igalia.com>
Reviewed by Martin Robinson.
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
index 0112c85..ab1df83 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
@@ -7,9 +7,9 @@ import sys
def main():
- # It's a little unfortunate that we're relying on the location of this
- # script to find the top-level source directory.
- top_level_directory = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+ # It's fragile to rely on the location of this script to find the top-level
+ # source directory.
+ top_level_directory = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
vsprops_directory = os.path.join(top_level_directory, 'WebKitLibraries', 'win', 'tools', 'vsprops')
vsprops_files = glob.glob(os.path.join(vsprops_directory, '*.vsprops'))
@@ -27,7 +27,7 @@ def main():
# Touch wtf/Platform.h so all files will be recompiled. This is necessary
# to pick up changes to preprocessor macros (e.g., ENABLE_*).
- wtf_platform_h = os.path.join(top_level_directory, 'JavaScriptCore', 'wtf', 'Platform.h')
+ wtf_platform_h = os.path.join(top_level_directory, 'Source', 'JavaScriptCore', 'wtf', 'Platform.h')
if os.path.getmtime(wtf_platform_h) < newest_vsprops_time:
print 'Touching wtf/Platform.h'
os.utime(wtf_platform_h, None)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list