Unreviewed. Touchups to VS2010 WebKit solution.
authorroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Feb 2013 02:00:12 +0000 (02:00 +0000)
committerroger_fong@apple.com <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Feb 2013 02:00:12 +0000 (02:00 +0000)
Fix an export generator script, modify some property sheets, add resouce file.
Add WinLauncher projects to solution.

* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorDebug.props:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorRelease.props:
* JavaScriptCore.vcxproj/resource.h: Added.
* WebKit.vcxproj/WebKit.sln:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorDebug.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorRelease.props
Source/JavaScriptCore/JavaScriptCore.vcxproj/resource.h [new file with mode: 0644]
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKit.sln

index 3244eb4..2e18d3c 100644 (file)
@@ -1,3 +1,13 @@
+2013-02-06  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Touchups to VS2010 WebKit solution.
+        Fix an export generator script, modify some property sheets, add resouce file.
+
+        * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorDebug.props:
+        * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd:
+        * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorRelease.props:
+        * JavaScriptCore.vcxproj/resource.h: Added.
+
 2013-02-06  Ilya Tikhonovsky  <loislo@chromium.org>
 
         Web Inspector: Native Memory Instrumentation: assign class name to the heap graph node automatically
index 2346a0f..6e5efff 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />\r
     <Import Project="JavaScriptCoreExportGeneratorCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
index fe747c6..97f1be9 100644 (file)
@@ -1,8 +1,9 @@
 set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj\JavaScriptCoreExportGenerator
-echo Exporting link definition output (%GeneratorDirectory%\JavaScriptCoreExports.def)
-if exist "%OUTDIR%\JavaScriptCoreExportGenerator.exe" "%OUTDIR%\JavaScriptCoreExportGenerator.exe" > "%GeneratorDirectory%\JavaScriptCoreExports.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%\JavaScriptCoreExports.def)
+if exist "%OUTDIR%\JavaScriptCoreExportGenerator.exe" "%OUTDIR%\JavaScriptCoreExportGenerator.exe" > "%GeneratorDirectory%\JavaScriptCoreExports.def"
+
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
index 70c7194..9e61318 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.props" />\r
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\release.props" />\r
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />\r
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />\r
     <Import Project="JavaScriptCoreExportGeneratorCommon.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/resource.h b/Source/JavaScriptCore/JavaScriptCore.vcxproj/resource.h
new file mode 100644 (file)
index 0000000..e52790d
--- /dev/null
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}\r
+// Microsoft Visual C++ generated include file.\r
+// Used by JavaScriptCore.rc\r
+\r
+// Next default values for new objects\r
+// \r
+#ifdef APSTUDIO_INVOKED\r
+#ifndef APSTUDIO_READONLY_SYMBOLS\r
+#define _APS_NEXT_RESOURCE_VALUE        101\r
+#define _APS_NEXT_COMMAND_VALUE         40001\r
+#define _APS_NEXT_CONTROL_VALUE         1001\r
+#define _APS_NEXT_SYMED_VALUE           101\r
+#endif\r
+#endif\r
index 8068c41..5978175 100644 (file)
@@ -1,3 +1,10 @@
+2013-02-06  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Touchups to VS2010 WebKit solution.
+        Add WinLauncher projects to solution.
+
+        * WebKit.vcxproj/WebKit.sln:
+
 2013-02-05  Roger Fong  <roger_fong@apple.com>
 
         Unreviewed. Get rid of redundant exports in export definitions file.
index 739f05c..3f503c6 100644 (file)
@@ -97,6 +97,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreExportGenerat
                {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 @@ Global
                {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 @@ Global
                {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