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
+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.
<!-- 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
<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
+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
<!-- 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
<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
#!/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}")"
+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
* 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
<!-- 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
<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
+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
+++ /dev/null
-!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
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"
+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
<_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" />
+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.
<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
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>
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,
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,
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,
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<DebugSuffix>_debug</DebugSuffix>
+ <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
</PropertyGroup>
<PropertyGroup>
<TargetName>$(TargetName)$(DebugSuffix)</TargetName>
<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
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<PRODUCTION>1</PRODUCTION>
+ <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup>
<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