Skip to site navigation (Press enter)

[webkit-changes] [173022] trunk/Source/WebKit

bfulgham Wed, 27 Aug 2014 15:19:48 -0700

Title: [173022] trunk/Source/WebKit

Revision: 173022
Author: [email protected]
Date: 2014-08-27 15:18:37 -0700 (Wed, 27 Aug 2014)

Log Message

[Win] Unreviewed Build 'fix' after r173018.


The new launcher applications were not getting build when driven
by WebKit.sln. This adds the missing project links and dependencies.

* WebKit.vcxproj/WebKit.sln: Update to include jscLauncher,
testapiLauncher, and testRegExpLauncher.

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln

Diff

Modified: trunk/Source/WebKit/ChangeLog (173021 => 173022)


--- trunk/Source/WebKit/ChangeLog	2014-08-27 22:09:14 UTC (rev 173021)
+++ trunk/Source/WebKit/ChangeLog	2014-08-27 22:18:37 UTC (rev 173022)
@@ -1,3 +1,13 @@
+2014-08-27  Brent Fulgham  <[email protected]>
+
+        [Win] Unreviewed Build 'fix' after r173018.
+
+        The new launcher applications were not getting build when driven
+        by WebKit.sln. This adds the missing project links and dependencies.
+
+        * WebKit.vcxproj/WebKit.sln: Update to include jscLauncher,
+        testapiLauncher, and testRegExpLauncher.
+
 2014-08-26  Andy Estes  <[email protected]>
 
         [Cocoa] Some projects are incorrectly installed to $BUILT_PRODUCTS_DIR

Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (173021 => 173022)


--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln	2014-08-27 22:09:14 UTC (rev 173021)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln	2014-08-27 22:18:37 UTC (rev 173022)
@@ -59,12 +59,12 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testRegExp", "..\..\_javascript_Core\_javascript_Core.vcxproj\testRegExp\testRegExp.vcxproj", "{BB16286B-AADC-46C1-BC0D-6C06F323E04B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2BD437CF-BDAC-4119-9ED6-E10EF46C69F3} = {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}
+		{FE09F693-9744-4D73-A17C-DE3209EB1905} = {FE09F693-9744-4D73-A17C-DE3209EB1905}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testapi", "..\..\_javascript_Core\_javascript_Core.vcxproj\testapi\testapi.vcxproj", "{5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}"
 	ProjectSection(ProjectDependencies) = postProject
-		{BB16286B-AADC-46C1-BC0D-6C06F323E04B} = {BB16286B-AADC-46C1-BC0D-6C06F323E04B}
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F} = {1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntOffsetsExtractor", "..\..\_javascript_Core\_javascript_Core.vcxproj\LLInt\LLIntOffsetsExtractor\LLIntOffsetsExtractor.vcxproj", "{D595E3F6-24F2-4C60-935C-95D50C6B3E96}"
@@ -197,6 +197,27 @@
 		{3670D01F-95F3-45A8-B878-947EB6CF214E} = {3670D01F-95F3-45A8-B878-947EB6CF214E}
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "jsc Projects", "jsc Projects", "{951D5880-28B2-4AFC-BC80-E3AAF6257735}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testapi Projects", "testapi Projects", "{0E0978C1-BB98-4644-A9FB-5D39E1737A35}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testRegExp Projects", "testRegExp Projects", "{D14BF228-BDA3-41C4-8552-4ED8EB0EACB2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jscLauncher", "..\..\_javascript_Core\_javascript_Core.vcxproj\jsc\jscLauncher.vcxproj", "{FE09F693-9744-4D73-A17C-DE3209EB1905}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2BD437CF-BDAC-4119-9ED6-E10EF46C69F3} = {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testapiLauncher", "..\..\_javascript_Core\_javascript_Core.vcxproj\testapi\testapiLauncher.vcxproj", "{FE09F693-9744-4D73-A17C-FE3209EB1905}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5CC08E13-2CF9-4C2E-8544-07DA4E8C1843} = {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testRegExpLauncher", "..\..\_javascript_Core\_javascript_Core.vcxproj\testRegExp\testRegExpLauncher.vcxproj", "{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BB16286B-AADC-46C1-BC0D-6C06F323E04B} = {BB16286B-AADC-46C1-BC0D-6C06F323E04B}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_WinCairo|Win32 = Debug_WinCairo|Win32
@@ -1057,6 +1078,78 @@
 		{F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
 		{F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Release|Win32.ActiveCfg = Release|Win32
 		{F102C44B-3AD9-445A-9DC2-3D123555E7CC}.Release|x64.ActiveCfg = Release|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Debug|Win32.Build.0 = Debug|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Debug|x64.ActiveCfg = Debug|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Debug|x64.Build.0 = Debug|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Production|Win32.ActiveCfg = Production|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Production|Win32.Build.0 = Production|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Production|x64.ActiveCfg = Production|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Production|x64.Build.0 = Production|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Release|Win32.ActiveCfg = Release|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Release|Win32.Build.0 = Release|Win32
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Release|x64.ActiveCfg = Release|x64
+		{FE09F693-9744-4D73-A17C-DE3209EB1905}.Release|x64.Build.0 = Release|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Debug|Win32.Build.0 = Debug|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Debug|x64.ActiveCfg = Debug|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Debug|x64.Build.0 = Debug|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Production|Win32.ActiveCfg = Production|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Production|Win32.Build.0 = Production|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Production|x64.ActiveCfg = Production|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Production|x64.Build.0 = Production|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Release|Win32.ActiveCfg = Release|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Release|Win32.Build.0 = Release|Win32
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Release|x64.ActiveCfg = Release|x64
+		{FE09F693-9744-4D73-A17C-FE3209EB1905}.Release|x64.Build.0 = Release|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Debug|Win32.Build.0 = Debug|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Debug|x64.ActiveCfg = Debug|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Debug|x64.Build.0 = Debug|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Production|Win32.ActiveCfg = Production|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Production|Win32.Build.0 = Production|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Production|x64.ActiveCfg = Production|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Production|x64.Build.0 = Production|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Release|Win32.ActiveCfg = Release|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Release|Win32.Build.0 = Release|Win32
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Release|x64.ActiveCfg = Release|x64
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1066,13 +1159,13 @@
 		{F7366596-0520-4433-B8FF-D843E31E5199} = {7F982CAD-225B-4FCE-9937-3B72C14D968D}
 		{3670D01F-95F3-45A8-B878-947EB6CF214E} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
 		{22413D41-3A18-42B7-92A8-CEDC6CE86920} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
-		{2BD437CF-BDAC-4119-9ED6-E10EF46C69F3} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
-		{BB16286B-AADC-46C1-BC0D-6C06F323E04B} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
-		{5CC08E13-2CF9-4C2E-8544-07DA4E8C1843} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
 		{D595E3F6-24F2-4C60-935C-95D50C6B3E96} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
 		{877150A0-41B3-4730-9D98-1B8298098B14} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
 		{9221744B-5715-4F56-9590-42F7AB23DD8B} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
 		{F102C44B-3AD9-445A-9DC2-3D123555E7CC} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
+		{951D5880-28B2-4AFC-BC80-E3AAF6257735} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
+		{0E0978C1-BB98-4644-A9FB-5D39E1737A35} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
+		{D14BF228-BDA3-41C4-8552-4ED8EB0EACB2} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {4A894588-A951-4E76-A085-50E10304DC40}
 		{A4159B6F-3106-4F75-9EDD-582307BDB96A} = {4A894588-A951-4E76-A085-50E10304DC40}
 		{83414B15-1C0D-490B-990E-03F4D49170E4} = {4A894588-A951-4E76-A085-50E10304DC40}
@@ -1102,5 +1195,11 @@
 		{23C3AC97-A1BF-4188-A092-8C78CF022DD7} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
 		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
 		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
+		{2BD437CF-BDAC-4119-9ED6-E10EF46C69F3} = {951D5880-28B2-4AFC-BC80-E3AAF6257735}
+		{FE09F693-9744-4D73-A17C-DE3209EB1905} = {951D5880-28B2-4AFC-BC80-E3AAF6257735}
+		{5CC08E13-2CF9-4C2E-8544-07DA4E8C1843} = {0E0978C1-BB98-4644-A9FB-5D39E1737A35}
+		{FE09F693-9744-4D73-A17C-FE3209EB1905} = {0E0978C1-BB98-4644-A9FB-5D39E1737A35}
+		{BB16286B-AADC-46C1-BC0D-6C06F323E04B} = {D14BF228-BDA3-41C4-8552-4ED8EB0EACB2}
+		{1B8A5CB0-D0CF-4458-8247-8FBA5C6EA20F} = {D14BF228-BDA3-41C4-8552-4ED8EB0EACB2}
 	EndGlobalSection
 EndGlobal

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