[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:47:09 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit bd25b3b44951cbab85ab1bda493d941179b81c04
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 30 07:56:55 2010 +0000
Windows build fix (part 2).
Define Visual Studio internal variables used in pre-build/pre-link/post-build commands in environment for separated cmd files.
* win/tools/vsprops/common.vsprops:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72894 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 6d83566..d244367 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-29 Steve Falkenburg <sfalken at apple.com>
+
+ Windows build fix (part 2).
+ Define Visual Studio internal variables used in pre-build/pre-link/post-build commands in environment for separated cmd files.
+
+ * win/tools/vsprops/common.vsprops:
+
2010-11-19 Steve Falkenburg <sfalken at apple.com>
Reviewed by Adam Roben.
diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops
index 30d5325..6997961 100644
--- a/WebKitLibraries/win/tools/vsprops/common.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/common.vsprops
@@ -40,21 +40,21 @@
HeaderFileName="$(OutDir)\$(InputName).h"
/>
<Tool
- Name="VCResourceCompilerTool"
- Culture="1033"
- AdditionalIncludeDirectories=""$(IntDir)\include""
+ Name="VCPostBuildEventTool"
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PostBuild.cmd file
if not exist "$(ProjectDir)$(ProjectName)PostBuild.cmd" exit /b

set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

"$(ProjectDir)$(ProjectName)PostBuild.cmd"
"
/>
<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""
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreBuild.cmd file.
if not exist "$(ProjectDir)$(ProjectName)PreBuild.cmd" exit /b

set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

"$(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""
+ CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreLink.cmd file.
if not exist "$(ProjectDir)$(ProjectName)PreLink.cmd" exit /b

set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

"$(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""
+ Name="VCResourceCompilerTool"
+ Culture="1033"
+ AdditionalIncludeDirectories=""$(IntDir)\include""
/>
<UserMacro
Name="ProductionBuild"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list