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

sfalken at apple.com sfalken at apple.com
Wed Dec 22 18:27:44 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit b95c7a8a451f276279d752919b72b983dc6739a8
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 11 06:40:56 2010 +0000

    Windows production build fix.
    
    Don't stop if react-to-vsprops-changes.py exits with an error,
    since this will occur in production builds.
    
    * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73837 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index dd6fe49..6f44577 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-10  Steve Falkenburg  <sfalken at apple.com>
+
+        Windows production build fix.
+        
+        Don't stop if react-to-vsprops-changes.py exits with an error,
+        since this will occur in production builds.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
+
 2010-12-10  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
index 1a4e7b3..f05cc8e 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
@@ -1,7 +1,7 @@
 all:
     touch "$(WEBKITOUTPUTDIR)\buildfailed"
     bash build-generated-files.sh "$(WEBKITOUTPUTDIR)" "$(WEBKITLIBRARIESDIR)"
-    bash -c "python react-to-vsprops-changes.py"
+    -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"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list