Changeset 25746 in webkit for trunk/JavaScriptCore/JavaScriptCore.vcproj

Timestamp:

Sep 25, 2007, 5:54:22 PM (18 years ago)

Author:

aroben

Message:

Add WebKitInitializer and use it in DumpRenderTree and testkjs

JavaScriptCore:

Make testkjs use WebKitInitializer

Reviewed by Sam.

• JavaScriptCore.vcproj/JavaScriptCore.sln: Add WebKitInitializer and make testkjs depend on it.
• JavaScriptCore.vcproj/testkjs/testkjs.vcproj: Link against WebKitInitializer.lib.
• kjs/testkjs.cpp: (main): Call initializeWebKit.

WebKitTools:

Add WebKitInitializer and use it in DumpRenderTree

WebKitInitializer is a static library that has one function,
initializeWebKit(). This registers WebKit and sets up the DLL search
path so that WebKit's dependencies that are installed with Safari can
be found.

Reviewed by Sam.

• DumpRenderTree/DumpRenderTree.sln: Added WebKitInitializer and made DumpRenderTree depend on it.
• DumpRenderTree/win/DumpRenderTree.cpp: (initialize): Call initializeWebKit.
• DumpRenderTree/win/DumpRenderTree.vcproj: Link against WebKitInitializer.lib.
• WebKitInitializer/WebKitInitializer.cpp: Added. (getStringValue): (getWebViewCLSID): (getInstalledWebKitDirectory): (initializeWebKit):
• WebKitInitializer/WebKitInitializer.h: Added.
• WebKitInitializer/WebKitInitializer.vcproj: Added.
• WebKitInitializer/debug.vsprops: Added.
• WebKitInitializer/release.vsprops: Added.

WebKit/win:

Add WebKitInitializer to WebKit.sln

Reviewed by Sam.

• WebKit.vcproj/WebKit.sln: DumpRenderTree and testkjs now depend on WebKitInitializer.

Location:

trunk/JavaScriptCore/JavaScriptCore.vcproj

Files:

• JavaScriptCore.sln (modified) (2 diffs)
• testkjs/testkjs.vcproj (modified) (6 diffs)

trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln

@@ -12 +12 @@
         ProjectSection(ProjectDependencies) = postProject
                 {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+                {9E96B9B5-0CCB-47F8-A95E-C25ABE049E02} = {9E96B9B5-0CCB-47F8-A95E-C25ABE049E02}
                 {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}
         EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitInitializer", "..\..\WebKitTools\WebKitInitializer\WebKitInitializer.vcproj", "{9E96B9B5-0CCB-47F8-A95E-C25ABE049E02}"
 EndProject
 Global
@@ -48 +51 @@
                 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32
                 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32
+                {9E96B9B5-0CCB-47F8-A95E-C25ABE049E02}.Debug_Internal|Win32.ActiveCfg = Debug|Win32
+                {9E96B9B5-0CCB-47F8-A95E-C25ABE049E02}.Debug_Internal|Win32.Build.0 = Debug|Win32
+                {9E96B9B5-0CCB-47F8-A95E-C25ABE049E02}.Debug|Win32.ActiveCfg = Debug|Win32
+                {9E96B9B5-0CCB-47F8-A95E-C25ABE049E02}.Debug|Win32.Build.0 = Debug|Win32
+                {9E96B9B5-0CCB-47F8-A95E-C25ABE049E02}.Release|Win32.ActiveCfg = Release|Win32
+                {9E96B9B5-0CCB-47F8-A95E-C25ABE049E02}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

trunk/JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj

@@ -43 +43 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;"$(WebKitLibrariesDir)\include\icu";../../../icu/include"
+                                AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../kjs/;../../wtf/;"$(WebKitLibrariesDir)\include\icu";../../../icu/include"
                                 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE; WIN32"
                                 MinimalRebuild="true"
@@ -68 +68 @@
                                 Name="VCLinkerTool"
                                 LinkLibraryDependencies="false"
-                                AdditionalDependencies="JavaScriptCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib"
+                                AdditionalDependencies="JavaScriptCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitInitializer$(WebKitConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib"
                                 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
                                 LinkIncremental="2"
@@ -129 +129 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitLibrariesDir)\include\icu&quot;;../../../icu/include"
+                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitLibrariesDir)\include\icu&quot;;../../../icu/include"
                                 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE; WIN32"
                                 ExceptionHandling="0"
@@ -152 +152 @@
                                 Name="VCLinkerTool"
                                 LinkLibraryDependencies="false"
-                                AdditionalDependencies="JavaScriptCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib"
+                                AdditionalDependencies="JavaScriptCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitInitializer$(WebKitConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib"
                                 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
                                 LinkIncremental="1"
@@ -215 +215 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitLibrariesDir)\include\icu&quot;;../../../icu/include"
+                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitLibrariesDir)\include\icu&quot;;../../../icu/include"
                                 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE; WIN32"
                                 MinimalRebuild="true"
@@ -240 +240 @@
                                 Name="VCLinkerTool"
                                 LinkLibraryDependencies="false"
-                                AdditionalDependencies="JavaScriptCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib"
+                                AdditionalDependencies="JavaScriptCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitInitializer$(WebKitConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib"
                                 OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
                                 LinkIncremental="2"