Title: [173171] trunk/Source/_javascript_Core
Revision
173171
Author
[email protected]
Date
2014-09-02 08:51:33 -0700 (Tue, 02 Sep 2014)

Log Message

[WinCairo] testapi.exe is not built.
https://bugs.webkit.org/show_bug.cgi?id=136369

Patch by [email protected] <[email protected]> on 2014-09-02
Reviewed by Alex Christensen.

The testapi project should be of type Application.

* _javascript_Core.vcxproj/jsc/jscLauncher.vcxproj: Change project type to Application.
* _javascript_Core.vcxproj/testRegExp/testRegExpLauncher.vcxproj: Ditto.
* _javascript_Core.vcxproj/testapi/testapiCommonCFLite.props: Compile and link fix.
* _javascript_Core.vcxproj/testapi/testapiLauncher.vcxproj: Change project type to Application.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (173170 => 173171)


--- trunk/Source/_javascript_Core/ChangeLog	2014-09-02 10:59:16 UTC (rev 173170)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-09-02 15:51:33 UTC (rev 173171)
@@ -1,3 +1,17 @@
+2014-09-02  [email protected]  <[email protected]>
+
+        [WinCairo] testapi.exe is not built.
+        https://bugs.webkit.org/show_bug.cgi?id=136369
+
+        Reviewed by Alex Christensen.
+
+        The testapi project should be of type Application.
+
+        * _javascript_Core.vcxproj/jsc/jscLauncher.vcxproj: Change project type to Application.
+        * _javascript_Core.vcxproj/testRegExp/testRegExpLauncher.vcxproj: Ditto.
+        * _javascript_Core.vcxproj/testapi/testapiCommonCFLite.props: Compile and link fix.
+        * _javascript_Core.vcxproj/testapi/testapiLauncher.vcxproj: Change project type to Application.
+
 2014-09-01  Akos Kiss  <[email protected]>
 
         [CMAKE] Add missing offlineasm dependencies

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscLauncher.vcxproj (173170 => 173171)


--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscLauncher.vcxproj	2014-09-02 10:59:16 UTC (rev 173170)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscLauncher.vcxproj	2014-09-02 15:51:33 UTC (rev 173171)
@@ -68,7 +68,7 @@
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpLauncher.vcxproj (173170 => 173171)


--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpLauncher.vcxproj	2014-09-02 10:59:16 UTC (rev 173170)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpLauncher.vcxproj	2014-09-02 15:51:33 UTC (rev 173171)
@@ -68,7 +68,7 @@
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiCommonCFLite.props (173170 => 173171)


--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiCommonCFLite.props	2014-09-02 10:59:16 UTC (rev 173170)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiCommonCFLite.props	2014-09-02 15:51:33 UTC (rev 173171)
@@ -5,11 +5,11 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>CFLite.lib;_javascript_Core$(DebugSuffix).lib;WTF$(DebugSuffix).lib;libicuin.lib;libicuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CFLite.lib;_javascript_Core$(DebugSuffix).lib;WTF$(DebugSuffix).lib;libicuin.lib;libicuuc.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
     </Link>
     <ClCompile>
-      <PreprocessorDefinitions>NOMINMAX;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN_CAIRO;NOMINMAX;USE_CONSOLE_ENTRY_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(ProjectDir)\..\..\API;$(ConfigurationBuildDir)\include\_javascript_Core;$(ConfigurationBuildDir)\include\private\_javascript_Core;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiLauncher.vcxproj (173170 => 173171)


--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiLauncher.vcxproj	2014-09-02 10:59:16 UTC (rev 173170)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiLauncher.vcxproj	2014-09-02 15:51:33 UTC (rev 173171)
@@ -68,7 +68,7 @@
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to