Changeset 142060 in webkit


Ignore:
Timestamp:
Feb 6, 2013, 6:00:12 PM (12 years ago)
Author:
roger_fong@apple.com
Message:

Unreviewed. Touchups to VS2010 WebKit solution.
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:
Location:
trunk/Source
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r141992 r142060  
     12013-02-06  Roger Fong  <roger_fong@apple.com>
     2
     3        Unreviewed. Touchups to VS2010 WebKit solution.
     4        Fix an export generator script, modify some property sheets, add resouce file.
     5
     6        * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorDebug.props:
     7        * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd:
     8        * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorRelease.props:
     9        * JavaScriptCore.vcxproj/resource.h: Added.
     10
    1112013-02-06  Ilya Tikhonovsky  <loislo@chromium.org>
    212

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorDebug.props

    r141939 r142060  
    22<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ImportGroup Label="PropertySheets">
    4     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.props" />
    5     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
    6     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.props" />
     4    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />
     5    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     6    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
    77    <Import Project="JavaScriptCoreExportGeneratorCommon.props" />
    88  </ImportGroup>

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorPostBuild.cmd

    r141939 r142060  
    11set GeneratorDirectory=%CONFIGURATIONBUILDDIR%\obj\JavaScriptCoreExportGenerator
    2 echo Exporting link definition output (%GeneratorDirectory%\JavaScriptCoreExports.def)
    3 if exist "%OUTDIR%\JavaScriptCoreExportGenerator.exe" "%OUTDIR%\JavaScriptCoreExportGenerator.exe" > "%GeneratorDirectory%\JavaScriptCoreExports.def"
    42
    53mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin"
    64if exist "%WebKit_Libraries%\bin\pthreadVC2.dll" xcopy /y /d "%WebKit_Libraries%\bin\pthreadVC2.dll" "%CONFIGURATIONBUILDDIR%\bin"
    75
     6echo Exporting link definition output (%GeneratorDirectory%\JavaScriptCoreExports.def)
     7if exist "%OUTDIR%\JavaScriptCoreExportGenerator.exe" "%OUTDIR%\JavaScriptCoreExportGenerator.exe" > "%GeneratorDirectory%\JavaScriptCoreExports.def"
     8
    89if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGeneratorRelease.props

    r141939 r142060  
    22<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ImportGroup Label="PropertySheets">
    4     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.props" />
    5     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
    6     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\release.props" />
    7     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.props" />
     4    <Import Project="$(WebKit_Libraries)\tools\vsprops\FeatureDefines.props" />
     5    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     6    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
     7    <Import Project="$(WebKit_Libraries)\tools\vsprops\releaseproduction.props" />
    88    <Import Project="JavaScriptCoreExportGeneratorCommon.props" />
    99  </ImportGroup>

  • trunk/Source/WebKit/ChangeLog

    r141953 r142060  
     12013-02-06  Roger Fong  <roger_fong@apple.com>
     2
     3        Unreviewed. Touchups to VS2010 WebKit solution.
     4        Add WinLauncher projects to solution.
     5
     6        * WebKit.vcxproj/WebKit.sln:
     7
    182013-02-05  Roger Fong  <roger_fong@apple.com>
    29

  • trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln

    r141939 r142060  
    9696                {3670D01F-95F3-45A8-B878-947EB6CF214E} = {3670D01F-95F3-45A8-B878-947EB6CF214E}
    9797                {9221744B-5715-4F56-9590-42F7AB23DD8B} = {9221744B-5715-4F56-9590-42F7AB23DD8B}
     98        EndProjectSection
     99EndProject
     100Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinLauncher", "WinLauncher", "{20A8616C-E56B-4649-A910-8E97751DE145}"
     101EndProject
     102Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinLauncherLib", "..\..\..\Tools\WinLauncher\WinLauncher.vcxproj\WinLauncherLib.vcxproj", "{114FCA11-216B-4C8C-957E-30A75AE80443}"
     103        ProjectSection(ProjectDependencies) = postProject
     104                {0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {0662A8A9-82A3-4638-97D8-EC425D8D87C9}
     105        EndProjectSection
     106EndProject
     107Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinLauncher", "..\..\..\Tools\WinLauncher\WinLauncher.vcxproj\WinLauncher.vcxproj", "{767B10FB-76C1-44D0-8005-85ED7F9AA5E4}"
     108        ProjectSection(ProjectDependencies) = postProject
     109                {114FCA11-216B-4C8C-957E-30A75AE80443} = {114FCA11-216B-4C8C-957E-30A75AE80443}
    98110        EndProjectSection
    99111EndProject
    … …  
    324336                {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release|Win32.ActiveCfg = Release|Win32
    325337                {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release|Win32.Build.0 = Release|Win32
     338                {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_All|Win32.ActiveCfg = Debug|Win32
     339                {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_All|Win32.Build.0 = Debug|Win32
     340                {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
     341                {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
     342                {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.ActiveCfg = Debug|Win32
     343                {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.Build.0 = Debug|Win32
     344                {114FCA11-216B-4C8C-957E-30A75AE80443}.Production|Win32.ActiveCfg = Release|Win32
     345                {114FCA11-216B-4C8C-957E-30A75AE80443}.Production|Win32.Build.0 = Release|Win32
     346                {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
     347                {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
     348                {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.ActiveCfg = Release|Win32
     349                {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.Build.0 = Release|Win32
     350                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_All|Win32.ActiveCfg = Debug|Win32
     351                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_All|Win32.Build.0 = Debug|Win32
     352                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug|Win32
     353                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_Cairo_CFLite|Win32.Build.0 = Debug|Win32
     354                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug|Win32.ActiveCfg = Debug|Win32
     355                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug|Win32.Build.0 = Debug|Win32
     356                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Production|Win32.ActiveCfg = Release|Win32
     357                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Production|Win32.Build.0 = Release|Win32
     358                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_Cairo_CFLite|Win32.ActiveCfg = Release|Win32
     359                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_Cairo_CFLite|Win32.Build.0 = Release|Win32
     360                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.ActiveCfg = Release|Win32
     361                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.Build.0 = Release|Win32
    326362        EndGlobalSection
    327363        GlobalSection(SolutionProperties) = preSolution
    … …  
    347383                {0F837117-8C0B-4596-A373-A37E14A01223} = {39286F46-BA75-4997-8065-1909090A60F0}
    348384                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16} = {39286F46-BA75-4997-8065-1909090A60F0}
     385                {114FCA11-216B-4C8C-957E-30A75AE80443} = {20A8616C-E56B-4649-A910-8E97751DE145}
     386                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4} = {20A8616C-E56B-4649-A910-8E97751DE145}
    349387        EndGlobalSection
    350388EndGlobal
Note: See TracChangeset for help on using the changeset viewer.