Permalink
Browse files

Updated project and solution files for all supported versions (curren…

…tly VS2008 and VS2010 on .Net 2.0 and VS2010 on .Net 4.0).

Removed WebKit.Interop normalizer related files.
  • Loading branch information...
1 parent 21e29a4 commit dddab0e04c59f4a8402e2d04f080b7d3e1fbabba @Ashod committed Mar 4, 2012
@@ -3,7 +3,8 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>
+ </ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{B07EDAF3-CA6E-42DD-BEAA-10D3DDF998C5}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -13,15 +14,13 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <TargetFrameworkSubset>
- </TargetFrameworkSubset>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>..\bin\Debug\UnitTests\</OutputPath>
+ <OutputPath>..\bin\net2.0\Debug\UnitTests\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
@@ -38,7 +37,7 @@
</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <OutputPath>..\bin\Release\UnitTests\</OutputPath>
+ <OutputPath>..\bin\net2.0\Release\UnitTests\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -56,7 +55,9 @@
</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
+ <HintPath>c:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
+ </Reference>
<Reference Include="Moq">
<HintPath>.\Moq.dll</HintPath>
</Reference>
@@ -67,7 +68,7 @@
<Reference Include="WebKit.Interop, Version=534.0.0.0, Culture=neutral, PublicKeyToken=b967213f6d29a3be, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
- <HintPath>..\bin\WebKit.Interop.dll</HintPath>
+ <HintPath>..\bin\net2.0\WebKit.Interop.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -88,7 +89,17 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PostBuildEvent>xcopy "$(SolutionDir)webkit\*.dll" "$(TargetDir)" /S /Y</PostBuildEvent>
+ <PostBuildEvent>echo WebKitBrowser &gt; temp_exclude_files.txt
+
+
+echo .tlb &gt;&gt; temp_exclude_files.txt
+
+
+echo gitignore &gt;&gt; temp_exclude_files.txt
+
+
+xcopy /E /Y /EXCLUDE:temp_exclude_files.txt "$(SolutionDir)webkit\bin\*" "$(TargetDir)"
+del temp_exclude_files.txt</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -81,7 +81,8 @@
<ItemGroup>
<ProjectReference Include="..\JSCore\JSCore.net4.0.vcxproj">
<Project>{287EEE45-1390-44D5-982F-0B96D4A077DA}</Project>
- <Name>JSCore.net4.0</Name>
+ <Name>JSCore</Name>
+ <EmbedInteropTypes>False</EmbedInteropTypes>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -53,8 +53,10 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>
- </Command>
+ <Command>ECHO Generating WebKit.Interop...
+tlbimp "$(SolutionDir)webkit\lib\webkit.tlb" /silent /keyfile:"$(SolutionDir)WebKit.NET.snk" /namespace:WebKit.Interop /out:"$(OutDir)..\WebKit.Interop.dll"
+</Command>
+ <Message>Generating WebKit.Interop...</Message>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -76,8 +78,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>
- </Command>
+ <Command>ECHO Generating WebKit.Interop...
+tlbimp "$(SolutionDir)webkit\lib\webkit.tlb" /silent /keyfile:"$(SolutionDir)WebKit.NET.snk" /namespace:WebKit.Interop /out:"$(OutDir)..\WebKit.Interop.dll"
+</Command>
+ <Message>Generating WebKit.Interop...</Message>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)webkit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
View
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\net2.0\$(Configuration)"
+ IntermediateDirectory="$(SolutionDir)obj\net2.0\$(ProjectName)\$(Configuration)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="1"
@@ -93,8 +93,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)bin\net2.0\$(Configuration)"
+ IntermediateDirectory="$(SolutionDir)obj\net2.0\$(ProjectName)\$(Configuration)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="1"
@@ -173,7 +173,7 @@
MinFrameworkVersion="131072"
/>
<AssemblyReference
- RelativePath="..\webkit\WebKit.Interop.dll"
+ RelativePath="..\bin\net2.0\WebKit.Interop.dll"
AssemblyName="WebKit.Interop, Version=534.0.0.0, PublicKeyToken=b967213f6d29a3be, processorArchitecture=MSIL"
MinFrameworkVersion="0"
/>
View
@@ -22,13 +22,13 @@
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v90</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v90</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -42,19 +42,21 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\net2.0\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)obj\net2.0\$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\net2.0\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)obj\net2.0\$(ProjectName)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkKeyFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\WebKit.NET.snk</LinkKeyFile>
<LinkKeyFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\WebKit.NET.snk</LinkKeyFile>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>
- </Command>
+ <Command>ECHO Generating WebKit.Interop...
+tlbimp "$(SolutionDir)webkit\lib\webkit.tlb" /silent /keyfile:"$(SolutionDir)WebKit.NET.snk" /namespace:WebKit.Interop /out:"$(OutDir)..\WebKit.Interop.dll"
+</Command>
+ <Message>Generating WebKit.Interop...</Message>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -76,8 +78,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>
- </Command>
+ <Command>ECHO Generating WebKit.Interop...
+tlbimp "$(SolutionDir)webkit\lib\webkit.tlb" /silent /keyfile:"$(SolutionDir)WebKit.NET.snk" /namespace:WebKit.Interop /out:"$(OutDir)..\WebKit.Interop.dll"
+</Command>
+ <Message>Generating WebKit.Interop...</Message>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)webkit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -100,8 +104,8 @@
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
- <Reference Include="WebKit.Interop">
- <HintPath>..\webkit\bin\WebKit.Interop.dll</HintPath>
+ <Reference Include="WebKit.Interop, Version=534.0.0.0, Culture=neutral, PublicKeyToken=b967213f6d29a3be">
+ <HintPath>..\bin\net2.0\WebKit.Interop.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2009, Peter Nelson (charn.opcode@gmail.com)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* TypeNormalizer.cs -- this tool is used during the WebKit .NET build
- * process to replace references to _RemotableHandle with int32 in
- * WebKit.Interop.dll. This is required as it appears that MIDL would prefer
- * that we marshal values of type HDC to a reference to some undocumented
- * _RemotableHandle structure, which doesn't appear to work correctly.
- * Since an HDC on Win32 is simply a (void *), we can treat it as an int32
- * here.
- *
- * TODO: Fix these to IntPtrs for 64-bit compat
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.IO;
-
-class TypeNormalizer
-{
- static int Main(string[] args)
- {
- if (args.Length != 1)
- {
- Console.WriteLine("No file specified");
- return 1;
- }
-
- string file = File.ReadAllText(args[0]);
-
- file = file
- .Replace("valuetype WebKit.Interop._RemotableHandle&", "int32")
- .Replace("[in] class WebKit.Interop.IWebURLRequest", "[in] class WebKit.Interop.WebURLRequest")
- .Replace("instance class WebKit.Interop.IWebURLRequest", "instance class WebKit.Interop.WebURLRequest");
-
- File.WriteAllText(args[0], file);
- return 0;
- }
-}
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{ECF98425-04BB-4601-A527-1325B32129FE}</ProjectGuid>
- <Keyword>MakeFileProj</Keyword>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <OutDir>$(SolutionDir)bin\net4.0\</OutDir>
- <IntDir>$(SolutionDir)obj\net4.0\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <OutDir>$(SolutionDir)bin\net4.0\</OutDir>
- <IntDir>$(SolutionDir)obj\net4.0\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <NMakeOutput>$(OutDir)WebKit.Interop.dll</NMakeOutput>
- <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
- <NMakeBuildCommandLine>SET OutDir=$(OutDir)
-SET IntDir=$(IntDir)
-SET SlnDir=$(SolutionDir)
-
-:check_interop
-SET FILE1="..\webkit\lib\webkit.tlb"
-SET FILE2=%OutDir%WebKit.Interop.dll
-IF NOT EXIST "%FILE2%" GOTO:build_interop
-
-FOR %%i IN (%FILE1%) DO SET DATE1=%%~ti
-FOR %%i IN (%FILE2%) DO SET DATE2=%%~ti
-FOR /F %%i IN ('DIR /B /O:D %FILE1% %FILE2%') DO SET NEWEST=%%i
-IF "%NEWEST%"=="%FILE1%" GOTO:build_interop
-GOTO:end
-
-:build_interop
-ECHO Generating WebKit.Interop...
-tlbimp "..\webkit\lib\webkit.tlb" /silent /keyfile:"%SlnDir%WebKit.NET.snk" /namespace:WebKit.Interop /out:"%OutDir%WebKit.Interop.dll"
-
-:end</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine>SET OutDir=$(OutDir)
-SET IntDir=$(IntDir)
-SET SlnDir=$(SolutionDir)
-
-ECHO Generating WebKit.Interop...
-tlbimp "..\webkit\lib\webkit.tlb" /silent /keyfile:"%SlnDir%WebKit.NET.snk" /namespace:WebKit.Interop /out:"%OutDir%WebKit.Interop.dll"
-</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine>SET OutDir=$(OutDir)
-SET IntDir=$(IntDir)
-
-IF EXIST "%OutDir%WebKit.Interop.dll" del "%OutDir%WebKit.Interop.dll"</NMakeCleanCommandLine>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <NMakeOutput>$(OutDir)WebKit.Interop.dll</NMakeOutput>
- <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
- <NMakeBuildCommandLine>SET OutDir=$(OutDir)
-SET IntDir=$(IntDir)
-SET SlnDir=$(SolutionDir)
-
-SET OutDir=$(OutDir)
-SET IntDir=$(IntDir)
-SET SlnDir=$(SolutionDir)
-
-:check_interop
-SET FILE1="..\webkit\lib\webkit.tlb"
-SET FILE2=%OutDir%WebKit.Interop.dll
-IF NOT EXIST "%FILE2%" GOTO:build_interop
-
-FOR %%i IN (%FILE1%) DO SET DATE1=%%~ti
-FOR %%i IN (%FILE2%) DO SET DATE2=%%~ti
-FOR /F %%i IN ('DIR /B /O:D %FILE1% %FILE2%') DO SET NEWEST=%%i
-IF "%NEWEST%"=="%FILE1%" GOTO:build_interop
-GOTO:end
-
-:build_interop
-ECHO Generating WebKit.Interop...
-tlbimp "..\webkit\lib\webkit.tlb" /silent /keyfile:"%SlnDir%WebKit.NET.snk" /namespace:WebKit.Interop /out:"%OutDir%WebKit.Interop.dll"
-
-:end</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine>SET OutDir=$(OutDir)
-SET IntDir=$(IntDir)
-SET SlnDir=$(SolutionDir)
-
-ECHO Generating WebKit.Interop...
-tlbimp "..\webkit\lib\webkit.tlb" /silent /keyfile:"%SlnDir%WebKit.NET.snk" /namespace:WebKit.Interop /out:"%OutDir%WebKit.Interop.dll"
-</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine>SET OutDir=$(OutDir)
-SET IntDir=$(IntDir)
-
-IF EXIST "%OutDir%WebKit.Interop.dll" del "%OutDir%WebKit.Interop.dll"</NMakeCleanCommandLine>
- </PropertyGroup>
- <ItemDefinitionGroup>
- </ItemDefinitionGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
Oops, something went wrong.

0 comments on commit dddab0e

Please sign in to comment.