Title: [280574] trunk/Source/WebInspectorUI
Revision
280574
Author
[email protected]
Date
2021-08-02 17:55:06 -0700 (Mon, 02 Aug 2021)

Log Message

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:

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (280573 => 280574)


--- trunk/Source/WebInspectorUI/ChangeLog	2021-08-03 00:49:37 UTC (rev 280573)
+++ trunk/Source/WebInspectorUI/ChangeLog	2021-08-03 00:55:06 UTC (rev 280574)
@@ -1,3 +1,16 @@
+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-08-02  Nikita Vasilyev  <[email protected]>
 
         Web Inspector: Network: sorting of transfer size for failed requests is causing the ordering to change every layout

Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make (280573 => 280574)


--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make	2021-08-03 00:49:37 UTC (rev 280573)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make	2021-08-03 00:55:06 UTC (rev 280574)
@@ -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: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl (280573 => 280574)


--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl	2021-08-03 00:49:37 UTC (rev 280573)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl	2021-08-03 00:55:06 UTC (rev 280574)
@@ -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

Reply via email to