Title: [222366] tags/Safari-605.1.7/Source/WebKitLegacy
Revision
222366
Author
[email protected]
Date
2017-09-21 16:51:57 -0700 (Thu, 21 Sep 2017)

Log Message

Cherry-pick r222358. rdar://problem/34575958

Modified Paths

Diff

Modified: tags/Safari-605.1.7/Source/WebKitLegacy/ChangeLog (222365 => 222366)


--- tags/Safari-605.1.7/Source/WebKitLegacy/ChangeLog	2017-09-21 23:37:08 UTC (rev 222365)
+++ tags/Safari-605.1.7/Source/WebKitLegacy/ChangeLog	2017-09-21 23:51:57 UTC (rev 222366)
@@ -1,3 +1,19 @@
+2017-09-21  Jason Marcell  <[email protected]>
+
+        Cherry-pick r222358. rdar://problem/34575958
+
+    2017-09-21  Per Arne Vollan  <[email protected]>
+
+            [Win] Compile error, generate-webkitversion.pl script not found.
+            https://bugs.webkit.org/show_bug.cgi?id=177310
+
+            Reviewed by Brent Fulgham.
+
+            The script is located using the WebKitLegacy folder cmake variable, which needs
+            to be set in the project file.
+
+            * WebKitLegacy.vcxproj/WebKitLegacy.proj:
+
 2017-09-18  Michael Catanzaro  <[email protected]>
 
         [CMake] Rename WebKit target to WebKitLegacy and rename WebKit2 target to WebKit

Modified: tags/Safari-605.1.7/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (222365 => 222366)


--- tags/Safari-605.1.7/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-09-21 23:37:08 UTC (rev 222365)
+++ tags/Safari-605.1.7/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj	2017-09-21 23:51:57 UTC (rev 222366)
@@ -28,7 +28,7 @@
     <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) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
+	<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) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
   </PropertyGroup>
  
   <!-- Prepare for build -->
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to