Changeset 248462 in webkit

Timestamp:

Aug 8, 2019, 10:51:44 PM (6 years ago)

Author:

pvollan@apple.com

Message:

[Win] Fix internal build
​https://bugs.webkit.org/show_bug.cgi?id=200519

Reviewed by Alex Christensen.

Source/JavaScriptCore:

The script 'generate-js-builtins.py' cannot be found when building WebCore. Copy the JavaScriptCore Scripts
folder after building JSC.

• JavaScriptCore.vcxproj/JavaScriptCore.proj:

Source/WebKitLegacy/win:

Switch to the String::wideCharacers method, since its return type is compatible with the Win32 api.

• WebDownloadCFNet.cpp:

(WebDownload::didFinish):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj (modified) (2 diffs)
• WebKitLegacy/win/ChangeLog (modified) (1 diff)
• WebKitLegacy/win/WebDownloadCFNet.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-08-08  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] Fix internal build
+        https://bugs.webkit.org/show_bug.cgi?id=200519
+
+        Reviewed by Alex Christensen.
+
+        The script 'generate-js-builtins.py' cannot be found when building WebCore. Copy the JavaScriptCore Scripts
+        folder after building JSC.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.proj:
+
 2019-08-08  Devin Rousso  <drousso@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj

@@ -69 +69 @@
       <Output TaskParameter="Include" ItemName="IncFiles" />
     </CreateItem>
+    <CreateItem Include="$(ConfigurationBuildDir)\include\private\JavaScriptCore\Scripts\**\*.*">
+      <Output TaskParameter="Include" ItemName="Scripts" />
+    </CreateItem>
     <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\JavaScriptCore\inspector\**\*.*">
       <Output TaskParameter="Include" ItemName="InspectorFiles" />
@@ -113 +116 @@
 
     <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\JavaScriptCore\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(Scripts)" DestinationFiles="@(Scripts->'$(DSTROOT)\AppleInternal\include\private\JavaScriptCore\Scripts\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(InspectorFiles)" DestinationFiles="@(InspectorFiles->'$(DSTROOT)\AppleInternal\include\private\JavaScriptCore\inspector\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(APIFiles)" DestinationFiles="@(APIFiles->'$(DSTROOT)\AppleInternal\include\JavaScriptCore\%(Filename)%(Extension)')" />

trunk/Source/WebKitLegacy/win/ChangeLog

@@ +1 @@
+2019-08-08  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] Fix internal build
+        https://bugs.webkit.org/show_bug.cgi?id=200519
+
+        Reviewed by Alex Christensen.
+
+        Switch to the String::wideCharacers method, since its return type is compatible with the Win32 api.
+
+        * WebDownloadCFNet.cpp:
+        (WebDownload::didFinish):
+
 2019-08-08  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKitLegacy/win/WebDownloadCFNet.cpp

@@ -468 +468 @@
     // We try to rename the bundle to the final file name.  If that fails, we give the delegate one more chance to chose
     // the final file name, then we just leave it
-    if (!MoveFileEx(m_bundlePath.charactersWithNullTermination().data(), m_destination.charactersWithNullTermination().data(), 0)) {
+    if (!MoveFileEx(m_bundlePath.wideCharacters().data(), m_destination.wideCharacters().data(), 0)) {
         LOG_ERROR("Failed to move bundle %s to %s on completion\nError - %i", m_bundlePath.ascii().data(), m_destination.ascii().data(), GetLastError());
         
@@ -480 +480 @@
         // one last time.
         if (!m_destination.isEmpty())
-            if (MoveFileEx(m_bundlePath.charactersWithNullTermination().data(), m_destination.charactersWithNullTermination().data(), 0))
+            if (MoveFileEx(m_bundlePath.wideCharacters().data(), m_destination.wideCharacters().data(), 0))
                 reportBundlePathAsFinalPath = false;