Source/JavaScriptCore: [Win] Pass environment to Pre-Build, Pre-link,…

… and Post-Build Stages. https://bugs.webkit.org/show_bug.cgi?id=130023 Reviewed by Dean Jackson. * JavaScriptCore.vcxproj/JavaScriptCore.proj: Avoid trailing backslashes in path names to avoid accidental escaping of later string substitutions. Source/WebCore: [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages. https://bugs.webkit.org/show_bug.cgi?id=130023. Reviewed by Dean Jackson. * WebCore.vcxproj/WebCore.proj: Avoid trailing slashes in path values to prevent escaping during later string substitution. Source/WebKit: [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages. https://bugs.webkit.org/show_bug.cgi?id=130023 Reviewed by Dean Jackson. * WebKit.vcxproj/WebKit.make: Removed. * WebKit.vcxproj/WebKit/WebKitPostBuild.cmd: Use %PlatformArchitecture% rather than hard-coded 32-bit path. Source/WTF: [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages. https://bugs.webkit.org/show_bug.cgi?id=130023. Reviewed by Dean Jackson. * WTF.vcxproj/WTF.proj: Avoid putting trailing slashes in system paths to avoid escaping during later string substitution. * WTF.vcxproj/build-generated-files.sh: Accept environment values passed by VS. Tools: [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages. https://bugs.webkit.org/show_bug.cgi?id=130023 Reviewed by Dean Jackson. * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj: Add missing /SAFESEH flag to DLL launcher process. WebKitLibraries: [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages. https://bugs.webkit.org/show_bug.cgi?id=130023 Reviewed by Dean Jackson. * win/tools/vsprops/common.props: Pass WEBKIT_LIBRARIES value to subprocesses. * win/tools/vsprops/debugsuffix.props: Make sure OFFICIAL_BUILD is set. * win/tools/vsprops/production.props: Ditto. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@165393 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKitNix · Mar 10, 2014 · ceac3a5 · ceac3a5
1 parent 106b65b
commit ceac3a5
Show file tree

Hide file tree

Showing 16 changed files with 118 additions and 31 deletions.
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-10  Brent Fulgham  <[email protected]>
+
+        [Win] Pass environment to Pre-Build, Pre-link, and Post-Build Stages.
+        https://bugs.webkit.org/show_bug.cgi?id=130023
+
+        Reviewed by Dean Jackson.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.proj: Avoid trailing backslashes in
+        path names to avoid accidental escaping of later string substitutions.
+
 2014-03-10  Andreas Kling  <[email protected]>
 
         [X86_64] Smaller code for testb_i8r when register is accumulator.

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj
@@ -12,7 +12,7 @@
   <!-- Wrapper to build JavaScriptCore for both win32 and x64. -->
   <PropertyGroup>
     <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
-    <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>
+    <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
     <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
     <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
     <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
@@ -21,8 +21,8 @@
     <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>
     <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>
     <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>
-    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>
-    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>
+    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>
+    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
   </PropertyGroup>

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-10  Brent Fulgham  <[email protected]>
+
+        [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+        https://bugs.webkit.org/show_bug.cgi?id=130023.
+
+        Reviewed by Dean Jackson.
+
+        * WTF.vcxproj/WTF.proj: Avoid putting trailing slashes in system paths to avoid
+        escaping during later string substitution.
+        * WTF.vcxproj/build-generated-files.sh: Accept environment values passed by VS.
+
 2014-03-10  Mark Hahnenberg  <[email protected]>
 
         Turn on GenGC on other 64-bit platforms

diff --git a/Source/WTF/WTF.vcxproj/WTF.proj b/Source/WTF/WTF.vcxproj/WTF.proj
@@ -12,7 +12,7 @@
   <!-- Wrapper to build WTF for both win32 and x64. -->
   <PropertyGroup>
     <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
-    <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>
+    <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
     <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
     <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
     <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
@@ -21,8 +21,8 @@
     <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>
     <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>
     <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>
-    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>
-    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>
+    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>
+    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
   </PropertyGroup>

diff --git a/Source/WTF/WTF.vcxproj/build-generated-files.sh b/Source/WTF/WTF.vcxproj/build-generated-files.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/bash
 
 # Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4
-UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib${4}/libicuuc${3}.lib")
-ICUVERSION_H_PATH=$(cygpath -u "${CONFIGURATIONBUILDDIR}/include/private/ICUVersion.h")
+UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${2}/lib${4}/libicuuc${3}.lib")
+ICUVERSION_H_PATH=$(cygpath -u "${1}/include/private/ICUVersion.h")
 if test \( ! -f "${ICUVERSION_H_PATH}" \) -o \( -f "${UNVERSIONED_ICU_LIB_PATH}" -a \( "${UNVERSIONED_ICU_LIB_PATH}" -nt "${ICUVERSION_H_PATH}" \) \)
 then
     mkdir -p "$(dirname "${ICUVERSION_H_PATH}")"

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-10  Brent Fulgham  <[email protected]>
+
+        [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+        https://bugs.webkit.org/show_bug.cgi?id=130023.
+
+        Reviewed by Dean Jackson.
+
+        * WebCore.vcxproj/WebCore.proj: Avoid trailing slashes in path values to
+        prevent escaping during later string substitution.
+
 2014-03-10  Radu Stavila  <[email protected]>
 
         [CSS Regions] Hit-testing is not working properly inside scrollable regions
@@ -13,6 +23,7 @@
         * rendering/RenderLayer.cpp:
         (WebCore::RenderLayer::calculateClipRects):
 
+>>>>>>> .r165392
 2014-03-10  Hans Muller  <[email protected]>
 
         [CSS Shapes] SVG Image valued shape fails if root element's size is relative

diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.proj b/Source/WebCore/WebCore.vcxproj/WebCore.proj
@@ -12,7 +12,7 @@
   <!-- Wrapper to build WebCore for both win32 and x64. -->
   <PropertyGroup>
     <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
-    <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>
+    <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
     <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
     <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
     <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
@@ -21,8 +21,8 @@
     <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>
     <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>
     <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>
-    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>
-    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>
+    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>
+    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
   </PropertyGroup>

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-10  Brent Fulgham  <[email protected]>
+
+        [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+        https://bugs.webkit.org/show_bug.cgi?id=130023
+
+        Reviewed by Dean Jackson.
+
+        * WebKit.vcxproj/WebKit.make: Removed.
+        * WebKit.vcxproj/WebKit/WebKitPostBuild.cmd: Use %PlatformArchitecture% rather than
+        hard-coded 32-bit path.
+
 2014-03-10  Martin Robinson  <[email protected]>
 
         [GTK] [CMake] Clean up library linking

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit.make b/Source/WebKit/WebKit.vcxproj/WebKit.make
diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd
@@ -1,6 +1,6 @@
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebKit"
 
-set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources
+set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources
 
 xcopy /y /d "%PROJECTDIR%\..\..\win\WebLocalizableStrings.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
 xcopy /y /d "%PROJECTDIR%\..\..\win\WebKitGraphics.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-10  Brent Fulgham  <[email protected]>
+
+        [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+        https://bugs.webkit.org/show_bug.cgi?id=130023
+
+        Reviewed by Dean Jackson.
+
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj: Add missing
+        /SAFESEH flag to DLL launcher process.
+
 2014-03-09  Martin Robinson  <[email protected]>
 
         RunGtkWebKitGObjectDOMBindingsAPIBreakTests should be added to the BuildAndTestFactory not the TestFactory

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj
@@ -178,28 +178,52 @@
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Link>
+      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
+    <Link>
+      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
+    <Link />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">
+    <Link>
+      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">
+    <Link />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Link>
+      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
+    <Link>
+      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
+    <Link />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
+    <Link>
+      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
+    <Link />
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\win\DLLLauncher\DLLLauncherMain.cpp" />

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-10  Brent Fulgham  <[email protected]>
+
+        [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+        https://bugs.webkit.org/show_bug.cgi?id=130023
+
+        Reviewed by Dean Jackson.
+
+        * win/tools/vsprops/common.props: Pass WEBKIT_LIBRARIES value to subprocesses.
+        * win/tools/vsprops/debugsuffix.props: Make sure OFFICIAL_BUILD is set.
+        * win/tools/vsprops/production.props: Ditto.
+
 2014-03-06  Dean Jackson  <[email protected]>
 
         Update WebKitSystemInterface.

diff --git a/WebKitLibraries/win/tools/vsprops/common.props b/WebKitLibraries/win/tools/vsprops/common.props
@@ -12,11 +12,15 @@
     <LinkIncremental>false</LinkIncremental>
     <NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
 set PLATFORMARCHITECTURE=$(PlatformArchitecture)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
 nmake /nologo -f $(ProjectName).make</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
 set PLATFORMARCHITECTURE=$(PlatformArchitecture)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
 nmake /nologo -f $(ProjectName).make clean
 nmake /nologo -f $(ProjectName).make</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
@@ -27,6 +31,7 @@ set PATH=$(VSInstallDir)\VC\bin;%PATH%
 REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here
 set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
 set PLATFORMARCHITECTURE=$(PlatformArchitecture)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
 nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
     <TargetName>$(ProjectName)$(DebugSuffix)</TargetName>
   </PropertyGroup>
@@ -90,6 +95,7 @@ set TARGETEXT=$(TargetExt)
 set TARGETFILENAME=$(TargetFileName)
 set TARGETPATH=$(TargetPath)
 set DEBUGSUFFIX=$(DebugSuffix)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
 
 REM If any of the above variables didn't exist previously and
 REM were set to an empty string, set will set the errorlevel to 1,
@@ -126,6 +132,7 @@ set TARGETEXT=$(TargetExt)
 set TARGETFILENAME=$(TargetFileName)
 set TARGETPATH=$(TargetPath)
 set DEBUGSUFFIX=$(DebugSuffix)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
 
 REM If any of the above variables didn't exist previously and
 REM were set to an empty string, set will set the errorlevel to 1,
@@ -162,6 +169,7 @@ set TARGETEXT=$(TargetExt)
 set TARGETFILENAME=$(TargetFileName)
 set TARGETPATH=$(TargetPath)
 set DEBUGSUFFIX=$(DebugSuffix)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
 
 REM If any of the above variables didn't exist previously and
 REM were set to an empty string, set will set the errorlevel to 1,

diff --git a/WebKitLibraries/win/tools/vsprops/debugsuffix.props b/WebKitLibraries/win/tools/vsprops/debugsuffix.props
@@ -3,6 +3,7 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <DebugSuffix>_debug</DebugSuffix>
+    <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
   </PropertyGroup>
   <PropertyGroup>
     <TargetName>$(TargetName)$(DebugSuffix)</TargetName>
@@ -20,5 +21,9 @@
     <BuildMacro Include="DebugSuffix">
       <Value>$(DebugSuffix)</Value>
     </BuildMacro>
+    <BuildMacro Include="OFFICIAL_BUILD">
+      <Value>$(OFFICIAL_BUILD)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/WebKitLibraries/win/tools/vsprops/production.props b/WebKitLibraries/win/tools/vsprops/production.props
@@ -3,6 +3,7 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <PRODUCTION>1</PRODUCTION>
+    <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup>
@@ -24,5 +25,9 @@
       <Value>$(PRODUCTION)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
+    <BuildMacro Include="OFFICIAL_BUILD">
+      <Value>$(OFFICIAL_BUILD)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
   </ItemGroup>
 </Project>