Adapt Windows build to a separate Git DLL.

serras · Mar 2, 2012 · 35c1677 · 35c1677
1 parent 7943e92
commit 35c1677
Show file tree

Hide file tree

Showing 8 changed files with 128 additions and 14 deletions.
diff --git a/SparkleLib/windows/GlobalAssemblyInfo.tt b/SparkleLib/windows/GlobalAssemblyInfo.tt
@@ -11,7 +11,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyProduct("SparkleShare")]
+[assembly: AssemblyProduct("SparkleLib.Git")]
 
 [assembly: AssemblyVersion("<#= ASM_VERSION #>")]
 [assembly: AssemblyFileVersion("<#= ASM_FILE_VERSION #>")]

diff --git a/SparkleLib/windows/GlobalAssemblyInfoGit.tt b/SparkleLib/windows/GlobalAssemblyInfoGit.tt
@@ -0,0 +1,25 @@
+/*
+ * GlobalAssemblyInfo.cs
+ *
+ * This is free software. See COPYING for details.
+ */
+<#@ template language="C#v3.5" HostSpecific="true" #>
+<#@ output extension="cs" #>
+
+<#@ include file="getversion.tt" #>
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyProduct("SparkleShare")]
+
+[assembly: AssemblyVersion("<#= ASM_VERSION #>")]
+[assembly: AssemblyFileVersion("<#= ASM_FILE_VERSION #>")]
+[assembly: AssemblyInformationalVersion("<#= VERSION #>")]
+
+#if DEBUG
+[assembly: AssemblyConfiguration("Debug")]
+#else
+[assembly: AssemblyConfiguration("Release")]
+#endif
+
diff --git a/SparkleLib/windows/SparkleLib.Git.csproj b/SparkleLib/windows/SparkleLib.Git.csproj
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SparkleLib.Git</RootNamespace>
+    <AssemblyName>SparkleLib.Git</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="Defines.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Defines.cs</LastGenOutput>
+    </None>
+    <None Include="GlobalAssemblyInfoGit.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>GlobalAssemblyInfoGit.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Git\SparkleFetcherGit.cs">
+      <Link>SparkleFetcherGit.cs</Link>
+    </Compile>
+    <Compile Include="..\Git\SparkleGit.cs">
+      <Link>SparkleGit.cs</Link>
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="..\Git\SparkleRepoGit.cs">
+      <Link>SparkleRepoGit.cs</Link>
+    </Compile>
+    <Compile Include="Defines.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Defines.tt</DependentUpon>
+    </Compile>
+    <Compile Include="GlobalAssemblyInfoGit.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>GlobalAssemblyInfoGit.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="SparkleLib.csproj">
+      <Project>{2C914413-B31C-4362-93C7-1AE34F09112A}</Project>
+      <Name>SparkleLib</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- 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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PreBuildEvent>$(ProjectDir)transform_tt.cmd</PreBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/SparkleLib/windows/SparkleLib.csproj b/SparkleLib/windows/SparkleLib.csproj
@@ -61,16 +61,6 @@
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Git\SparkleFetcherGit.cs">
-      <Link>SparkleFetcherGit.cs</Link>
-    </Compile>
-    <Compile Include="..\Git\SparkleGit.cs">
-      <Link>SparkleGit.cs</Link>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="..\Git\SparkleRepoGit.cs">
-      <Link>SparkleRepoGit.cs</Link>
-    </Compile>
     <Compile Include="..\SparkleAnnouncement.cs">
       <Link>SparkleAnnouncement.cs</Link>
     </Compile>

diff --git a/SparkleLib/windows/transform_tt.cmd b/SparkleLib/windows/transform_tt.cmd
@@ -8,4 +8,4 @@ echo running texttransform..
 
 %TextTransform% -out Defines.cs Defines.tt
 %TextTransform% -out GlobalAssemblyInfo.cs GlobalAssemblyInfo.tt
-
+%TextTransform% -out GlobalAssemblyInfoGit.cs GlobalAssemblyInfoGit.tt
diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <ProjectGuid>{728483AA-E34B-4441-BF2C-C8BC2901E4E0}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <AssemblyName>SparkleShare</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace>SparkleShare</RootNamespace>

diff --git a/SparkleShare/Windows/SparkleShare.sln b/SparkleShare/Windows/SparkleShare.sln
@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "..\..\Sparkle
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShareInviteOpen", "SparkleShareInviteOpen\SparkleShareInviteOpen.csproj", "{1DB5492D-B897-4A5E-8DD7-175EC65F52F2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib.Git", "..\..\SparkleLib\windows\SparkleLib.Git.csproj", "{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,6 +27,10 @@ Global
 		{1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/SparkleShare/Windows/SparkleShare.wxs b/SparkleShare/Windows/SparkleShare.wxs
@@ -22,6 +22,7 @@
               <File Id='SparkleShareInviteOpen.exe' Name='SparkleShareInviteOpen.exe' Source='!(wix.root)\bin\SparkleShareInviteOpen.exe' DiskId='1' />
             </Component>
             <Component Id='Libraries' Guid='0DA692D5-4DBE-4251-9F62-E7C1A76F10E1'>
+              <File Id='SparkleLib.Git.dll' Name='SparkleLib.Git.dll' Source='!(wix.root)\bin\SparkleLib.Git.dll' DiskId='1' />
               <File Id='CefSharp.dll' Name='CefSharp.dll' Source='!(wix.root)\bin\CefSharp.dll' DiskId='1' />
               <File Id='Gettext.Cs.dll' Name='Gettext.Cs.dll' Source='!(wix.root)\bin\Gettext.Cs.dll' DiskId='1' />
               <File Id='SparkleLib.dll' Name='SparkleLib.dll' Source='!(wix.root)\bin\SparkleLib.dll' DiskId='1' />
@@ -81,7 +82,7 @@
 
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
 
-    <WixVariable Id="WixUILicenseRtf" Value="..\..\LICENSE.rtf" />
+    <WixVariable Id="WixUILicenseRtf" Value="..\..\LICENSE" />
     <WixVariable Id="WixUIBannerBmp" Value="..\..\data\install\bannrbmp.bmp" />
     <WixVariable Id="WixUIDialogBmp" Value="..\..\data\install\dlgbmp.bmp" />