[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
sfalken at apple.com
sfalken at apple.com
Wed Dec 22 11:55:09 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit fe1a7b817852901a8e3be0fde71499a49b615602
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 11 09:41:24 2010 +0000
2010-08-11 Steve Falkenburg <sfalken at apple.com>
Reviewed by Adam Roben.
Improve vsprops copying for Windows build
https://bugs.webkit.org/show_bug.cgi?id=41982
When we detect a new SDK, always copy a new set of vsprops files.
Previously, if someone updated their SDK after updating their sources,
they could end up with out-of-date vsprops files.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65143 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e788546..fccb23b 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-11 Steve Falkenburg <sfalken at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Improve vsprops copying for Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=41982
+
+ When we detect a new SDK, always copy a new set of vsprops files.
+ Previously, if someone updated their SDK after updating their sources,
+ they could end up with out-of-date vsprops files.
+
+ * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
+
2010-08-10 Darin Adler <darin at apple.com>
Reviewed by Sam Weinig.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
index 098ff08..a9493a3 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
@@ -1,4 +1,5 @@
all:
+ -if not exist "$(WEBKITLIBRARIESDIR)\tools\vsprops\.svn" del /s/q "$(WEBKITLIBRARIESDIR)\tools\vsprops\"
-xcopy /y/d/e/i "..\..\..\WebKitLibraries\win\tools" "$(WEBKITLIBRARIESDIR)\tools"
touch "$(WEBKITOUTPUTDIR)\buildfailed"
bash build-generated-files.sh "$(WEBKITOUTPUTDIR)" "$(WEBKITLIBRARIESDIR)"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list