Title: [154922] trunk/Source
- Revision
- 154922
- Author
- [email protected]
- Date
- 2013-08-30 17:22:48 -0700 (Fri, 30 Aug 2013)
Log Message
Source/WebInspectorUI: [Windows] Correct windows build. Get rid of unnecessary pre-build step. We don't build anything
in this project, just copy some files into the WebKit resource folder. This was fooling the
build system into thinking something failed, resulting in a build error.
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Remove reference to WebInspectorUIPreBuild.cmd
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
* WebInspectorUI.vcxproj/WebInspectorUIPreBuild.cmd: Removed.
Source/WebKit: [Windows] Unreviewed build correction.
Update project dependencies so that build logs on machines will include output from the
WebInspectorUI project.
* WebKit.vcxproj/WebKit.sln:
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (154921 => 154922)
--- trunk/Source/WebInspectorUI/ChangeLog 2013-08-31 00:14:41 UTC (rev 154921)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-08-31 00:22:48 UTC (rev 154922)
@@ -1,5 +1,15 @@
2013-08-30 Brent Fulgham <[email protected]>
+ [Windows] Correct windows build. Get rid of unnecessary pre-build step. We don't build anything
+ in this project, just copy some files into the WebKit resource folder. This was fooling the
+ build system into thinking something failed, resulting in a build error.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Remove reference to WebInspectorUIPreBuild.cmd
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
+ * WebInspectorUI.vcxproj/WebInspectorUIPreBuild.cmd: Removed.
+
+2013-08-30 Brent Fulgham <[email protected]>
+
[Windows] Build correction after dependency change.
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Remove circular dependency on
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (154921 => 154922)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2013-08-31 00:14:41 UTC (rev 154921)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2013-08-31 00:22:48 UTC (rev 154922)
@@ -701,7 +701,6 @@
<None Include="..\UserInterface\Utilities.js" />
<None Include="..\UserInterface\WebInspector.js" />
<None Include="WebInspectorUIPostBuild.cmd" />
- <None Include="WebInspectorUIPreBuild.cmd" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters (154921 => 154922)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2013-08-31 00:14:41 UTC (rev 154921)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2013-08-31 00:22:48 UTC (rev 154922)
@@ -1735,6 +1735,5 @@
<Filter>Scripts</Filter>
</None>
<None Include="WebInspectorUIPostBuild.cmd" />
- <None Include="WebInspectorUIPreBuild.cmd" />
</ItemGroup>
</Project>
\ No newline at end of file
Deleted: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUIPreBuild.cmd (154921 => 154922)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUIPreBuild.cmd 2013-08-31 00:14:41 UTC (rev 154921)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUIPreBuild.cmd 2013-08-31 00:22:48 UTC (rev 154922)
@@ -1,6 +0,0 @@
-%SystemDrive%\cygwin\bin\which.exe bash
-if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
-cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
-if errorlevel 1 exit 1
-echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Source/WebKit/ChangeLog (154921 => 154922)
--- trunk/Source/WebKit/ChangeLog 2013-08-31 00:14:41 UTC (rev 154921)
+++ trunk/Source/WebKit/ChangeLog 2013-08-31 00:22:48 UTC (rev 154922)
@@ -1,5 +1,13 @@
2013-08-30 Brent Fulgham <[email protected]>
+ [Windows] Unreviewed build correction.
+ Update project dependencies so that build logs on machines will include output from the
+ WebInspectorUI project.
+
+ * WebKit.vcxproj/WebKit.sln:
+
+2013-08-30 Brent Fulgham <[email protected]>
+
[Windows] Unreviewed build fix after r154917
* WebKit.vcxproj/WebKit.sln: Establish build dependency from WebInspectorUI against
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (154921 => 154922)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-08-31 00:14:41 UTC (rev 154921)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-08-31 00:22:48 UTC (rev 154922)
@@ -159,6 +159,7 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssembleBuildLogs", "..\..\..\Tools\win\AssembleBuildLogs\AssembleBuildLogs.vcxproj", "{67A61940-F80B-42A0-A29D-B6DB1C27BCEE}"
ProjectSection(ProjectDependencies) = postProject
{AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D} = {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}
+ {0473724F-0AB3-4F12-892E-9FAB0186C804} = {0473724F-0AB3-4F12-892E-9FAB0186C804}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ANGLE projects", "ANGLE projects", "{5E9B7191-CF7D-4EA4-8168-14A73749E585}"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
