Title: [154919] trunk/Source
Revision
154919
Author
[email protected]
Date
2013-08-30 16:45:45 -0700 (Fri, 30 Aug 2013)

Log Message

Source/WebInspectorUI: [Windows] Build correction after dependency change.

* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Remove circular dependency on
WebKit, and control this at the solution level. The prior change broke external
builders.

Source/WebKit: [Windows] Unreviewed build fix after r154917

* WebKit.vcxproj/WebKit.sln: Establish build dependency from WebInspectorUI against
WebKit. Remove reverse dependency.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (154918 => 154919)


--- trunk/Source/WebInspectorUI/ChangeLog	2013-08-30 23:34:48 UTC (rev 154918)
+++ trunk/Source/WebInspectorUI/ChangeLog	2013-08-30 23:45:45 UTC (rev 154919)
@@ -1,5 +1,13 @@
 2013-08-30  Brent Fulgham  <[email protected]>
 
+        [Windows] Build correction after dependency change.
+
+        * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Remove circular dependency on
+        WebKit, and control this at the solution level. The prior change broke external
+        builders.
+
+2013-08-30  Brent Fulgham  <[email protected]>
+
         [Windows] Unreviewed build gardening.
 
         * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Adjust build dependencies so

Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (154918 => 154919)


--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj	2013-08-30 23:34:48 UTC (rev 154918)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj	2013-08-30 23:45:45 UTC (rev 154919)
@@ -703,11 +703,6 @@
     <None Include="WebInspectorUIPostBuild.cmd" />
     <None Include="WebInspectorUIPreBuild.cmd" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\WebKit\WebKit.vcxproj\WebKit\WebKit.vcxproj">
-      <Project>{0662a8a9-82a3-4638-97d8-ec425d8d87c9}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: trunk/Source/WebKit/ChangeLog (154918 => 154919)


--- trunk/Source/WebKit/ChangeLog	2013-08-30 23:34:48 UTC (rev 154918)
+++ trunk/Source/WebKit/ChangeLog	2013-08-30 23:45:45 UTC (rev 154919)
@@ -1,3 +1,10 @@
+2013-08-30  Brent Fulgham  <[email protected]>
+
+        [Windows] Unreviewed build fix after r154917
+
+        * WebKit.vcxproj/WebKit.sln: Establish build dependency from WebInspectorUI against
+        WebKit. Remove reverse dependency.
+
 2013-08-29  Brent Fulgham  <[email protected]>
 
         [Windows] Unreviewed build fix after r154809

Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (154918 => 154919)


--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln	2013-08-30 23:34:48 UTC (rev 154918)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln	2013-08-30 23:45:45 UTC (rev 154919)
@@ -54,7 +54,6 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "WebKit\WebKit.vcxproj", "{0662A8A9-82A3-4638-97D8-EC425D8D87C9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0F837117-8C0B-4596-A373-A37E14A01223} = {0F837117-8C0B-4596-A373-A37E14A01223}
-		{0473724F-0AB3-4F12-892E-9FAB0186C804} = {0473724F-0AB3-4F12-892E-9FAB0186C804}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testRegExp", "..\..\_javascript_Core\_javascript_Core.vcxproj\testRegExp\testRegExp.vcxproj", "{BB16286B-AADC-46C1-BC0D-6C06F323E04B}"
@@ -191,6 +190,9 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_hlsl", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\translator_hlsl.vcxproj", "{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebInspectorUI", "..\..\WebInspectorUI\WebInspectorUI.vcxproj\WebInspectorUI.vcxproj", "{0473724F-0AB3-4F12-892E-9FAB0186C804}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {0662A8A9-82A3-4638-97D8-EC425D8D87C9}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to