[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 17:45:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 77b9b38d496fe4a5151fda5a3b033674e5b12cb0
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 30 00:09:52 2010 +0000
2010-11-29 Steve Falkenburg <sfalken at apple.com>
Reviewed by Adam Roben.
Add a mechanism for Windows pre-build/pre-link/post-build events to be separated into individual cmd files
https://bugs.webkit.org/show_bug.cgi?id=49858
We're migrating our prebuild/prelink/postbuild steps out of vcproj and vsprops files:
- To simplify editing (editing vsprops build steps is confusing).
- For more readable diffs.
* JavaScriptCore.vcproj/WTF/WTFCommon.vsprops:
* JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd: Added.
* JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd: Added.
2010-11-19 Steve Falkenburg <sfalken at apple.com>
Reviewed by Adam Roben.
Add a mechanism for Windows pre-build/pre-link/post-build events to be separated into individual cmd files
https://bugs.webkit.org/show_bug.cgi?id=49858
We're migrating our prebuild/prelink/postbuild steps out of vcproj and vsprops files:
- To simplify editing (editing vsprops build steps is confusing).
- For more readable diffs.
To add a prebuild/prelink/postbuild step for a vcproj,
Add a new file named {ProjectName}PreBuild|PreLink|PostBuild.cmd to the project directory.
For example, a WTF prebuild script would be named WTFPreBuild.cmd and would be located
in the directory JavaScriptCore/JavaScriptCore.vcproj/WTF (alongside WTF.vcproj).
* win/tools/vsprops/common.vsprops:
* win/tools/vsprops/release.vsprops:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72846 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index a24f051..7228087 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-29 Steve Falkenburg <sfalken at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Add a mechanism for Windows pre-build/pre-link/post-build events to be separated into individual cmd files
+ https://bugs.webkit.org/show_bug.cgi?id=49858
+
+ We're migrating our prebuild/prelink/postbuild steps out of vcproj and vsprops files:
+ - To simplify editing (editing vsprops build steps is confusing).
+ - For more readable diffs.
+
+ * JavaScriptCore.vcproj/WTF/WTFCommon.vsprops:
+ * JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd: Added.
+ * JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd: Added.
+
2010-11-29 Geoffrey Garen <ggaren at apple.com>
Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops
index d81a604..faafaf7 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops
+++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops
@@ -17,12 +17,4 @@
AdditionalDependencies="user32.lib"
OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"
/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed""
- />
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
"
- />
</VisualStudioPropertySheet>
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd
new file mode 100644
index 0000000..d4a0356
--- /dev/null
+++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd
@@ -0,0 +1 @@
+if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd
new file mode 100644
index 0000000..11b2e3d
--- /dev/null
+++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd
@@ -0,0 +1,3 @@
+%SystemDrive%\cygwin\bin\which.exe bash
+if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+cmd /c
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index b546c9f..6d83566 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-19 Steve Falkenburg <sfalken at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Add a mechanism for Windows pre-build/pre-link/post-build events to be separated into individual cmd files
+ https://bugs.webkit.org/show_bug.cgi?id=49858
+
+ We're migrating our prebuild/prelink/postbuild steps out of vcproj and vsprops files:
+ - To simplify editing (editing vsprops build steps is confusing).
+ - For more readable diffs.
+
+ To add a prebuild/prelink/postbuild step for a vcproj,
+ Add a new file named {ProjectName}PreBuild|PreLink|PostBuild.cmd to the project directory.
+ For example, a WTF prebuild script would be named WTFPreBuild.cmd and would be located
+ in the directory JavaScriptCore/JavaScriptCore.vcproj/WTF (alongside WTF.vcproj).
+
+ * win/tools/vsprops/common.vsprops:
+ * win/tools/vsprops/release.vsprops:
+
2010-11-29 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig and Simon Fraser.
diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops
index b9c710c..30d5325 100644
--- a/WebKitLibraries/win/tools/vsprops/common.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/common.vsprops
@@ -25,7 +25,7 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
- AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221"
+ AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221"
OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib""
GenerateDebugInformation="true"
@@ -44,6 +44,18 @@
Culture="1033"
AdditionalIncludeDirectories=""$(IntDir)\include""
/>
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreBuild.cmd file.
if exist "$(ProjectDir)$(ProjectName)PreBuild.cmd" "$(ProjectDir)$(ProjectName)PreBuild.cmd""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreLink.cmd file.
if exist "$(ProjectDir)$(ProjectName)PreLink.cmd" "$(ProjectDir)$(ProjectName)PreLink.cmd""
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PostBuild.cmd file.
if exist "$(ProjectDir)$(ProjectName)PostBuild.cmd" "$(ProjectDir)$(ProjectName)PostBuild.cmd""
+ />
<UserMacro
Name="ProductionBuild"
Value="$(PRODUCTION)"
diff --git a/WebKitLibraries/win/tools/vsprops/release.vsprops b/WebKitLibraries/win/tools/vsprops/release.vsprops
index 8b38b73..6416e3f 100644
--- a/WebKitLibraries/win/tools/vsprops/release.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/release.vsprops
@@ -18,10 +18,6 @@
OptimizeForWindows98="1"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="if not exist "$(WebKitOutputDir)\public\sym" mkdir "$(WebKitOutputDir)\public\sym""
- />
- <Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
/>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list