Diff
Modified: branches/safari-612.1.15.4-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (280596 => 280597)
--- branches/safari-612.1.15.4-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2021-08-03 16:50:38 UTC (rev 280597)
@@ -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.15.4-branch/Source/Makefile (280596 => 280597)
--- branches/safari-612.1.15.4-branch/Source/Makefile 2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/Makefile 2021-08-03 16:50:38 UTC (rev 280597)
@@ -1,3 +1,4 @@
+SAFARITOOLS_MODULE =
WEBINSPECTORUI_MODULE =
TO_LOWER = $(shell echo $(1) | tr [:upper:] [:lower:])
@@ -10,6 +11,9 @@
WEBINSPECTORUI_MODULE = WebInspectorUI
endif
else
+ ifeq ($(MAKECMDGOALS),installsrc)
+ SAFARITOOLS_MODULE = cmake
+ endif
WEBINSPECTORUI_MODULE = WebInspectorUI
endif
@@ -17,7 +21,7 @@
WEBINSPECTORUI_MODULE =
endif
-MODULES = bmalloc WTF _javascript_Core ThirdParty WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit
+MODULES = $(SAFARITOOLS_MODULE) bmalloc WTF _javascript_Core ThirdParty WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit $(SAFARITOOLS_MODULE)
define build_target_for_each_module
for dir in $(MODULES); do \
Modified: branches/safari-612.1.15.4-branch/Source/WTF/WTF.vcxproj/WTF.proj (280596 => 280597)
--- branches/safari-612.1.15.4-branch/Source/WTF/WTF.vcxproj/WTF.proj 2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/WTF/WTF.vcxproj/WTF.proj 2021-08-03 16:50:38 UTC (rev 280597)
@@ -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.15.4-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj (280596 => 280597)
--- branches/safari-612.1.15.4-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj 2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj 2021-08-03 16:50:38 UTC (rev 280597)
@@ -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.15.4-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (280596 => 280597)
--- branches/safari-612.1.15.4-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2021-08-03 16:50:38 UTC (rev 280597)
@@ -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.15.4-branch/Source/cmake/WinTools.make (280596 => 280597)
--- branches/safari-612.1.15.4-branch/Source/cmake/WinTools.make 2021-08-03 16:44:02 UTC (rev 280596)
+++ branches/safari-612.1.15.4-branch/Source/cmake/WinTools.make 2021-08-03 16:50:38 UTC (rev 280597)
@@ -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
