Title: [280596] branches/safari-612.1.15.4-branch/Source/WebInspectorUI
- Revision
- 280596
- Author
- [email protected]
- Date
- 2021-08-03 09:44:02 -0700 (Tue, 03 Aug 2021)
Log Message
Cherry-pick r280574. rdar://problem/81466166
Web Inspector: [AppleWin] Speculative internal build fix for copying `InspectorBackendCommands.js`
https://bugs.webkit.org/show_bug.cgi?id=228716
Reviewed by Maciej Stachowiak.
Speculative fix for AppleWin port internal build by using the correct directory for JSC headers. Also update the
logging message to reflect that the file will by copied later in the build.
* WebInspectorUI.vcxproj/WebInspectorUI.make:
* WebInspectorUI.vcxproj/build-webinspectorui.pl:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280574 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.15.4-branch/Source/WebInspectorUI/ChangeLog (280595 => 280596)
--- branches/safari-612.1.15.4-branch/Source/WebInspectorUI/ChangeLog 2021-08-03 16:42:52 UTC (rev 280595)
+++ branches/safari-612.1.15.4-branch/Source/WebInspectorUI/ChangeLog 2021-08-03 16:44:02 UTC (rev 280596)
@@ -1,3 +1,34 @@
+2021-08-03 Russell Epstein <[email protected]>
+
+ Cherry-pick r280574. rdar://problem/81466166
+
+ Web Inspector: [AppleWin] Speculative internal build fix for copying `InspectorBackendCommands.js`
+ https://bugs.webkit.org/show_bug.cgi?id=228716
+
+ Reviewed by Maciej Stachowiak.
+
+ Speculative fix for AppleWin port internal build by using the correct directory for JSC headers. Also update the
+ logging message to reflect that the file will by copied later in the build.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.make:
+ * WebInspectorUI.vcxproj/build-webinspectorui.pl:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280574 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-08-02 Patrick Angle <[email protected]>
+
+ Web Inspector: [AppleWin] Speculative internal build fix for copying `InspectorBackendCommands.js`
+ https://bugs.webkit.org/show_bug.cgi?id=228716
+
+ Reviewed by Maciej Stachowiak.
+
+ Speculative fix for AppleWin port internal build by using the correct directory for JSC headers. Also update the
+ logging message to reflect that the file will by copied later in the build.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.make:
+ * WebInspectorUI.vcxproj/build-webinspectorui.pl:
+
2021-05-10 Devin Rousso <[email protected]>
Web Inspector: Network: rename "XHR" to "XHR/Fetch"
Modified: branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (280595 => 280596)
--- branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2021-08-03 16:42:52 UTC (rev 280595)
+++ branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make 2021-08-03 16:44:02 UTC (rev 280596)
@@ -9,7 +9,7 @@
@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"
+ @xcopy /y /e "%_javascript_CORE_PRIVATE_HEADERS_DIR%\inspector\InspectorBackendCommands.js" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI\Protocol"
if errorlevel 1 exit 1
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl (280595 => 280596)
--- branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl 2021-08-03 16:42:52 UTC (rev 280595)
+++ branches/safari-612.1.15.4-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl 2021-08-03 16:44:02 UTC (rev 280596)
@@ -75,9 +75,9 @@
my $protocolDir = File::Spec->catdir($targetResourcePath, 'Protocol');
# Copy over dynamically loaded files from other frameworks, even if we aren't combining resources.
-my $jsFrom = File::Spec->catfile($ENV{'_javascript_CORE_PRIVATE_HEADERS_DIR'}, 'InspectorBackendCommands.js');
+my $jsFrom = File::Spec->catfile(File::Spec->catdir($ENV{'_javascript_CORE_PRIVATE_HEADERS_DIR'}, 'inspector'), 'InspectorBackendCommands.js');
my $jsTo = File::Spec->catfile($protocolDir, 'InspectorBackendCommands.js');
-print "Copying Inspector bindings from $jsFrom to $jsTo\n";
+print "Inspector bindings will be copied from $jsFrom to $jsTo\n";
my $copyResourcesCommand = File::Spec->catfile($XSRCROOT, 'Scripts', 'copy-user-interface-resources.pl');
do $copyResourcesCommand;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
