git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a517c50)
Source/JavaScriptCore: [Win] Pass environment to Pre-Build, Pre-link, and Post-Build...
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Mar 2014 19:09:40 +0000 (19:09 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Mar 2014 19:09:40 +0000 (19:09 +0000)
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: https://svn.webkit.org/repository/webkit/trunk@165393 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
Source/JavaScriptCore/ChangeLog patch | blob | history
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj patch | blob | history
Source/WTF/ChangeLog patch | blob | history
Source/WTF/WTF.vcxproj/WTF.proj patch | blob | history
Source/WTF/WTF.vcxproj/build-generated-files.sh patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/WebCore.vcxproj/WebCore.proj patch | blob | history
Source/WebKit/ChangeLog patch | blob | history
Source/WebKit/WebKit.vcxproj/WebKit.make [deleted file] patch | blob | history
Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd patch | blob | history
Tools/ChangeLog patch | blob | history
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj patch | blob | history
WebKitLibraries/ChangeLog patch | blob | history
WebKitLibraries/win/tools/vsprops/common.props patch | blob | history
WebKitLibraries/win/tools/vsprops/debugsuffix.props patch | blob | history
WebKitLibraries/win/tools/vsprops/production.props patch | blob | history

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 76804bcb33e5031ee8938a24ff94d23b5106aff7..325190283852052aab75b7eb0ed99017c9b8052c 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-10  Brent Fulgham  <bfulgham@apple.com>
+
+        [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  <akling@apple.com>
 
         [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
index 1207b01a49c0749bf9e673fee5fcbc5b41a52d1c..6b3f9718d43ffabd995b29cb1d29f6ee4b59bd3a 100644 (file)
--- 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. -->\r
   <PropertyGroup>\r
     <OFFICIAL_BUILD>1</OFFICIAL_BUILD>\r
-    <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>\r
+    <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>\r
     <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>\r
     <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>\r
     <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>\r
@@ -21,8 +21,8 @@
     <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>\r
     <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>\r
     <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>\r
-    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>\r
-    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>\r
+    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>\r
+    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>\r
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  \r
     <OutputDirectory>$(DSTROOT)</OutputDirectory>\r
   </PropertyGroup>\r
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 4302f9db1978e9d4bd393f49aa11d36787937479..359c4116c51b27c71b9c5d1191471392d27e3288 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-10  Brent Fulgham  <bfulgham@apple.com>
+
+        [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  <mhahnenberg@apple.com>
 
         Turn on GenGC on other 64-bit platforms
diff --git a/Source/WTF/WTF.vcxproj/WTF.proj b/Source/WTF/WTF.vcxproj/WTF.proj
index 3df7918669629049f575a6365a4c2a9b1bfbc4c4..f2c14f1a96405ab6d04d8f9aed97d5abf64620ae 100644 (file)
--- 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. -->\r
   <PropertyGroup>\r
     <OFFICIAL_BUILD>1</OFFICIAL_BUILD>\r
-    <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>\r
+    <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>\r
     <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>\r
     <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>\r
     <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>\r
@@ -21,8 +21,8 @@
     <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>\r
     <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>\r
     <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>\r
-    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>\r
-    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>\r
+    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>\r
+    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>\r
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  \r
     <OutputDirectory>$(DSTROOT)</OutputDirectory>\r
   </PropertyGroup>\r
diff --git a/Source/WTF/WTF.vcxproj/build-generated-files.sh b/Source/WTF/WTF.vcxproj/build-generated-files.sh
index 66c6b331581bf7eff1f13f7c74e7b3dfeed9e3c9..8232dfea84e9b54d070bc374e4209c13355125db 100644 (file)
--- 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
index b7b44ae906297db6b8be0672c94c29a307b45149..2b54e6810f7ab86086017a6eac85025716535446 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-10  Brent Fulgham  <bfulgham@apple.com>
+
+        [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  <stavila@adobe.com>
 
         [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  <hmuller@adobe.com>
 
         [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
index 12910043487a014e40bf8e97cc03394f69556b3d..e7c526540778aef9a800369c1c9b2f8bbcd66fea 100644 (file)
--- 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. -->\r
   <PropertyGroup>\r
     <OFFICIAL_BUILD>1</OFFICIAL_BUILD>\r
-    <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>\r
+    <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>\r
     <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>\r
     <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>\r
     <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>\r
@@ -21,8 +21,8 @@
     <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>\r
     <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>\r
     <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>\r
-    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>\r
-    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>\r
+    <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>\r
+    <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>\r
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  \r
     <OutputDirectory>$(DSTROOT)</OutputDirectory>\r
   </PropertyGroup>\r
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 9d8bc0f3ffd0d6532b8b3c44b06eec018ffedd63..854dde1908dca1c18117b1020b51b70d1926f08c 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-10  Brent Fulgham  <bfulgham@apple.com>
+
+        [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  <mrobinson@igalia.com>
 
         [GTK] [CMake] Clean up library linking
diff --git a/Source/WebKit/WebKit.vcxproj/WebKit.make b/Source/WebKit/WebKit.vcxproj/WebKit.make
deleted file mode 100644 (file)
index 6a5120c..0000000
--- a/Source/WebKit/WebKit.vcxproj/WebKit.make
+++ /dev/null
@@ -1,19 +0,0 @@
-!IF "$(BUILDSTYLE)"=="DEBUG"
-BUILDSTYLE=DebugSuffix
-!ELSE
-BUILDSTYLE=Production
-!ENDIF
-
-install:
-    set OFFICIAL_BUILD=1
-       set WebKit_Libraries=$(SRCROOT)\AppleInternal
-       set WebKit_OutputDir=$(OBJROOT)
-    set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
-    set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
-       set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
-       devenv "WebKit.submit.sln" /rebuild $(BUILDSTYLE)
-       xcopy "%ConfigurationBuildDir%\bin32\*.pdb" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
-       -xcopy "%ConfigurationBuildDir%\bin32\*.dll" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
-       xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\WebKit.resources\" /e/v/i/h/y
-       xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y        
-       xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y
diff --git a/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd b/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd
index b3896dec1724644237bc7b3fb1f65ded0a025fad..a4c5bb27461adf7f4596edb4a21d90a3ce3f790c 100644 (file)
--- 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
index 3d0fc278793e747cd524a7552722931992be8b89..1f8fe19785d48384b88462b854c76dc162fc48fe 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-10  Brent Fulgham  <bfulgham@apple.com>
+
+        [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  <mrobinson@igalia.com>
 
         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
index d5889b71df46f0d0068ce3341d6474fb576a5c5c..6a4002b2de17aee3574c6a147566e45e88d0bd0d 100644 (file)
--- 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
index e7f566f231bb86a7945d46360b58a111b58fa876..ca4c8ffad95c7e32bdd4bfdd753a5d3b9754f696 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-10  Brent Fulgham  <bfulgham@apple.com>
+
+        [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  <dino@apple.com>
 
         Update WebKitSystemInterface.
diff --git a/WebKitLibraries/win/tools/vsprops/common.props b/WebKitLibraries/win/tools/vsprops/common.props
index 661bd5571e15c9d775ddab7d5ac6b7b612dbea33..02267b47e93abb7f794948beecd0dfec545815c8 100644 (file)
--- 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
index 16d070ecfb657343c6caef9bbdfafd77b728fab1..3ba2e67af5f54d7f39498c65835a2eb31fecfcbd 100644 (file)
--- 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>
\ No newline at end of file
diff --git a/WebKitLibraries/win/tools/vsprops/production.props b/WebKitLibraries/win/tools/vsprops/production.props
index 0b3fbcd55c7e6386fcecb3679c9216d86a18e056..cea999957a6e5d61eb21b2cbb65f1fbfe3d25187 100644 (file)
--- 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>
\ No newline at end of file
Mirror of the WebKit open source project from svn.webkit.org.