[webkit-changes] [194183] trunk/Source

Wed, 16 Dec 2015 15:37:19 -0800

Title: [194183] trunk/Source
Revision
194183
Author
[email protected]
Date
2015-12-16 15:36:49 -0800 (Wed, 16 Dec 2015)

Log Message

Fix internal Windows build
https://bugs.webkit.org/show_bug.cgi?id=152364
Source/_javascript_Core:


Reviewed by Tim Horton.

* _javascript_Core.vcxproj/_javascript_Core.proj:

Source/WebCore:

rdar://problem/23928759

Reviewed by Tim Horton.

* WebCore.vcxproj/WebCore.proj:

Source/WebKit:

rdar://problem/23928759

Reviewed by Tim Horton.

* WebKit.vcxproj/WebKit.proj:

Source/WTF:

rdar://problem/23928759

Reviewed by Tim Horton.

* WTF.vcxproj/WTF.proj:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (194182 => 194183)


--- trunk/Source/_javascript_Core/ChangeLog	2015-12-16 23:27:39 UTC (rev 194182)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-12-16 23:36:49 UTC (rev 194183)
@@ -1,3 +1,12 @@
+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  Filip Pizlo  <[email protected]>
 
         Improve JSObject::put performance

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (194182 => 194183)


--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj	2015-12-16 23:27:39 UTC (rev 194182)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj	2015-12-16 23:36:49 UTC (rev 194183)
@@ -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: trunk/Source/WTF/ChangeLog (194182 => 194183)


--- trunk/Source/WTF/ChangeLog	2015-12-16 23:27:39 UTC (rev 194182)
+++ trunk/Source/WTF/ChangeLog	2015-12-16 23:36:49 UTC (rev 194183)
@@ -1,3 +1,13 @@
+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-16  Youenn Fablet  <[email protected]>
 
         [Fetch API] Add fetch API compile time flag

Modified: trunk/Source/WTF/WTF.vcxproj/WTF.proj (194182 => 194183)


--- trunk/Source/WTF/WTF.vcxproj/WTF.proj	2015-12-16 23:27:39 UTC (rev 194182)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.proj	2015-12-16 23:36:49 UTC (rev 194183)
@@ -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: trunk/Source/WebCore/ChangeLog (194182 => 194183)


--- trunk/Source/WebCore/ChangeLog	2015-12-16 23:27:39 UTC (rev 194182)
+++ trunk/Source/WebCore/ChangeLog	2015-12-16 23:36:49 UTC (rev 194183)
@@ -1,3 +1,13 @@
+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-16  Brady Eidson  <[email protected]>
 
         Modern IDB: Refactor UniqueIDBDatabase in preparation for consolidation open and delete requests.

Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj (194182 => 194183)


--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj	2015-12-16 23:27:39 UTC (rev 194182)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj	2015-12-16 23:36:49 UTC (rev 194183)
@@ -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: trunk/Source/WebKit/ChangeLog (194182 => 194183)


--- trunk/Source/WebKit/ChangeLog	2015-12-16 23:27:39 UTC (rev 194182)
+++ trunk/Source/WebKit/ChangeLog	2015-12-16 23:36:49 UTC (rev 194183)
@@ -1,3 +1,13 @@
+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-12-02  Antti Koivisto  <[email protected]>
 
         Move ResourceLoadScheduler to WebKit1

Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj (194182 => 194183)


--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj	2015-12-16 23:27:39 UTC (rev 194182)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj	2015-12-16 23:36:49 UTC (rev 194183)
@@ -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