Changeset 280574 in webkit

Timestamp:

Aug 2, 2021, 5:55:06 PM (5 years ago)

Author:

Patrick Angle

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:

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• WebInspectorUI.vcxproj/WebInspectorUI.make (modified) (1 diff)
• WebInspectorUI.vcxproj/build-webinspectorui.pl (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2021-08-02  Patrick Angle  <pangle@apple.com>
+
+        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  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make

@@ -10 +10 @@
         if errorlevel 1 exit 1
 
-        @xcopy /y /e "..\AppleInternal\include\private\JavaScriptCore\inspector\InspectorBackendCommands.js" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI\Protocol"
+        @xcopy /y /e "%JAVASCRIPTCORE_PRIVATE_HEADERS_DIR%\inspector\InspectorBackendCommands.js" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI\Protocol"
         if errorlevel 1 exit 1
 

trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl

@@ -76 +76 @@
 
 # Copy over dynamically loaded files from other frameworks, even if we aren't combining resources.
-my $jsFrom = File::Spec->catfile($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}, 'InspectorBackendCommands.js');
+my $jsFrom = File::Spec->catfile(File::Spec->catdir($ENV{'JAVASCRIPTCORE_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');