diff options
Diffstat (limited to 'Tools/WebKitAPITest')
-rw-r--r-- | Tools/WebKitAPITest/HostWindow.cpp | 1 | ||||
-rw-r--r-- | Tools/WebKitAPITest/TestsController.cpp | 1 | ||||
-rw-r--r-- | Tools/WebKitAPITest/WebKitAPITest.vcproj | 14 | ||||
-rw-r--r-- | Tools/WebKitAPITest/WebKitAPITestDebug.vsprops | 11 | ||||
-rw-r--r-- | Tools/WebKitAPITest/WebKitAPITestDebugAll.vsprops | 12 | ||||
-rw-r--r-- | Tools/WebKitAPITest/WebKitAPITestDebugCairoCFLite.vsprops | 12 | ||||
-rw-r--r-- | Tools/WebKitAPITest/WebKitAPITestProduction.vsprops | 12 | ||||
-rw-r--r-- | Tools/WebKitAPITest/WebKitAPITestRelease.vsprops | 11 | ||||
-rw-r--r-- | Tools/WebKitAPITest/WebKitAPITestReleaseCairoCFLite.vsprops | 12 | ||||
-rw-r--r-- | Tools/WebKitAPITest/config.h | 57 | ||||
-rw-r--r-- | Tools/WebKitAPITest/main.cpp | 2 | ||||
-rw-r--r-- | Tools/WebKitAPITest/tests/WebViewDestruction.cpp | 2 |
12 files changed, 140 insertions, 7 deletions
diff --git a/Tools/WebKitAPITest/HostWindow.cpp b/Tools/WebKitAPITest/HostWindow.cpp index b364831..e35e96c 100644 --- a/Tools/WebKitAPITest/HostWindow.cpp +++ b/Tools/WebKitAPITest/HostWindow.cpp @@ -22,6 +22,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" #include "HostWindow.h" namespace WebKitAPITest { diff --git a/Tools/WebKitAPITest/TestsController.cpp b/Tools/WebKitAPITest/TestsController.cpp index 08b193a..c5cf23a 100644 --- a/Tools/WebKitAPITest/TestsController.cpp +++ b/Tools/WebKitAPITest/TestsController.cpp @@ -22,6 +22,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" #include "TestsController.h" #include "Test.h" diff --git a/Tools/WebKitAPITest/WebKitAPITest.vcproj b/Tools/WebKitAPITest/WebKitAPITest.vcproj index e3d8171..a746e72 100644 --- a/Tools/WebKitAPITest/WebKitAPITest.vcproj +++ b/Tools/WebKitAPITest/WebKitAPITest.vcproj @@ -17,7 +17,7 @@ <Configuration Name="Debug_All|Win32" ConfigurationType="1" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKitAPITestCommon.vsprops" + InheritedPropertySheets=".\WebKitAPITestDebugAll.vsprops" CharacterSet="1" > <Tool @@ -78,7 +78,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitAPITestCommon.vsprops" + InheritedPropertySheets=".\WebKitAPITestDebug.vsprops" CharacterSet="1" > <Tool @@ -139,7 +139,7 @@ <Configuration Name="Debug_Cairo_CFLite|Win32" ConfigurationType="1" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\WebKitAPITestCommon.vsprops" + InheritedPropertySheets=".\WebKitAPITestDebugCairoCFLite.vsprops" CharacterSet="1" > <Tool @@ -200,7 +200,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitAPITestCommon.vsprops" + InheritedPropertySheets=".\WebKitAPITestRelease.vsprops" CharacterSet="1" > <Tool @@ -259,9 +259,9 @@ /> </Configuration> <Configuration - Name="Release_LTCG|Win32" + Name="Production|Win32" ConfigurationType="1" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitAPITestCommon.vsprops" + InheritedPropertySheets=".\WebKitAPITestProduction.vsprops" CharacterSet="1" > <Tool @@ -322,7 +322,7 @@ <Configuration Name="Release_Cairo_CFLite|Win32" ConfigurationType="1" - InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\WebKitAPITestCommon.vsprops" + InheritedPropertySheets=".\WebKitAPITestReleaseCairoCFLite.vsprops" CharacterSet="1" > <Tool diff --git a/Tools/WebKitAPITest/WebKitAPITestDebug.vsprops b/Tools/WebKitAPITest/WebKitAPITestDebug.vsprops new file mode 100644 index 0000000..a3c44c4 --- /dev/null +++ b/Tools/WebKitAPITest/WebKitAPITestDebug.vsprops @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="WebKitAPITestDebug" + InheritedPropertySheets=" + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops; + .\WebKitAPITestCommon.vsprops" + > +</VisualStudioPropertySheet> diff --git a/Tools/WebKitAPITest/WebKitAPITestDebugAll.vsprops b/Tools/WebKitAPITest/WebKitAPITestDebugAll.vsprops new file mode 100644 index 0000000..5a0a820 --- /dev/null +++ b/Tools/WebKitAPITest/WebKitAPITestDebugAll.vsprops @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="WebKitAPITestDebugAll" + InheritedPropertySheets=" + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops; + .\WebKitAPITestCommon.vsprops" + > +</VisualStudioPropertySheet> diff --git a/Tools/WebKitAPITest/WebKitAPITestDebugCairoCFLite.vsprops b/Tools/WebKitAPITest/WebKitAPITestDebugCairoCFLite.vsprops new file mode 100644 index 0000000..ad9f812 --- /dev/null +++ b/Tools/WebKitAPITest/WebKitAPITestDebugCairoCFLite.vsprops @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="WebKitAPITestDebugCairoCFLite" + InheritedPropertySheets=" + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops; + .\WebKitAPITestCommon.vsprops" + > +</VisualStudioPropertySheet> diff --git a/Tools/WebKitAPITest/WebKitAPITestProduction.vsprops b/Tools/WebKitAPITest/WebKitAPITestProduction.vsprops new file mode 100644 index 0000000..45cb5c9 --- /dev/null +++ b/Tools/WebKitAPITest/WebKitAPITestProduction.vsprops @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="WebKitAPITestProduction" + InheritedPropertySheets=" + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\production.vsprops; + .\WebKitAPITestCommon.vsprops" + > +</VisualStudioPropertySheet> diff --git a/Tools/WebKitAPITest/WebKitAPITestRelease.vsprops b/Tools/WebKitAPITest/WebKitAPITestRelease.vsprops new file mode 100644 index 0000000..e89d3e7 --- /dev/null +++ b/Tools/WebKitAPITest/WebKitAPITestRelease.vsprops @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="WebKitAPITestRelease" + InheritedPropertySheets=" + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + .\WebKitAPITestCommon.vsprops" + > +</VisualStudioPropertySheet> diff --git a/Tools/WebKitAPITest/WebKitAPITestReleaseCairoCFLite.vsprops b/Tools/WebKitAPITest/WebKitAPITestReleaseCairoCFLite.vsprops new file mode 100644 index 0000000..8c1a3c3 --- /dev/null +++ b/Tools/WebKitAPITest/WebKitAPITestReleaseCairoCFLite.vsprops @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="WebKitAPITestReleaseCairoCFLite" + InheritedPropertySheets=" + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops; + .\WebKitAPITestCommon.vsprops" + > +</VisualStudioPropertySheet> diff --git a/Tools/WebKitAPITest/config.h b/Tools/WebKitAPITest/config.h new file mode 100644 index 0000000..bee51ac --- /dev/null +++ b/Tools/WebKitAPITest/config.h @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2011 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. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. 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 INC. 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. + */ + +#ifndef WebKitAPITests_config_h +#define WebKitAPITests_config_h + +#include <wtf/Platform.h> + +/* See note in wtf/Platform.h for more info on EXPORT_MACROS. */ +#if USE(EXPORT_MACROS) + +#include <wtf/ExportMacros.h> + +#define WTF_EXPORT_PRIVATE WTF_IMPORT +#define JS_EXPORT_PRIVATE WTF_IMPORT +#define WEBKIT_EXPORTDATA WTF_IMPORT + +#define JS_EXPORTDATA JS_EXPORT_PRIVATE +#define JS_EXPORTCLASS JS_EXPORT_PRIVATE + +#else /* !USE(EXPORT_MACROS) */ + +#if OS(WINDOWS) && !COMPILER(GCC) && !defined(BUILDING_WX__) +#define JS_EXPORTDATA __declspec(dllimport) +#define WEBKIT_EXPORTDATA __declspec(dllimport) +#else +#define JS_EXPORTDATA +#define WEBKIT_EXPORTDATA +#endif + +#define WTF_EXPORT_PRIVATE JS_EXPORTDATA +#define JS_EXPORT_PRIVATE JS_EXPORTDATA + +#endif /* USE(EXPORT_MACROS) */ + +#endif diff --git a/Tools/WebKitAPITest/main.cpp b/Tools/WebKitAPITest/main.cpp index 8b54b01..dddba20 100644 --- a/Tools/WebKitAPITest/main.cpp +++ b/Tools/WebKitAPITest/main.cpp @@ -22,6 +22,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" + #include "TestsController.h" using namespace WebKitAPITest; diff --git a/Tools/WebKitAPITest/tests/WebViewDestruction.cpp b/Tools/WebKitAPITest/tests/WebViewDestruction.cpp index 6c09e6f..b7ae0b6 100644 --- a/Tools/WebKitAPITest/tests/WebViewDestruction.cpp +++ b/Tools/WebKitAPITest/tests/WebViewDestruction.cpp @@ -22,6 +22,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" + #include "HostWindow.h" #include "Test.h" #include <WebCore/COMPtr.h> |