System.Data.SQLite
Check-in [1688fbec2c]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Preparation for the native-only interop targets (i.e. SQLite.Interop.dll). Avoid having the project name being used to help name any of the output files.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1688fbec2c13958ec23edda667c67e725efcbc93
User & Date: mistachkin 2011-02-26 13:51:47
Context
2011-02-26
15:09
Enable native-only targets for the interop assembly. check-in: 26379a6c73 user: mistachkin tags: trunk
13:51
Preparation for the native-only interop targets (i.e. SQLite.Interop.dll). Avoid having the project name being used to help name any of the output files. check-in: 1688fbec2c user: mistachkin tags: trunk
12:37
Fix issue with the VERSIONINFO resource where the DEBUG flag was not being set correctly. check-in: ddd4705c67 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to SQLite.Interop/SQLite.Interop.2008.vcproj.

     6      6    * Written by Joe Mistachkin.
     7      7    * Released to the public domain, use at your own risk!
     8      8    *
     9      9   -->
    10     10   <VisualStudioProject
    11     11   	ProjectType="Visual C++"
    12     12   	Version="9.00"
    13         -	Name="SQLite.Interop"
           13  +	Name="SQLite.Interop.2008"
    14     14   	ProjectGUID="{53784BC1-A8BC-4AC8-8A3E-158D6807345A}"
    15     15   	RootNamespace="SQLite.Interop"
    16     16   	Keyword="Win32Proj"
    17     17   	TargetFrameworkVersion="131072"
    18     18   	>
    19     19   	<Platforms>
    20     20   		<Platform
................................................................................
    72     72   			<Tool
    73     73   				Name="VCPreLinkEventTool"
    74     74   			/>
    75     75   			<Tool
    76     76   				Name="VCLinkerTool"
    77     77   				AdditionalOptions="$(INTEROP_ASSEMBLY_RESOURCES)"
    78     78   				AdditionalDependencies="$(ProjectDir)..\bin\$(ConfigurationName)Module\bin\System.Data.SQLite.netmodule"
           79  +				OutputFile="$(OutDir)\$(INTEROP_MIXED_NAME).dll"
    79     80   				Version="$(INTEROP_MANIFEST_VERSION)"
    80     81   				LinkIncremental="1"
    81     82   				ModuleDefinitionFile="src\core\sqlite3.def"
    82     83   				GenerateDebugInformation="true"
    83     84   				AssemblyDebug="1"
           85  +				ProgramDatabaseFile="$(TargetDir)$(INTEROP_MIXED_NAME).pdb"
    84     86   				GenerateMapFile="true"
    85     87   				MapExports="true"
    86     88   				SubSystem="2"
    87     89   				OptimizeReferences="2"
    88     90   				EnableCOMDATFolding="2"
    89     91   				LinkTimeCodeGeneration="1"
           92  +				ImportLibrary="$(TargetDir)$(INTEROP_MIXED_NAME).lib"
    90     93   				TargetMachine="1"
    91     94   				CLRUnmanagedCodeCheck="true"
    92     95   				KeyFile="$(INTEROP_KEY_FILE)"
    93     96   				DelaySign="true"
    94     97   			/>
    95     98   			<Tool
    96     99   				Name="VCALinkTool"
................................................................................
   102    105   				UpdateFileHashes="true"
   103    106   			/>
   104    107   			<Tool
   105    108   				Name="VCXDCMakeTool"
   106    109   			/>
   107    110   			<Tool
   108    111   				Name="VCBscMakeTool"
          112  +				OutputFile="$(OutDir)/$(INTEROP_MIXED_NAME).bsc"
   109    113   			/>
   110    114   			<Tool
   111    115   				Name="VCFxCopTool"
   112    116   			/>
   113    117   			<Tool
   114    118   				Name="VCAppVerifierTool"
   115    119   			/>
   116    120   			<Tool
   117    121   				Name="VCPostBuildEventTool"
   118         -				CommandLine="&quot;$(FrameworkSDKDir)Bin\sn.exe&quot; -Ra &quot;$(TargetPath)&quot; &quot;$(INTEROP_KEY_FILE)&quot;"
          122  +				CommandLine="&quot;$(FrameworkSDKDir)Bin\sn.exe&quot; -Ra &quot;$(OutDir)\$(INTEROP_MIXED_NAME).dll&quot; &quot;$(INTEROP_KEY_FILE)&quot;"
   119    123   			/>
   120    124   		</Configuration>
   121    125   		<Configuration
   122    126   			Name="Release|Win32"
   123    127   			OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
   124    128   			IntermediateDirectory="..\obj\$(PlatformName)\$(ConfigurationName)"
   125    129   			ConfigurationType="2"
................................................................................
   168    172   			<Tool
   169    173   				Name="VCPreLinkEventTool"
   170    174   			/>
   171    175   			<Tool
   172    176   				Name="VCLinkerTool"
   173    177   				AdditionalOptions="$(INTEROP_ASSEMBLY_RESOURCES)"
   174    178   				AdditionalDependencies="$(ProjectDir)..\bin\$(ConfigurationName)Module\bin\System.Data.SQLite.netmodule"
          179  +				OutputFile="$(OutDir)\$(INTEROP_MIXED_NAME).dll"
   175    180   				Version="$(INTEROP_MANIFEST_VERSION)"
   176    181   				LinkIncremental="1"
   177    182   				ModuleDefinitionFile="src\core\sqlite3.def"
   178    183   				GenerateDebugInformation="true"
          184  +				ProgramDatabaseFile="$(TargetDir)$(INTEROP_MIXED_NAME).pdb"
   179    185   				GenerateMapFile="true"
   180    186   				MapExports="true"
   181    187   				SubSystem="2"
   182    188   				LargeAddressAware="0"
   183    189   				OptimizeReferences="2"
   184    190   				EnableCOMDATFolding="2"
   185    191   				LinkTimeCodeGeneration="1"
          192  +				ImportLibrary="$(TargetDir)$(INTEROP_MIXED_NAME).lib"
   186    193   				TargetMachine="1"
   187    194   				CLRUnmanagedCodeCheck="true"
   188    195   				KeyFile="$(INTEROP_KEY_FILE)"
   189    196   				DelaySign="true"
   190    197   			/>
   191    198   			<Tool
   192    199   				Name="VCALinkTool"
................................................................................
   198    205   				UpdateFileHashes="true"
   199    206   			/>
   200    207   			<Tool
   201    208   				Name="VCXDCMakeTool"
   202    209   			/>
   203    210   			<Tool
   204    211   				Name="VCBscMakeTool"
          212  +				OutputFile="$(OutDir)/$(INTEROP_MIXED_NAME).bsc"
   205    213   			/>
   206    214   			<Tool
   207    215   				Name="VCFxCopTool"
   208    216   			/>
   209    217   			<Tool
   210    218   				Name="VCAppVerifierTool"
   211    219   			/>
   212    220   			<Tool
   213    221   				Name="VCPostBuildEventTool"
   214         -				CommandLine="&quot;$(FrameworkSDKDir)Bin\sn.exe&quot; -Ra &quot;$(TargetPath)&quot; &quot;$(INTEROP_KEY_FILE)&quot;"
          222  +				CommandLine="&quot;$(FrameworkSDKDir)Bin\sn.exe&quot; -Ra &quot;$(OutDir)\$(INTEROP_MIXED_NAME).dll&quot; &quot;$(INTEROP_KEY_FILE)&quot;"
   215    223   			/>
   216    224   		</Configuration>
   217    225   	</Configurations>
   218    226   	<References>
   219    227   	</References>
   220    228   	<Files>
   221    229   		<Filter
................................................................................
   339    347   				RelativePath="..\System.Data.SQLite\SR.resx"
   340    348   				>
   341    349   				<FileConfiguration
   342    350   					Name="Debug|Win32"
   343    351   					>
   344    352   					<Tool
   345    353   						Name="VCManagedResourceCompilerTool"
   346         -						ResourceFileName="$(IntDir)\System.Data.SQLite.$(InputName).resources"
          354  +						ResourceFileName="$(IntDir)\$(INTEROP_MIXED_NAME).$(InputName).resources"
   347    355   					/>
   348    356   				</FileConfiguration>
   349    357   				<FileConfiguration
   350    358   					Name="Release|Win32"
   351    359   					>
   352    360   					<Tool
   353    361   						Name="VCManagedResourceCompilerTool"
   354         -						ResourceFileName="$(IntDir)\System.Data.SQLite.$(InputName).resources"
          362  +						ResourceFileName="$(IntDir)\$(INTEROP_MIXED_NAME).$(InputName).resources"
   355    363   					/>
   356    364   				</FileConfiguration>
   357    365   			</File>
   358    366   		</Filter>
   359    367   	</Files>
   360    368   	<Globals>
   361    369   	</Globals>
   362    370   </VisualStudioProject>

Changes to SQLite.Interop/SQLite.Interop.2010.vcxproj.

    15     15       </ProjectConfiguration>
    16     16       <ProjectConfiguration Include="Release|Win32">
    17     17         <Configuration>Release</Configuration>
    18     18         <Platform>Win32</Platform>
    19     19       </ProjectConfiguration>
    20     20     </ItemGroup>
    21     21     <PropertyGroup Label="Globals">
    22         -    <ProjectName>SQLite.Interop</ProjectName>
           22  +    <ProjectName>SQLite.Interop.2010</ProjectName>
    23     23       <ProjectGuid>{53784BC1-A8BC-4AC8-8A3E-158D6807345A}</ProjectGuid>
    24     24       <RootNamespace>SQLite.Interop</RootNamespace>
    25     25       <Keyword>Win32Proj</Keyword>
    26     26     </PropertyGroup>
    27     27     <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
           28  +  <Import Project="props\sqlite3.props" />
           29  +  <Import Project="props\SQLite.Interop.props" />
           30  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           31  +    <TargetName>$(INTEROP_MIXED_NAME)</TargetName>
           32  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           33  +    <CharacterSet>Unicode</CharacterSet>
           34  +  </PropertyGroup>
    28     35     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
           36  +    <TargetName>$(INTEROP_MIXED_NAME)</TargetName>
    29     37       <ConfigurationType>DynamicLibrary</ConfigurationType>
    30     38       <CharacterSet>Unicode</CharacterSet>
    31     39       <WholeProgramOptimization>true</WholeProgramOptimization>
    32     40     </PropertyGroup>
    33         -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    34         -    <ConfigurationType>DynamicLibrary</ConfigurationType>
    35         -    <CharacterSet>Unicode</CharacterSet>
    36         -  </PropertyGroup>
    37     41     <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    38         -  <Import Project="props\sqlite3.props" />
    39         -  <Import Project="props\SQLite.Interop.props" />
    40     42     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    41     43     <PropertyGroup>
    42     44       <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    43     45       <OutDir>$(ProjectDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
    44     46       <IntDir>..\obj\$(Platform)\$(Configuration)\</IntDir>
    45     47       <LinkIncremental>false</LinkIncremental>
    46     48     </PropertyGroup>

Changes to SQLite.Interop/props/SQLite.Interop.props.

     9      9   -->
    10     10   <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
    11     11     <PropertyGroup Label="UserMacros">
    12     12       <INTEROP_MANIFEST_VERSION>1.0.67.0</INTEROP_MANIFEST_VERSION>
    13     13       <INTEROP_RC_VERSION>1,0,67,0</INTEROP_RC_VERSION>
    14     14       <INTEROP_ASSEMBLY_RESOURCES>/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteCommand.bmp,System.Data.SQLite.SQLiteCommand.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteConnection.bmp,System.Data.SQLite.SQLiteConnection.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteDataAdapter.bmp,System.Data.SQLite.SQLiteDataAdapter.bmp</INTEROP_ASSEMBLY_RESOURCES>
    15     15       <INTEROP_KEY_FILE>$(ProjectDir)..\System.Data.SQLite\System.Data.SQLite.snk</INTEROP_KEY_FILE>
           16  +    <INTEROP_NATIVE_NAME>SQLite.Interop</INTEROP_NATIVE_NAME>
           17  +    <INTEROP_MIXED_NAME>System.Data.SQLite</INTEROP_MIXED_NAME>
    16     18     </PropertyGroup>
    17     19     <PropertyGroup>
    18     20       <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    19     21     </PropertyGroup>
    20     22     <ItemGroup>
    21     23       <BuildMacro Include="INTEROP_MANIFEST_VERSION">
    22     24         <Value>$(INTEROP_MANIFEST_VERSION)</Value>
................................................................................
    30     32         <Value>$(INTEROP_ASSEMBLY_RESOURCES)</Value>
    31     33         <EnvironmentVariable>true</EnvironmentVariable>
    32     34       </BuildMacro>
    33     35       <BuildMacro Include="INTEROP_KEY_FILE">
    34     36         <Value>$(INTEROP_KEY_FILE)</Value>
    35     37         <EnvironmentVariable>true</EnvironmentVariable>
    36     38       </BuildMacro>
           39  +    <BuildMacro Include="INTEROP_NATIVE_NAME">
           40  +      <Value>$(INTEROP_NATIVE_NAME)</Value>
           41  +      <EnvironmentVariable>true</EnvironmentVariable>
           42  +    </BuildMacro>
           43  +    <BuildMacro Include="INTEROP_MIXED_NAME">
           44  +      <Value>$(INTEROP_MIXED_NAME)</Value>
           45  +      <EnvironmentVariable>true</EnvironmentVariable>
           46  +    </BuildMacro>
    37     47     </ItemGroup>
    38     48   </Project>

Changes to SQLite.Interop/props/SQLite.Interop.vsprops.

    28     28   		PerformEnvironmentSet="true"
    29     29   	/>
    30     30   	<UserMacro
    31     31   		Name="INTEROP_KEY_FILE"
    32     32   		Value="$(ProjectDir)..\System.Data.SQLite\System.Data.SQLite.snk"
    33     33   		PerformEnvironmentSet="true"
    34     34   	/>
           35  +	<UserMacro
           36  +		Name="INTEROP_NATIVE_NAME"
           37  +		Value="SQLite.Interop"
           38  +		PerformEnvironmentSet="true"
           39  +	/>
           40  +	<UserMacro
           41  +		Name="INTEROP_MIXED_NAME"
           42  +		Value="System.Data.SQLite"
           43  +		PerformEnvironmentSet="true"
           44  +	/>
    35     45   </VisualStudioPropertySheet>

Changes to SQLite.NET.2008.sln.

     4      4   EndProject
     5      5   Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2008", "System.Data.SQLite\System.Data.SQLite.Module.2008.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
     6      6   EndProject
     7      7   Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Compact.2008", "System.Data.SQLite\System.Data.SQLite.Compact.2008.csproj", "{AC139951-261A-4463-B6FA-AEBC25283A66}"
     8      8   EndProject
     9      9   Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test.2008", "test\test.2008.csproj", "{E27B1B1E-19C0-45E8-AA74-B6E1C041A130}"
    10     10   EndProject
    11         -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop", "SQLite.Interop\SQLite.Interop.2008.vcproj", "{53784BC1-A8BC-4AC8-8A3E-158D6807345A}"
           11  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop.2008", "SQLite.Interop\SQLite.Interop.2008.vcproj", "{53784BC1-A8BC-4AC8-8A3E-158D6807345A}"
    12     12   	ProjectSection(ProjectDependencies) = postProject
    13     13   		{AC139952-261A-4463-B6FA-AEBC25284A66} = {AC139952-261A-4463-B6FA-AEBC25284A66}
    14     14   	EndProjectSection
    15     15   EndProject
    16     16   Global
    17     17   	GlobalSection(SolutionConfigurationPlatforms) = preSolution
    18     18   		Debug|Any CPU = Debug|Any CPU

Changes to SQLite.NET.2010.sln.

     2      2   # Visual Studio 2010
     3      3   Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.2010", "System.Data.SQLite\System.Data.SQLite.2010.csproj", "{AC139952-261A-4463-B6FA-AEBC25283A66}"
     4      4   EndProject
     5      5   Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2010", "System.Data.SQLite\System.Data.SQLite.Module.2010.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
     6      6   EndProject
     7      7   Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test.2010", "test\test.2010.csproj", "{E27B1B1E-19C0-45E8-AA74-B6E1C041A130}"
     8      8   EndProject
     9         -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop", "SQLite.Interop\SQLite.Interop.2010.vcxproj", "{53784BC1-A8BC-4AC8-8A3E-158D6807345A}"
            9  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop.2010", "SQLite.Interop\SQLite.Interop.2010.vcxproj", "{53784BC1-A8BC-4AC8-8A3E-158D6807345A}"
    10     10   	ProjectSection(ProjectDependencies) = postProject
    11     11   		{AC139952-261A-4463-B6FA-AEBC25284A66} = {AC139952-261A-4463-B6FA-AEBC25284A66}
    12     12   	EndProjectSection
    13     13   EndProject
    14     14   Global
    15     15   	GlobalSection(SolutionConfigurationPlatforms) = preSolution
    16     16   		Debug|Any CPU = Debug|Any CPU