Use a shared project for common source files
This commit is contained in:
parent
a04a4df3ad
commit
88c4986113
|
@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Windows", "Spa
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Linux", "SparkleShare\Linux\SparkleShare.Linux.csproj", "{5714D3CA-88A6-4330-A29D-4CA90D1D193C}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Linux", "SparkleShare\Linux\SparkleShare.Linux.csproj", "{5714D3CA-88A6-4330-A29D-4CA90D1D193C}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SparkleShare", "SparkleShare\Common\SparkleShare.shproj", "{F16E3683-B622-4654-B799-99C8D68AA963}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
|
|
|
@ -647,7 +647,8 @@ namespace SparkleShare {
|
||||||
{
|
{
|
||||||
this.fetcher.EnableFetchedRepoCrypto (password);
|
this.fetcher.EnableFetchedRepoCrypto (password);
|
||||||
FinishFetcher (StorageType.Encrypted);
|
FinishFetcher (StorageType.Encrypted);
|
||||||
}
|
} // TODO: make this the main method. password optional. need to know storage type before Complete to allow crypto in lfs
|
||||||
|
// Make sure IsCryptoPasswordCorrect works with SparkleShare.txt checkout and LFS
|
||||||
|
|
||||||
|
|
||||||
public void FinishFetcher (StorageType selected_storage_type)
|
public void FinishFetcher (StorageType selected_storage_type)
|
||||||
|
|
22
SparkleShare/Common/SparkleShare.projitems
Normal file
22
SparkleShare/Common/SparkleShare.projitems
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
||||||
|
<HasSharedItems>true</HasSharedItems>
|
||||||
|
<SharedGUID>{F16E3683-B622-4654-B799-99C8D68AA963}</SharedGUID>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Configuration">
|
||||||
|
<Import_RootNamespace>SparkleShare</Import_RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="$(MSBuildThisFileDirectory)AboutController.cs" />
|
||||||
|
<Compile Include="$(MSBuildThisFileDirectory)Avatars.cs" />
|
||||||
|
<Compile Include="$(MSBuildThisFileDirectory)BaseController.cs" />
|
||||||
|
<Compile Include="$(MSBuildThisFileDirectory)BubblesController.cs" />
|
||||||
|
<Compile Include="$(MSBuildThisFileDirectory)EventLogController.cs" />
|
||||||
|
<Compile Include="$(MSBuildThisFileDirectory)NoteController.cs" />
|
||||||
|
<Compile Include="$(MSBuildThisFileDirectory)SetupController.cs" />
|
||||||
|
<Compile Include="$(MSBuildThisFileDirectory)SparkleShare.cs" />
|
||||||
|
<Compile Include="$(MSBuildThisFileDirectory)StatusIconController.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
13
SparkleShare/Common/SparkleShare.shproj
Normal file
13
SparkleShare/Common/SparkleShare.shproj
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<ProductVersion>8.0.30703</ProductVersion>
|
||||||
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
|
<ProjectGuid>{F16E3683-B622-4654-B799-99C8D68AA963}</ProjectGuid>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||||
|
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
|
||||||
|
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
|
||||||
|
<Import Project="SparkleShare.projitems" Label="Shared" />
|
||||||
|
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
|
||||||
|
</Project>
|
|
@ -19,16 +19,16 @@ SOURCES = \
|
||||||
../Common/NoteController.cs \
|
../Common/NoteController.cs \
|
||||||
../Common/SetupController.cs \
|
../Common/SetupController.cs \
|
||||||
../Common/StatusIconController.cs \
|
../Common/StatusIconController.cs \
|
||||||
About.cs \
|
Userinterface/About.cs \
|
||||||
Bubbles.cs \
|
Userinterface/Bubbles.cs \
|
||||||
Controller.cs \
|
Userinterface/EventLog.cs \
|
||||||
EventLog.cs \
|
Userinterface/Note.cs \
|
||||||
Note.cs \
|
Userinterface/Setup.cs \
|
||||||
Setup.cs \
|
Userinterface/SetupWindow.cs \
|
||||||
SetupWindow.cs \
|
Userinterface/StatusIcon.cs \
|
||||||
StatusIcon.cs \
|
Userinterface/UserInterface.cs \
|
||||||
UserInterface.cs \
|
Userinterface/UserInterfaceHelpers.cs \
|
||||||
UserInterfaceHelpers.cs
|
Controller.cs
|
||||||
|
|
||||||
include $(top_srcdir)/build/build.mk
|
include $(top_srcdir)/build/build.mk
|
||||||
|
|
||||||
|
|
|
@ -72,8 +72,6 @@
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="UserInterface\" />
|
|
||||||
<Folder Include="Controllers\" />
|
|
||||||
<Folder Include="Presets\" />
|
<Folder Include="Presets\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -136,63 +134,19 @@
|
||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="..\Common\Avatars.cs">
|
|
||||||
<Link>UserInterface\Avatars.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="About.cs">
|
|
||||||
<Link>UserInterface\About.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Bubbles.cs">
|
|
||||||
<Link>UserInterface\Bubbles.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Note.cs">
|
|
||||||
<Link>UserInterface\Note.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Setup.cs">
|
|
||||||
<Link>UserInterface\Setup.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="SetupWindow.cs">
|
|
||||||
<Link>UserInterface\SetupWindow.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="StatusIcon.cs">
|
|
||||||
<Link>UserInterface\StatusIcon.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="UserInterface.cs">
|
|
||||||
<Link>UserInterface\UserInterface.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="UserInterfaceHelpers.cs">
|
|
||||||
<Link>UserInterface\UserInterfaceHelpers.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\Common\SparkleShare.cs">
|
<Compile Include="..\Common\SparkleShare.cs">
|
||||||
<Link>SparkleShare.cs</Link>
|
<Link>SparkleShare.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="..\Common\AboutController.cs">
|
<Compile Include="Controller.cs" />
|
||||||
<Link>Controllers\AboutController.cs</Link>
|
<Compile Include="UserInterface\About.cs" />
|
||||||
</Compile>
|
<Compile Include="UserInterface\Bubbles.cs" />
|
||||||
<Compile Include="..\Common\BaseController.cs">
|
<Compile Include="UserInterface\EventLog.cs" />
|
||||||
<Link>Controllers\BaseController.cs</Link>
|
<Compile Include="UserInterface\Setup.cs" />
|
||||||
</Compile>
|
<Compile Include="UserInterface\SetupWindow.cs" />
|
||||||
<Compile Include="..\Common\BubblesController.cs">
|
<Compile Include="UserInterface\StatusIcon.cs" />
|
||||||
<Link>Controllers\BubblesController.cs</Link>
|
<Compile Include="UserInterface\UserInterface.cs" />
|
||||||
</Compile>
|
<Compile Include="UserInterface\UserInterfaceHelpers.cs" />
|
||||||
<Compile Include="..\Common\EventLogController.cs">
|
|
||||||
<Link>Controllers\EventLogController.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\Common\NoteController.cs">
|
|
||||||
<Link>Controllers\NoteController.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\Common\SetupController.cs">
|
|
||||||
<Link>Controllers\SetupController.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\Common\StatusIconController.cs">
|
|
||||||
<Link>Controllers\StatusIconController.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Controller.cs">
|
|
||||||
<Link>Controllers\Controller.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="EventLog.cs">
|
|
||||||
<Link>UserInterface\EventLog.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<Import Project="..\Common\SparkleShare.projitems" Label="Shared" Condition="Exists('..\Common\SparkleShare.projitems')" />
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
</Project>
|
</Project>
|
|
@ -41,6 +41,7 @@
|
||||||
<HttpClientHandler>HttpClientHandler</HttpClientHandler>
|
<HttpClientHandler>HttpClientHandler</HttpClientHandler>
|
||||||
<TlsProvider>Default</TlsProvider>
|
<TlsProvider>Default</TlsProvider>
|
||||||
<LinkMode>None</LinkMode>
|
<LinkMode>None</LinkMode>
|
||||||
|
<UseMSBuildEngine>True</UseMSBuildEngine>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<Optimize>False</Optimize>
|
<Optimize>False</Optimize>
|
||||||
|
@ -155,9 +156,7 @@
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
<Reference Include="System.Net" />
|
<Reference Include="System.Net" />
|
||||||
<Reference Include="Mono.Posix" />
|
<Reference Include="Mono.Posix" />
|
||||||
<Reference Include="MonoMac">
|
<Reference Include="MonoMac, Version=0.0.0.0, Culture=neutral" />
|
||||||
<HintPath>..\..\..\monomac\src\MonoMac.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="AppDelegate.cs">
|
<Compile Include="AppDelegate.cs">
|
||||||
|
@ -166,28 +165,7 @@
|
||||||
<Compile Include="MainMenu.xib.designer.cs">
|
<Compile Include="MainMenu.xib.designer.cs">
|
||||||
<DependentUpon>MainMenu.xib</DependentUpon>
|
<DependentUpon>MainMenu.xib</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="..\Common\SparkleShare.cs">
|
<Compile Include="Watcher.cs" />
|
||||||
<Link>SparkleShare.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="MacWatcher.cs" />
|
|
||||||
<Compile Include="..\Common\AboutController.cs">
|
|
||||||
<Link>Controllers\AboutController.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\Common\BubblesController.cs">
|
|
||||||
<Link>Controllers\BubblesController.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\Common\EventLogController.cs">
|
|
||||||
<Link>Controllers\EventLogController.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\Common\NoteController.cs">
|
|
||||||
<Link>Controllers\NoteController.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\Common\SetupController.cs">
|
|
||||||
<Link>Controllers\SetupController.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\Common\StatusIconController.cs">
|
|
||||||
<Link>Controllers\StatusIconController.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="UserInterface\About.cs" />
|
<Compile Include="UserInterface\About.cs" />
|
||||||
<Compile Include="UserInterface\Bubbles.cs" />
|
<Compile Include="UserInterface\Bubbles.cs" />
|
||||||
<Compile Include="UserInterface\EventLog.cs" />
|
<Compile Include="UserInterface\EventLog.cs" />
|
||||||
|
@ -196,15 +174,10 @@
|
||||||
<Compile Include="UserInterface\SetupWindow.cs" />
|
<Compile Include="UserInterface\SetupWindow.cs" />
|
||||||
<Compile Include="UserInterface\StatusIcon.cs" />
|
<Compile Include="UserInterface\StatusIcon.cs" />
|
||||||
<Compile Include="UserInterface\UserInterface.cs" />
|
<Compile Include="UserInterface\UserInterface.cs" />
|
||||||
<Compile Include="..\Common\BaseController.cs">
|
|
||||||
<Link>Controllers\BaseController.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Controller.cs">
|
|
||||||
<Link>Controllers\Controller.cs</Link>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="..\Common\Avatars.cs">
|
<Compile Include="..\Common\Avatars.cs">
|
||||||
<Link>UserInterface\Avatars.cs</Link>
|
<Link>UserInterface\Avatars.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="Controller.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<InterfaceDefinition Include="MainMenu.xib" />
|
<InterfaceDefinition Include="MainMenu.xib" />
|
||||||
|
@ -212,8 +185,8 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Info.plist" />
|
<None Include="Info.plist" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<Import Project="..\Common\SparkleShare.projitems" Label="Shared" Condition="Exists('..\Common\SparkleShare.projitems')" />
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="..\Common\HTML\day-entry.html">
|
<Content Include="..\Common\HTML\day-entry.html">
|
||||||
<Link>HTML\day-entry.html</Link>
|
<Link>HTML\day-entry.html</Link>
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
<ApplicationIcon>Images\sparkleshare-app.ico</ApplicationIcon>
|
<ApplicationIcon>Images\sparkleshare-app.ico</ApplicationIcon>
|
||||||
<ReleaseVersion>
|
<ReleaseVersion>
|
||||||
</ReleaseVersion>
|
</ReleaseVersion>
|
||||||
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
|
@ -62,6 +63,7 @@
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>false</Optimize>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="..\Common\SparkleShare.projitems" Label="Shared" Condition="Exists('..\Common\SparkleShare.projitems')" />
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
|
@ -276,4 +278,14 @@
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</Page>
|
</Page>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\Sparkles\Sparkles.csproj">
|
||||||
|
<Project>{2C914413-B31C-4362-93C7-1AE34F09112A}</Project>
|
||||||
|
<Name>Sparkles</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\..\Sparkles\Git\Sparkles.Git.csproj">
|
||||||
|
<Project>{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}</Project>
|
||||||
|
<Name>Sparkles.Git</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
Loading…
Reference in a new issue