Title: [142060] trunk/Source
- Revision
- 142060
- Author
- roger_f...@apple.com
- Date
- 2013-02-06 18:00:12 -0800 (Wed, 06 Feb 2013)
Log Message
Unreviewed. Touchups to VS2010 WebKit solution.
Fix an export generator script, modify some property sheets, add resouce file.
Add WinLauncher projects to solution.
* _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorDebug.props:
* _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd:
* _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorRelease.props:
* _javascript_Core.vcxproj/resource.h: Added.
* WebKit.vcxproj/WebKit.sln:
Modified Paths
Added Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (142059 => 142060)
--- trunk/Source/_javascript_Core/ChangeLog 2013-02-07 01:52:35 UTC (rev 142059)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-02-07 02:00:12 UTC (rev 142060)
@@ -1,3 +1,13 @@
+2013-02-06 Roger Fong <roger_f...@apple.com>
+
+ Unreviewed. Touchups to VS2010 WebKit solution.
+ Fix an export generator script, modify some property sheets, add resouce file.
+
+ * _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorDebug.props:
+ * _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd:
+ * _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorRelease.props:
+ * _javascript_Core.vcxproj/resource.h: Added.
+
2013-02-06 Ilya Tikhonovsky <loi...@chromium.org>
Web Inspector: Native Memory Instrumentation: assign class name to the heap graph node automatically
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorDebug.props (142059 => 142060)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorDebug.props 2013-02-07 01:52:35 UTC (rev 142059)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorDebug.props 2013-02-07 02:00:12 UTC (rev 142060)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.props" />
- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
<Import Project="_javascript_CoreExportGeneratorCommon.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd (142059 => 142060)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd 2013-02-07 01:52:35 UTC (rev 142059)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorPostBuild.cmd 2013-02-07 02:00:12 UTC (rev 142060)
@@ -1,8 +1,9 @@
set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj\_javascript_CoreExportGenerator
-echo Exporting link definition output (%GeneratorDirectory%\_javascript_CoreExports.def)
-if exist "%OUTDIR%\_javascript_CoreExportGenerator.exe" "%OUTDIR%\_javascript_CoreExportGenerator.exe" > "%GeneratorDirectory%\_javascript_CoreExports.def"
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin"
if exist "%WebKit_Libraries%\bin\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
+echo Exporting link definition output (%GeneratorDirectory%\_javascript_CoreExports.def)
+if exist "%OUTDIR%\_javascript_CoreExportGenerator.exe" "%OUTDIR%\_javascript_CoreExportGenerator.exe" > "%GeneratorDirectory%\_javascript_CoreExports.def"
+
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorRelease.props (142059 => 142060)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorRelease.props 2013-02-07 01:52:35 UTC (rev 142059)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorRelease.props 2013-02-07 02:00:12 UTC (rev 142060)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.props" />
- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\release.props" />
- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />
<Import Project="_javascript_CoreExportGeneratorCommon.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
Added: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/resource.h (0 => 142060)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/resource.h (rev 0)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/resource.h 2013-02-07 02:00:12 UTC (rev 142060)
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by _javascript_Core.rc
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
Modified: trunk/Source/WebKit/ChangeLog (142059 => 142060)
--- trunk/Source/WebKit/ChangeLog 2013-02-07 01:52:35 UTC (rev 142059)
+++ trunk/Source/WebKit/ChangeLog 2013-02-07 02:00:12 UTC (rev 142060)
@@ -1,3 +1,10 @@
+2013-02-06 Roger Fong <roger_f...@apple.com>
+
+ Unreviewed. Touchups to VS2010 WebKit solution.
+ Add WinLauncher projects to solution.
+
+ * WebKit.vcxproj/WebKit.sln:
+
2013-02-05 Roger Fong <roger_f...@apple.com>
Unreviewed. Get rid of redundant exports in export definitions file.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (142059 => 142060)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-02-07 01:52:35 UTC (rev 142059)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-02-07 02:00:12 UTC (rev 142060)
@@ -97,6 +97,18 @@
{9221744B-5715-4F56-9590-42F7AB23DD8B} = {9221744B-5715-4F56-9590-42F7AB23DD8B}
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinLauncher", "WinLauncher", "{20A8616C-E56B-4649-A910-8E97751DE145}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinLauncherLib", "..\..\..\Tools\WinLauncher\WinLauncher.vcxproj\WinLauncherLib.vcxproj", "{114FCA11-216B-4C8C-957E-30A75AE80443}"
+ ProjectSection(ProjectDependencies) = postProject
+ {0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {0662A8A9-82A3-4638-97D8-EC425D8D87C9}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinLauncher", "..\..\..\Tools\WinLauncher\WinLauncher.vcxproj\WinLauncher.vcxproj", "{767B10FB-76C1-44D0-8005-85ED7F9AA5E4}"
+ ProjectSection(ProjectDependencies) = postProject
+ {114FCA11-216B-4C8C-957E-30A75AE80443} = {114FCA11-216B-4C8C-957E-30A75AE80443}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_All|Win32 = Debug_All|Win32
@@ -323,6 +335,30 @@
{BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
{BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release|Win32.ActiveCfg = Release|Win32
{BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release|Win32.Build.0 = Release|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_All|Win32.ActiveCfg = Debug|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_All|Win32.Build.0 = Debug|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.ActiveCfg = Debug|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.Build.0 = Debug|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Production|Win32.ActiveCfg = Release|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Production|Win32.Build.0 = Release|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.ActiveCfg = Release|Win32
+ {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.Build.0 = Release|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_All|Win32.ActiveCfg = Debug|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_All|Win32.Build.0 = Debug|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug|Win32.Build.0 = Debug|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Production|Win32.ActiveCfg = Release|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Production|Win32.Build.0 = Release|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.ActiveCfg = Release|Win32
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -346,5 +382,7 @@
{0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {39286F46-BA75-4997-8065-1909090A60F0}
{0F837117-8C0B-4596-A373-A37E14A01223} = {39286F46-BA75-4997-8065-1909090A60F0}
{A15EDAD8-8B87-4D4A-8498-77A04AB65F16} = {39286F46-BA75-4997-8065-1909090A60F0}
+ {114FCA11-216B-4C8C-957E-30A75AE80443} = {20A8616C-E56B-4649-A910-8E97751DE145}
+ {767B10FB-76C1-44D0-8005-85ED7F9AA5E4} = {20A8616C-E56B-4649-A910-8E97751DE145}
EndGlobalSection
EndGlobal
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
