[webkit-changes] [281150] branches/safari-612.1.28-branch/Source

Tue, 17 Aug 2021 11:42:26 -0700

Title: [281150] branches/safari-612.1.28-branch/Source
Revision
281150
Author
[email protected]
Date
2021-08-17 11:41:51 -0700 (Tue, 17 Aug 2021)

Log Message

Cherry-pick r280597. rdar://problem/82038333

    Speculative build fix. rdar://79147214.

    git-svn-id: https://svn.webkit.org/repository/webkit/branches/safari-612.1.15.4-branch@280597 268f45cc-cd09-0410-ab3c-d52691b4dbfc

    git-svn-id: https://svn.webkit.org/repository/webkit/branches/safari-612.1.15.4-branch@280792 268f45cc-cd09-0410-ab3c-d52691b4dbfc

    git-svn-id: https://svn.webkit.org/repository/webkit/branches/safari-612.1.15.4-branch@280800 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-612.1.28-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (281149 => 281150)


--- branches/safari-612.1.28-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj	2021-08-17 18:20:09 UTC (rev 281149)
+++ branches/safari-612.1.28-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj	2021-08-17 18:41:51 UTC (rev 281150)
@@ -28,7 +28,8 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
-	<CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
+    <SourceSubdirectory>\Source\_javascript_Core</SourceSubdirectory>
+	<CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
   </PropertyGroup>
  
   <!-- Prepare for build -->
@@ -74,7 +75,7 @@
     <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\_javascript_Core\inspector\**\*.*">
       <Output TaskParameter="Include" ItemName="InspectorFiles" />
     </CreateItem>
-    <CreateItem Include="$(SRCROOT)\API\*.h">
+    <CreateItem Include="$(SRCROOT)$(SourceSubdirectory)\API\*.h">
       <Output TaskParameter="Include" ItemName="APIFiles" />
     </CreateItem>
     <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">

Modified: branches/safari-612.1.28-branch/Source/Makefile (281149 => 281150)


--- branches/safari-612.1.28-branch/Source/Makefile	2021-08-17 18:20:09 UTC (rev 281149)
+++ branches/safari-612.1.28-branch/Source/Makefile	2021-08-17 18:41:51 UTC (rev 281150)
@@ -50,3 +50,4 @@
 
 installsrc:
 	@$(build_target_for_each_module)
+	cp -R ../Source/cmake $(SRCROOT)/Source/

Modified: branches/safari-612.1.28-branch/Source/WTF/WTF.vcxproj/WTF.proj (281149 => 281150)


--- branches/safari-612.1.28-branch/Source/WTF/WTF.vcxproj/WTF.proj	2021-08-17 18:20:09 UTC (rev 281149)
+++ branches/safari-612.1.28-branch/Source/WTF/WTF.vcxproj/WTF.proj	2021-08-17 18:41:51 UTC (rev 281150)
@@ -28,7 +28,8 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
-	<CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWTF_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
+    <SourceSubdirectory>\Source\WTF</SourceSubdirectory>
+	<CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWTF_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
   </PropertyGroup>
 
   <!-- Prepare for build -->

Modified: branches/safari-612.1.28-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj (281149 => 281150)


--- branches/safari-612.1.28-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj	2021-08-17 18:20:09 UTC (rev 281149)
+++ branches/safari-612.1.28-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj	2021-08-17 18:41:51 UTC (rev 281150)
@@ -28,7 +28,8 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
-	<CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/')) -DPAL_DIR=$(SRCROOT.Replace('\','/'))/PAL</CMakeCommandCommon>
+    <SourceSubdirectory>\Source\WebCore</SourceSubdirectory>
+	<CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/')) -DPAL_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))/PAL</CMakeCommandCommon>
   </PropertyGroup>
  
   <!-- Prepare for build -->

Modified: branches/safari-612.1.28-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (281149 => 281150)


--- branches/safari-612.1.28-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2021-08-17 18:20:09 UTC (rev 281149)
+++ branches/safari-612.1.28-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2021-08-17 18:41:51 UTC (rev 281150)
@@ -28,7 +28,8 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
-	<CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
+    <SourceSubdirectory>\Source\WebKitLegacy</SourceSubdirectory>
+	<CMakeCommandCommon>cmake $(SRCROOT)$(SourceSubdirectory) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))$(SourceSubdirectory.Replace('\','/'))</CMakeCommandCommon>
   </PropertyGroup>
  
   <!-- Prepare for build -->

Modified: branches/safari-612.1.28-branch/Source/cmake/WinTools.make (281149 => 281150)


--- branches/safari-612.1.28-branch/Source/cmake/WinTools.make	2021-08-17 18:20:09 UTC (rev 281149)
+++ branches/safari-612.1.28-branch/Source/cmake/WinTools.make	2021-08-17 18:41:51 UTC (rev 281150)
@@ -1,4 +1,4 @@
 install:
-    xcopy "$(SRCROOT)\*.cmake" "$(DSTROOT)\AppleInternal\tools\cmake" /e/v/i/h/y
-    xcopy "$(SRCROOT)\tools\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
-    xcopy "$(SRCROOT)\tools\vsprops\*" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
+    xcopy "$(SRCROOT)\Source\cmake\*.cmake" "$(DSTROOT)\AppleInternal\tools\cmake" /e/v/i/h/y
+    xcopy "$(SRCROOT)\Source\cmake\tools\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
+    xcopy "$(SRCROOT)\Source\cmake\tools\vsprops\*" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to