[webkit-changes] [194190] tags/Safari-602.1.13.4/Source

Wed, 16 Dec 2015 17:01:33 -0800

Title: [194190] tags/Safari-602.1.13.4/Source

Diff

Modified: tags/Safari-602.1.13.4/Source/_javascript_Core/ChangeLog (194189 => 194190)


--- tags/Safari-602.1.13.4/Source/_javascript_Core/ChangeLog	2015-12-17 00:59:08 UTC (rev 194189)
+++ tags/Safari-602.1.13.4/Source/_javascript_Core/ChangeLog	2015-12-17 01:01:22 UTC (rev 194190)
@@ -1,5 +1,18 @@
 2015-12-16  Babak Shafiei  <[email protected]>
 
+        Merge r194183.
+
+    2015-12-16  Alex Christensen  <[email protected]>
+
+            Fix internal Windows build
+            https://bugs.webkit.org/show_bug.cgi?id=152364
+
+            Reviewed by Tim Horton.
+
+            * _javascript_Core.vcxproj/_javascript_Core.proj:
+
+2015-12-16  Babak Shafiei  <[email protected]>
+
         Merge r193355.
 
     2015-12-03  Joseph Pecoraro  <[email protected]>

Modified: tags/Safari-602.1.13.4/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (194189 => 194190)


--- tags/Safari-602.1.13.4/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj	2015-12-17 00:59:08 UTC (rev 194189)
+++ tags/Safari-602.1.13.4/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj	2015-12-17 01:01:22 UTC (rev 194190)
@@ -28,7 +28,7 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
-	<CMakeCommandCommon>cmake $(SRCROOT)/_javascript_Core -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))/_javascript_Core</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) -DJAVASCRIPTCORE_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
   </PropertyGroup>
  
   <!-- Prepare for build -->

Modified: tags/Safari-602.1.13.4/Source/WTF/ChangeLog (194189 => 194190)


--- tags/Safari-602.1.13.4/Source/WTF/ChangeLog	2015-12-17 00:59:08 UTC (rev 194189)
+++ tags/Safari-602.1.13.4/Source/WTF/ChangeLog	2015-12-17 01:01:22 UTC (rev 194190)
@@ -1,3 +1,17 @@
+2015-12-16  Babak Shafiei  <[email protected]>
+
+        Merge r194183.
+
+    2015-12-16  Alex Christensen  <[email protected]>
+
+            Fix internal Windows build
+            https://bugs.webkit.org/show_bug.cgi?id=152364
+            rdar://problem/23928759
+
+            Reviewed by Tim Horton.
+
+            * WTF.vcxproj/WTF.proj:
+
 2015-12-01  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r192914.

Modified: tags/Safari-602.1.13.4/Source/WTF/WTF.vcxproj/WTF.proj (194189 => 194190)


--- tags/Safari-602.1.13.4/Source/WTF/WTF.vcxproj/WTF.proj	2015-12-17 00:59:08 UTC (rev 194189)
+++ tags/Safari-602.1.13.4/Source/WTF/WTF.vcxproj/WTF.proj	2015-12-17 01:01:22 UTC (rev 194190)
@@ -28,7 +28,7 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
-	<CMakeCommandCommon>cmake $(SRCROOT)/WTF -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DWTF_DIR=$(SRCROOT.Replace('\','/'))/WTF</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) -DWTF_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
   </PropertyGroup>
 
   <!-- Prepare for build -->

Modified: tags/Safari-602.1.13.4/Source/WebCore/ChangeLog (194189 => 194190)


--- tags/Safari-602.1.13.4/Source/WebCore/ChangeLog	2015-12-17 00:59:08 UTC (rev 194189)
+++ tags/Safari-602.1.13.4/Source/WebCore/ChangeLog	2015-12-17 01:01:22 UTC (rev 194190)
@@ -1,3 +1,17 @@
+2015-12-16  Babak Shafiei  <[email protected]>
+
+        Merge r194183.
+
+    2015-12-16  Alex Christensen  <[email protected]>
+
+            Fix internal Windows build
+            https://bugs.webkit.org/show_bug.cgi?id=152364
+            rdar://problem/23928759
+
+            Reviewed by Tim Horton.
+
+            * WebCore.vcxproj/WebCore.proj:
+
 2015-12-09  Babak Shafiei  <[email protected]>
 
         Merge r193645.

Modified: tags/Safari-602.1.13.4/Source/WebCore/WebCore.vcxproj/WebCore.proj (194189 => 194190)


--- tags/Safari-602.1.13.4/Source/WebCore/WebCore.vcxproj/WebCore.proj	2015-12-17 00:59:08 UTC (rev 194189)
+++ tags/Safari-602.1.13.4/Source/WebCore/WebCore.vcxproj/WebCore.proj	2015-12-17 01:01:22 UTC (rev 194190)
@@ -28,7 +28,7 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
-	<CMakeCommandCommon>cmake $(SRCROOT)/WebCore -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) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/'))/WebCore</CMakeCommandCommon>
+	<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) -DWEBCORE_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
   </PropertyGroup>
  
   <!-- Prepare for build -->

Modified: tags/Safari-602.1.13.4/Source/WebKit/ChangeLog (194189 => 194190)


--- tags/Safari-602.1.13.4/Source/WebKit/ChangeLog	2015-12-17 00:59:08 UTC (rev 194189)
+++ tags/Safari-602.1.13.4/Source/WebKit/ChangeLog	2015-12-17 01:01:22 UTC (rev 194190)
@@ -1,3 +1,17 @@
+2015-12-16  Babak Shafiei  <[email protected]>
+
+        Merge r194183.
+
+    2015-12-16  Alex Christensen  <[email protected]>
+
+            Fix internal Windows build
+            https://bugs.webkit.org/show_bug.cgi?id=152364
+            rdar://problem/23928759
+
+            Reviewed by Tim Horton.
+
+            * WebKit.vcxproj/WebKit.proj:
+
 2015-10-29  Alex Christensen  <[email protected]>
 
         Make WebCore a framework in Mac CMake build

Modified: tags/Safari-602.1.13.4/Source/WebKit/WebKit.vcxproj/WebKit.proj (194189 => 194190)


--- tags/Safari-602.1.13.4/Source/WebKit/WebKit.vcxproj/WebKit.proj	2015-12-17 00:59:08 UTC (rev 194189)
+++ tags/Safari-602.1.13.4/Source/WebKit/WebKit.vcxproj/WebKit.proj	2015-12-17 01:01:22 UTC (rev 194190)
@@ -28,7 +28,7 @@
     <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
     <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>  
     <OutputDirectory>$(DSTROOT)</OutputDirectory>
-	<CMakeCommandCommon>cmake $(SRCROOT)/WebKit -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/'))/WebKit</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) -DWEBKIT_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