[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit d831c441abb107f441e060f8c595ae909e3f128c
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 29 21:09:00 2010 +0000

    Robustify react-to-vsprops-changes.py against changes to its location or the location of the .vsprops files
    
    Suggested by John Sullivan.
    
    * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:
    Removed file_modification_times.
    (main): Use glob.glob to find the .vsprops files and assert that we found some.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72823 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7e53c3a..87f8368 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,16 @@
 2010-11-29  Adam Roben  <aroben at apple.com>
 
+        Robustify react-to-vsprops-changes.py against changes to its location
+        or the location of the .vsprops files
+
+        Suggested by John Sullivan.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:
+        Removed file_modification_times.
+        (main): Use glob.glob to find the .vsprops files and assert that we found some.
+
+2010-11-29  Adam Roben  <aroben at apple.com>
+
         Touch wtf/Platform.h whenever any .vsprops file changes
 
         This will cause all files to be recompiled, which will make changes to
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
index 84e98c3..0d5d6fb 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
@@ -6,19 +6,15 @@ import re
 import sys
 
 
-def file_modification_times(directory):
-    for dirpath, dirnames, filenames in os.walk(directory):
-        for filename in filenames:
-            yield os.path.getmtime(os.path.join(dirpath, filename))
-
-
 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__)))))
 
     vsprops_directory = os.path.join(top_level_directory, 'WebKitLibraries', 'win', 'tools', 'vsprops')
-    newest_vsprops_time = max(file_modification_times(vsprops_directory))
+    vsprops_files = glob.glob(os.path.join(vsprops_directory, '*.vsprops'))
+    assert len(vsprops_files), "Couldn't find any .vsprops files in %s" % vsprops_directory
+    newest_vsprops_time = max(map(os.path.getmtime, vsprops_files))
 
     # Delete any manifest-related files because Visual Studio isn't smart
     # enough to figure out that it might need to rebuild them.

-- 
WebKit Debian packaging