Title: [248482] branches/safari-608-branch/Source
- Revision
- 248482
- Author
- alanc...@apple.com
- Date
- 2019-08-09 15:06:13 -0700 (Fri, 09 Aug 2019)
Log Message
Cherry-pick r248462. rdar://problem/54144119
[Win] Fix internal build
https://bugs.webkit.org/show_bug.cgi?id=200519
Reviewed by Alex Christensen.
Source/_javascript_Core:
The script 'generate-js-builtins.py' cannot be found when building WebCore. Copy the _javascript_Core Scripts
folder after building JSC.
* _javascript_Core.vcxproj/_javascript_Core.proj:
Source/WebKitLegacy/win:
Switch to the String::wideCharacers method, since its return type is compatible with the Win32 api.
* WebDownloadCFNet.cpp:
(WebDownload::didFinish):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248462 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608-branch/Source/_javascript_Core/ChangeLog (248481 => 248482)
--- branches/safari-608-branch/Source/_javascript_Core/ChangeLog 2019-08-09 22:01:39 UTC (rev 248481)
+++ branches/safari-608-branch/Source/_javascript_Core/ChangeLog 2019-08-09 22:06:13 UTC (rev 248482)
@@ -1,3 +1,41 @@
+2019-08-09 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r248462. rdar://problem/54144119
+
+ [Win] Fix internal build
+ https://bugs.webkit.org/show_bug.cgi?id=200519
+
+ Reviewed by Alex Christensen.
+
+ Source/_javascript_Core:
+
+ The script 'generate-js-builtins.py' cannot be found when building WebCore. Copy the _javascript_Core Scripts
+ folder after building JSC.
+
+ * _javascript_Core.vcxproj/_javascript_Core.proj:
+
+ Source/WebKitLegacy/win:
+
+ Switch to the String::wideCharacers method, since its return type is compatible with the Win32 api.
+
+ * WebDownloadCFNet.cpp:
+ (WebDownload::didFinish):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248462 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-08-08 Per Arne Vollan <pvol...@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 _javascript_Core Scripts
+ folder after building JSC.
+
+ * _javascript_Core.vcxproj/_javascript_Core.proj:
+
2019-08-06 Alan Coon <alanc...@apple.com>
Apply patch. rdar://problem/53992160
Modified: branches/safari-608-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (248481 => 248482)
--- branches/safari-608-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2019-08-09 22:01:39 UTC (rev 248481)
+++ branches/safari-608-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2019-08-09 22:06:13 UTC (rev 248482)
@@ -68,6 +68,9 @@
<CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\_javascript_Core\**\*.*">
<Output TaskParameter="Include" ItemName="IncFiles" />
</CreateItem>
+ <CreateItem Include="$(ConfigurationBuildDir)\include\private\_javascript_Core\Scripts\**\*.*">
+ <Output TaskParameter="Include" ItemName="Scripts" />
+ </CreateItem>
<CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\_javascript_Core\inspector\**\*.*">
<Output TaskParameter="Include" ItemName="InspectorFiles" />
</CreateItem>
@@ -112,6 +115,7 @@
</CreateItem>
<Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\_javascript_Core\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <Copy SourceFiles="@(Scripts)" DestinationFiles="@(Scripts->'$(DSTROOT)\AppleInternal\include\private\_javascript_Core\Scripts\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(InspectorFiles)" DestinationFiles="@(InspectorFiles->'$(DSTROOT)\AppleInternal\include\private\_javascript_Core\inspector\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(APIFiles)" DestinationFiles="@(APIFiles->'$(DSTROOT)\AppleInternal\include\_javascript_Core\%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
Modified: branches/safari-608-branch/Source/WebKitLegacy/win/ChangeLog (248481 => 248482)
--- branches/safari-608-branch/Source/WebKitLegacy/win/ChangeLog 2019-08-09 22:01:39 UTC (rev 248481)
+++ branches/safari-608-branch/Source/WebKitLegacy/win/ChangeLog 2019-08-09 22:06:13 UTC (rev 248482)
@@ -1,3 +1,41 @@
+2019-08-09 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r248462. rdar://problem/54144119
+
+ [Win] Fix internal build
+ https://bugs.webkit.org/show_bug.cgi?id=200519
+
+ Reviewed by Alex Christensen.
+
+ Source/_javascript_Core:
+
+ The script 'generate-js-builtins.py' cannot be found when building WebCore. Copy the _javascript_Core Scripts
+ folder after building JSC.
+
+ * _javascript_Core.vcxproj/_javascript_Core.proj:
+
+ Source/WebKitLegacy/win:
+
+ Switch to the String::wideCharacers method, since its return type is compatible with the Win32 api.
+
+ * WebDownloadCFNet.cpp:
+ (WebDownload::didFinish):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248462 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-08-08 Per Arne Vollan <pvol...@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-06 Alan Coon <alanc...@apple.com>
Apply patch. rdar://problem/53992160
Modified: branches/safari-608-branch/Source/WebKitLegacy/win/WebDownloadCFNet.cpp (248481 => 248482)
--- branches/safari-608-branch/Source/WebKitLegacy/win/WebDownloadCFNet.cpp 2019-08-09 22:01:39 UTC (rev 248481)
+++ branches/safari-608-branch/Source/WebKitLegacy/win/WebDownloadCFNet.cpp 2019-08-09 22:06:13 UTC (rev 248482)
@@ -467,7 +467,7 @@
// 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());
bool reportBundlePathAsFinalPath = true;
@@ -479,7 +479,7 @@
// The call to m_delegate->decideDestinationWithSuggestedFilename() should have changed our destination, so we'll try the move
// 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;
// We either need to tell the delegate our final filename is the bundle filename, or is the file name they just told us to use
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
