[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 08926285397f733ee4ee9e58c6375a1c3849b0e9
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 29 21:01:14 2010 +0000

    Update react-to-vsprops-changes.py after r72555
    
    .vsprops files are no longer accessed relative to $WebKitLibrariesDir.
    
    Fixes <http://webkit.org/b/50166> REGRESSION (r72555):
    react-to-vsprops-changes.py no longer works for people with a
    non-default $WebKitLibrariesDir
    
    Reviewed by John Sullivan.
    
    * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:
    (main): Always look in WebKitLibraries/win for .vsprops files, not in
    $WebKitLibrariesDir.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72821 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 81e1ce6..0739597 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-29  Adam Roben  <aroben at apple.com>
+
+        Update react-to-vsprops-changes.py after r72555
+
+        .vsprops files are no longer accessed relative to $WebKitLibrariesDir.
+
+        Fixes <http://webkit.org/b/50166> REGRESSION (r72555):
+        react-to-vsprops-changes.py no longer works for people with a
+        non-default $WebKitLibrariesDir
+
+        Reviewed by John Sullivan.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:
+        (main): Always look in WebKitLibraries/win for .vsprops files, not in
+        $WebKitLibrariesDir.
+
 2010-11-28  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
index a2a0543..fdaf97f 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
@@ -13,7 +13,11 @@ def file_modification_times(directory):
 
 
 def main():
-    vsprops_directory = os.path.join(os.environ['WEBKITLIBRARIESDIR'], 'tools', 'vsprops')
+    # 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))
 
     obj_directory = os.path.join(os.environ['WEBKITOUTPUTDIR'], 'obj')

-- 
WebKit Debian packaging