[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 01980dd46507ee906558cad968844312531f427a
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 02:19:32 2010 +0000

    Add a script to delete manifest-related files when they are older than any .vsprops file
    
    Changes to .vsprops files can cause the manifest files to become
    invalid, and Visual Studio doesn't always figure out that it needs to
    rebuild them.
    
    Reviewed by Sam Weinig.
    
    * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
    Call the new script.
    
    * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj:
    Added the new script.
    
    * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py: Added.
    (file_modification_times): Generator to return the modification time of
    each file in a directory hierarchy.
    (main): Get the modification time of the newest vsprops file, then find
    all manifest-related files in the obj directory. Delete all
    manifest-related files that are older than the newest vsprops file.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72359 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 911be1f..b752aca 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,27 @@
+2010-11-18  Adam Roben  <aroben at apple.com>
+
+        Add a script to delete manifest-related files when they are older than
+        any .vsprops file
+
+        Changes to .vsprops files can cause the manifest files to become
+        invalid, and Visual Studio doesn't always figure out that it needs to
+        rebuild them.
+
+        Reviewed by Sam Weinig.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
+        Call the new script.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj:
+        Added the new script.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py: Added.
+        (file_modification_times): Generator to return the modification time of
+        each file in a directory hierarchy.
+        (main): Get the modification time of the newest vsprops file, then find
+        all manifest-related files in the obj directory. Delete all
+        manifest-related files that are older than the newest vsprops file.
+
 2010-11-18  Mark Rowe  <mrowe at apple.com>
 
         Rubber-stamped by Adam Roben.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
index d1e5d46..64202d1 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
@@ -2,6 +2,7 @@ all:
     -xcopy /y/d/e/i "..\..\..\WebKitLibraries\win\tools" "$(WEBKITLIBRARIESDIR)\tools"
     touch "$(WEBKITOUTPUTDIR)\buildfailed"
     bash build-generated-files.sh "$(WEBKITOUTPUTDIR)" "$(WEBKITLIBRARIESDIR)"
+    bash -c "python react-to-vsprops-changes.py"
     -mkdir 2>NUL "$(WEBKITOUTPUTDIR)\include\JavaScriptCore"
     xcopy /y /d "..\..\API\APICast.h" "$(WEBKITOUTPUTDIR)\include\JavaScriptCore"
     xcopy /y /d "..\..\API\JavaScript.h" "$(WEBKITOUTPUTDIR)\include\JavaScriptCore"
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj
index 7d5ca69..8ab47da 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj
@@ -47,6 +47,10 @@
 			RelativePath=".\JavaScriptCoreGenerated.make"
 			>
 		</File>
+		<File
+			RelativePath=".\react-to-vsprops-changes.py"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
new file mode 100644
index 0000000..a2a0543
--- /dev/null
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+
+import glob
+import os
+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():
+    vsprops_directory = os.path.join(os.environ['WEBKITLIBRARIESDIR'], 'tools', 'vsprops')
+    newest_vsprops_time = max(file_modification_times(vsprops_directory))
+
+    obj_directory = os.path.join(os.environ['WEBKITOUTPUTDIR'], 'obj')
+    for manifest_file in glob.iglob(os.path.join(obj_directory, '*', '*', '*.manifest*')):
+        manifest_time = os.path.getmtime(manifest_file)
+        if manifest_time < newest_vsprops_time:
+            os.remove(manifest_file)
+
+
+if __name__ == '__main__':
+    sys.exit(main())

-- 
WebKit Debian packaging