Diff
Modified: trunk/Tools/ChangeLog (180676 => 180677)
--- trunk/Tools/ChangeLog 2015-02-26 16:51:10 UTC (rev 180676)
+++ trunk/Tools/ChangeLog 2015-02-26 17:04:41 UTC (rev 180677)
@@ -1,3 +1,15 @@
+2015-02-26 Brent Fulgham <[email protected]>
+
+ [Win] Unreviewed WinCairo build fix after r180653.
+
+ TestWebKitAPI should know about proper WEBCORE_EXPORT definitions.
+
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters:
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPICommon.props:
+ * TestWebKitAPI/win/TestWebKitAPIPrefix.cpp: Added.
+ * TestWebKitAPI/win/TestWebKitAPIPrefix.h: Added.
+
2015-02-25 Brent Fulgham <[email protected]>
[Win] Use WEBCORE_EXPORT instead of Definition file
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj (180676 => 180677)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj 2015-02-26 16:51:10 UTC (rev 180676)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj 2015-02-26 17:04:41 UTC (rev 180677)
@@ -284,6 +284,7 @@
<ClInclude Include="..\Test.h" />
<ClInclude Include="..\TestsController.h" />
<ClInclude Include="..\win\HostWindow.h" />
+ <ClInclude Include="..\win\TestWebKitAPIPrefix.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Counters.cpp" />
@@ -317,6 +318,20 @@
<ClCompile Include="..\Tests\WTF\Vector.cpp" />
<ClCompile Include="..\win\HostWindow.cpp" />
<ClCompile Include="..\win\main.cpp" />
+ <ClCompile Include="..\win\TestWebKitAPIPrefix.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|x64'">Create</PrecompiledHeader>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="TestWebKitAPIPostBuild.cmd" />
@@ -325,4 +340,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters (180676 => 180677)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters 2015-02-26 16:51:10 UTC (rev 180676)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters 2015-02-26 17:04:41 UTC (rev 180677)
@@ -28,6 +28,7 @@
<ClInclude Include="..\win\HostWindow.h">
<Filter>win</Filter>
</ClInclude>
+ <ClInclude Include="TestWebKitAPIPrefix.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Counters.cpp" />
@@ -92,6 +93,7 @@
<ClCompile Include="..\Tests\WTF\cf\RetainPtrHashing.cpp">
<Filter>Tests\WTF\cf</Filter>
</ClCompile>
+ <ClCompile Include="TestWebKitAPIPrefix.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="TestWebKitAPIPostBuild.cmd" />
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPICommon.props (180676 => 180677)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPICommon.props 2015-02-26 16:51:10 UTC (rev 180676)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPICommon.props 2015-02-26 17:04:41 UTC (rev 180677)
@@ -11,7 +11,10 @@
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\win;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private\_javascript_Core;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\Include\private;..\..\..\Source\ThirdParty\gtest\include;$(WebKit_Libraries)\include;$(WebKit_Libraries)\Include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>TestWebKitAPIPrefix.h</PrecompiledHeaderFile>
+ <ForcedIncludeFiles>TestWebKitAPIPrefix.h</ForcedIncludeFiles>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup />
-</Project>
+</Project>
\ No newline at end of file
Added: trunk/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.cpp (0 => 180677)
--- trunk/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.cpp (rev 0)
+++ trunk/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.cpp 2015-02-26 17:04:41 UTC (rev 180677)
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "TestWebKitAPIPrefix.h"
Added: trunk/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h (0 => 180677)
--- trunk/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h (rev 0)
+++ trunk/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h 2015-02-26 17:04:41 UTC (rev 180677)
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#undef WEBCORE_EXPORT
+#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
