Title: [205192] trunk/Source
- Revision
- 205192
- Author
- achristen...@apple.com
- Date
- 2016-08-30 11:59:24 -0700 (Tue, 30 Aug 2016)
Log Message
Fix WebInspectorUI in internal Windows build
https://bugs.webkit.org/show_bug.cgi?id=161221
rdar://problem/28019023
Reviewed by Brent Fulgham and Joseph Pecoraro.
Source/_javascript_Core:
* _javascript_Core.vcxproj/_javascript_Core.proj:
Source/WebInspectorUI:
* WebInspectorUI.vcxproj/WebInspectorUI.make:
* WebInspectorUI.vcxproj/WebInspectorUI.proj:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (205191 => 205192)
--- trunk/Source/_javascript_Core/ChangeLog 2016-08-30 18:24:48 UTC (rev 205191)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-08-30 18:59:24 UTC (rev 205192)
@@ -1,3 +1,13 @@
+2016-08-30 Alex Christensen <achristen...@webkit.org>
+
+ Fix WebInspectorUI in internal Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=161221
+ rdar://problem/28019023
+
+ Reviewed by Brent Fulgham and Joseph Pecoraro.
+
+ * _javascript_Core.vcxproj/_javascript_Core.proj:
+
2016-08-29 Joseph Pecoraro <pecor...@apple.com>
REGRESSION(r202568): Web Inspector: Expanding Array Prototype in Console shows no properties
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (205191 => 205192)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2016-08-30 18:24:48 UTC (rev 205191)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2016-08-30 18:59:24 UTC (rev 205192)
@@ -68,6 +68,9 @@
<CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\_javascript_Core\**\*.*">
<Output TaskParameter="Include" ItemName="IncFiles" />
</CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\_javascript_Core\inspector\**\*.*">
+ <Output TaskParameter="Include" ItemName="InspectorFiles" />
+ </CreateItem>
<CreateItem Include="$(SRCROOT)\API\*.h">
<Output TaskParameter="Include" ItemName="APIFiles" />
</CreateItem>
@@ -109,6 +112,7 @@
</CreateItem>
<Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\_javascript_Core\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <Copy SourceFiles="@(InspectorFiles)" DestinationFiles="@(InspectorFiles->'$(DSTROOT)\AppleInternal\include\private\_javascript_Core\inspector\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(APIFiles)" DestinationFiles="@(APIFiles->'$(DSTROOT)\AppleInternal\include\_javascript_Core\%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
<Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
Modified: trunk/Source/WebInspectorUI/ChangeLog (205191 => 205192)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-08-30 18:24:48 UTC (rev 205191)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-08-30 18:59:24 UTC (rev 205192)
@@ -1,3 +1,14 @@
+2016-08-30 Alex Christensen <achristen...@webkit.org>
+
+ Fix WebInspectorUI in internal Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=161221
+ rdar://problem/28019023
+
+ Reviewed by Brent Fulgham and Joseph Pecoraro.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.make:
+ * WebInspectorUI.vcxproj/WebInspectorUI.proj:
+
2016-08-29 Devin Rousso <dcrousso+web...@gmail.com>
Web Inspector: Unify Resource entry context menus
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (205191 => 205192)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2016-08-30 18:24:48 UTC (rev 205191)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2016-08-30 18:59:24 UTC (rev 205192)
@@ -6,6 +6,12 @@
@xcopy /y /e "..\Localizations\en.lproj\*" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
if errorlevel 1 exit 1
+ @xcopy /y /e "..\UserInterface\*" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
+ if errorlevel 1 exit 1
+
+ @xcopy /y /e "..\AppleInternal\include\private\_javascript_Core\inspector\InspectorBackendCommands.js" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI\Protocol"
+ if errorlevel 1 exit 1
+
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
clean:
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj (205191 => 205192)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj 2016-08-30 18:24:48 UTC (rev 205191)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj 2016-08-30 18:59:24 UTC (rev 205192)
@@ -35,6 +35,7 @@
<Target Name="PreBuild" BeforeTargets="Build">
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
<Error Text="OBJROOT property or environment variable must be defined." Condition="'$(OBJROOT)' == ''" />
+ <Error Text="Use /p:Configuration=Debug or /p:Configuration=Release" Condition="'$(CONFIG)' == ''" />
<Message Text="Copying necessary headers to $(ConfigurationBuildDir)" />
<MakeDir Directories="$(DSTROOT);$(OBJROOT)" />
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
