Title: [205707] branches/safari-602-branch/Source
- Revision
- 205707
- Author
- [email protected]
- Date
- 2016-09-09 01:41:58 -0700 (Fri, 09 Sep 2016)
Log Message
Merge r205192. rdar://problem/28097740
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/_javascript_Core/ChangeLog (205706 => 205707)
--- branches/safari-602-branch/Source/_javascript_Core/ChangeLog 2016-09-09 08:41:53 UTC (rev 205706)
+++ branches/safari-602-branch/Source/_javascript_Core/ChangeLog 2016-09-09 08:41:58 UTC (rev 205707)
@@ -1,3 +1,17 @@
+2016-09-09 Babak Shafiei <[email protected]>
+
+ Merge r205192. rdar://problem/28097740
+
+ 2016-08-30 Alex Christensen <[email protected]>
+
+ 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-30 Babak Shafiei <[email protected]>
Merge r204570. rdar://problem/27991567
Modified: branches/safari-602-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (205706 => 205707)
--- branches/safari-602-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2016-09-09 08:41:53 UTC (rev 205706)
+++ branches/safari-602-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2016-09-09 08:41:58 UTC (rev 205707)
@@ -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: branches/safari-602-branch/Source/WebInspectorUI/ChangeLog (205706 => 205707)
--- branches/safari-602-branch/Source/WebInspectorUI/ChangeLog 2016-09-09 08:41:53 UTC (rev 205706)
+++ branches/safari-602-branch/Source/WebInspectorUI/ChangeLog 2016-09-09 08:41:58 UTC (rev 205707)
@@ -1,3 +1,18 @@
+2016-09-09 Babak Shafiei <[email protected]>
+
+ Merge r205192. rdar://problem/28097740
+
+ 2016-08-30 Alex Christensen <[email protected]>
+
+ 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-07-28 Babak Shafiei <[email protected]>
Merge r203673. rdar://problem/27517481
Modified: branches/safari-602-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (205706 => 205707)
--- branches/safari-602-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2016-09-09 08:41:53 UTC (rev 205706)
+++ branches/safari-602-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2016-09-09 08:41:58 UTC (rev 205707)
@@ -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: branches/safari-602-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj (205706 => 205707)
--- branches/safari-602-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj 2016-09-09 08:41:53 UTC (rev 205706)
+++ branches/safari-602-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.proj 2016-09-09 08:41:58 UTC (rev 205707)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
