Changeset 280596 in webkit

Timestamp:

Aug 3, 2021, 9:44:02 AM (5 years ago)

Author:

Russell Epstein

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

Location:

branches/safari-612.1.15.4-branch/Source/WebInspectorUI

Files:

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

branches/safari-612.1.15.4-branch/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2021-08-03  Russell Epstein  <repstein@apple.com>
+
+        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  <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-05-10  Devin Rousso  <drousso@apple.com>
 

branches/safari-612.1.15.4-branch/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
 

branches/safari-612.1.15.4-branch/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');