Skip to content

Commit

Permalink
Split sources into namespaces.
Browse files Browse the repository at this point in the history
Based on Mike's proposal. Splits the local folder source out into a different
assembly, to make sure we have no hard dependency on it in the code code.
  • Loading branch information
rubenv committed Apr 16, 2010
1 parent 6ef86c3 commit 9461258
Show file tree
Hide file tree
Showing 20 changed files with 108 additions and 26 deletions.
5 changes: 5 additions & 0 deletions build/build.environment.mk
Expand Up @@ -39,6 +39,11 @@ REF_TRIPOD_CORE = $(LINK_MONO_POSIX) $(LINK_HYENA) $(LINK_HYENA_GUI) $(LINK_GTK)
LINK_TRIPOD_CORE = -r:$(DIR_BIN)/Tripod.Core.dll
LINK_TRIPOD_CORE_DEPS = $(REF_TRIPOD_CORE) $(LINK_TRIPOD_CORE)

# Sources
REF_TRIPOD_SOURCES = $(LINK_TRIPOD_CORE_DEPS)
LINK_TRIPOD_SOURCES = -r:$(DIR_BIN)/Tripod.Sources.dll
LINK_TRIPOD_SOURCES_DEPS = $(REF_TRIPOD_SOURCES) $(LINK_TRIPOD_SOURCES)

# Clients
REF_FLASHUNIT = $(LINK_TRIPOD_CORE_DEPS)

Expand Down
1 change: 1 addition & 0 deletions configure.ac
Expand Up @@ -161,6 +161,7 @@ src/AssemblyInfo.cs
src/Core/Makefile
src/Core/Tripod.Core/Makefile
src/Core/Tripod.Sources/Makefile
src/Clients/Makefile
src/Clients/FlashUnit/Makefile
Expand Down
3 changes: 2 additions & 1 deletion src/Core/Makefile.am
@@ -1,5 +1,6 @@
SUBDIRS = \
Tripod.Core
Tripod.Core \
Tripod.Sources

run:
@pushd $(top_builddir); \
Expand Down
21 changes: 9 additions & 12 deletions src/Core/Tripod.Core/Makefile.am
Expand Up @@ -24,18 +24,15 @@ SOURCES = \
Tripod.Model.Gui/PhotoGridView.cs \
Tripod.Model.Gui/PhotoGridViewChild.cs \
Tripod.Model.Gui/PhotoGridViewLayout.cs \
Tripod.Model/CachePhoto.cs \
Tripod.Model/CachePhotoSource.cs \
Tripod.Model/IAcceptImportPhotoSource.cs \
Tripod.Model/ICacheablePhotoSource.cs \
Tripod.Model/ICachingPhotoSource.cs \
Tripod.Model/INamingPolicy.cs \
Tripod.Model/IPhoto.cs \
Tripod.Model/IPhotoSource.cs \
Tripod.Model/LocalFilePhoto.cs \
Tripod.Model/LocalFolderNamingPolicy.cs \
Tripod.Model/LocalFolderPhotoSource.cs \
Tripod.Model/MainCachePhotoSource.cs \
Tripod.Sources.Cache/CachePhoto.cs \
Tripod.Sources.Cache/CachePhotoSource.cs \
Tripod.Sources.Cache/MainCachePhotoSource.cs \
Tripod.Sources/IAcceptImportPhotoSource.cs \
Tripod.Sources/ICacheablePhotoSource.cs \
Tripod.Sources/ICachingPhotoSource.cs \
Tripod.Sources/INamingPolicy.cs \
Tripod.Sources/IPhoto.cs \
Tripod.Sources/IPhotoSource.cs \
Tripod.Tasks/CancellableTask.cs \
Tripod.Tasks/ChildCancellableTask.cs \
Tripod.Tasks/RefCountCancellableTask.cs
Expand Down
23 changes: 11 additions & 12 deletions src/Core/Tripod.Core/Tripod.Core.csproj
Expand Up @@ -34,17 +34,7 @@
<Compile Include="Tripod.Base\Core.cs" />
<Compile Include="Tripod.Jobs\ThreadPoolJob.cs" />
<Compile Include="Tripod.Base\RecursiveDirectoryEnumerator.cs" />
<Compile Include="Tripod.Model\IPhotoSource.cs" />
<Compile Include="Tripod.Model\IPhoto.cs" />
<Compile Include="Tripod.Model\INamingPolicy.cs" />
<Compile Include="Tripod.Model\LocalFolderPhotoSource.cs" />
<Compile Include="Tripod.Model\LocalFilePhoto.cs" />
<Compile Include="Tripod.Model\CachePhotoSource.cs" />
<Compile Include="Tripod.Model\CachePhoto.cs" />
<Compile Include="Tripod.Model\MainCachePhotoSource.cs" />
<Compile Include="Tripod.Base\TripodSqliteConnection.cs" />
<Compile Include="Tripod.Model\ICachingPhotoSource.cs" />
<Compile Include="Tripod.Model\ICacheablePhotoSource.cs" />
<Compile Include="Tripod.Actions\IPhotoAction.cs" />
<Compile Include="Tripod.Actions\ChangeCommentPhotoAction.cs" />
<Compile Include="Tripod.Base\GIOTagLibFileAbstraction.cs" />
Expand All @@ -53,21 +43,28 @@
<Compile Include="Tripod.Graphics\MipMapGenerator.cs" />
<Compile Include="Tripod.Graphics\MipMapFile.cs" />
<Compile Include="Tripod.Graphics\PixbufExtensions.cs" />
<Compile Include="Tripod.Model\LocalFolderNamingPolicy.cs" />
<Compile Include="Tripod.Model.Gui\PhotoGridView.cs" />
<Compile Include="Tripod.Model.Gui\PhotoGridViewChild.cs" />
<Compile Include="Tripod.Model.Gui\PhotoGridViewLayout.cs" />
<Compile Include="Tripod.Model.Gui\IPhotoGridCaptionRenderer.cs" />
<Compile Include="Tripod.Model.Gui\PhotoGridTextCaptionRenderer.cs" />
<Compile Include="Tripod.Model.Gui\PhotoGridDateCaptionRender.cs" />
<Compile Include="Tripod.Model\IAcceptImportPhotoSource.cs" />
<Compile Include="Tripod.Graphics\IPhotoLoader.cs" />
<Compile Include="Tripod.Graphics\PhotoLoaderCache.cs" />
<Compile Include="Tripod.Graphics\MipMappedPhotoLoader.cs" />
<Compile Include="Tripod.Tasks\CancellableTask.cs" />
<Compile Include="Tripod.Tasks\RefCountCancellableTask.cs" />
<Compile Include="Tripod.Tasks\ChildCancellableTask.cs" />
<Compile Include="Tripod.Graphics\ImageSurfaceCache.cs" />
<Compile Include="Tripod.Sources\IPhoto.cs" />
<Compile Include="Tripod.Sources\IPhotoSource.cs" />
<Compile Include="Tripod.Sources\ICacheablePhotoSource.cs" />
<Compile Include="Tripod.Sources\ICachingPhotoSource.cs" />
<Compile Include="Tripod.Sources.Cache\CachePhoto.cs" />
<Compile Include="Tripod.Sources.Cache\CachePhotoSource.cs" />
<Compile Include="Tripod.Sources.Cache\MainCachePhotoSource.cs" />
<Compile Include="Tripod.Sources\INamingPolicy.cs" />
<Compile Include="Tripod.Sources\IAcceptImportPhotoSource.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\contributors.xml">
Expand Down Expand Up @@ -101,6 +98,8 @@
<Folder Include="Tripod.Graphics\" />
<Folder Include="Tripod.Services\" />
<Folder Include="Tripod.Tasks\" />
<Folder Include="Tripod.Sources\" />
<Folder Include="Tripod.Sources.Cache\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\Hyena\Hyena.csproj">
Expand Down
File renamed without changes.
9 changes: 9 additions & 0 deletions src/Core/Tripod.Sources/Makefile.am
@@ -0,0 +1,9 @@
ASSEMBLY = Tripod.Sources
TARGET = library
LINK = $(REF_TRIPOD_SOURCES)
SOURCES = \
Tripod.Sources.LocalFolder/LocalFilePhoto.cs \
Tripod.Sources.LocalFolder/LocalFolderNamingPolicy.cs \
Tripod.Sources.LocalFolder/LocalFolderPhotoSource.cs

include $(top_srcdir)/build/build.mk
57 changes: 57 additions & 0 deletions src/Core/Tripod.Sources/Tripod.Sources.csproj
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>10.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{34E1DAD4-907A-4ECE-AE6C-50C580E7494D}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>Tripod.Sources</RootNamespace>
<ReleaseVersion>0.0.1</ReleaseVersion>
<AssemblyName>Tripod.Sources</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<MonoDevelop>
<Properties>
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" ExecuteTargetName="run" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
<BuildFilesVar Sync="true" Name="SOURCES" />
<DeployFilesVar />
<ResourcesVar />
<OthersVar />
<GacRefVar />
<AsmRefVar />
<ProjectRefVar />
</MonoDevelop.Autotools.MakefileInfo>
</Properties>
</MonoDevelop>
</ProjectExtensions>
<ItemGroup>
<Folder Include="Tripod.Sources.LocalFolder\" />
</ItemGroup>
<ItemGroup>
<Compile Include="Tripod.Sources.LocalFolder\LocalFilePhoto.cs" />
<Compile Include="Tripod.Sources.LocalFolder\LocalFolderPhotoSource.cs" />
<Compile Include="Tripod.Sources.LocalFolder\LocalFolderNamingPolicy.cs" />
</ItemGroup>
</Project>
15 changes: 14 additions & 1 deletion tripod.sln
Expand Up @@ -7,6 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{BFCD1029-D
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tripod.Core", "src\Core\Tripod.Core\Tripod.Core.csproj", "{784596DC-6833-4A33-B1F5-1E0FCCB875CE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tripod.Sources", "src\Core\Tripod.Sources\Tripod.Sources.csproj", "{34E1DAD4-907A-4ECE-AE6C-50C580E7494D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Clients", "Clients", "{5F0FCE20-D1A8-4A77-9BDB-8AB550F2B1E4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlashUnit", "src\Clients\FlashUnit\FlashUnit.csproj", "{89FC8A65-234C-44E2-8CED-8F00C488231F}"
Expand Down Expand Up @@ -34,14 +36,24 @@ Global
{0507DCB3-938D-435C-8704-A6F767A82E12}.Release|x86.Build.0 = Release|x86
{0507DCB3-938D-435C-8704-A6F767A82E12}.Windows|Any CPU.ActiveCfg = Debug|x86
{0507DCB3-938D-435C-8704-A6F767A82E12}.Windows|Any CPU.Build.0 = Debug|x86
{34E1DAD4-907A-4ECE-AE6C-50C580E7494D}.Debug|x86.ActiveCfg = Debug|x86
{34E1DAD4-907A-4ECE-AE6C-50C580E7494D}.Debug|x86.Build.0 = Debug|x86
{34E1DAD4-907A-4ECE-AE6C-50C580E7494D}.Release|x86.ActiveCfg = Release|x86
{34E1DAD4-907A-4ECE-AE6C-50C580E7494D}.Release|x86.Build.0 = Release|x86
{34E1DAD4-907A-4ECE-AE6C-50C580E7494D}.Windows|Any CPU.ActiveCfg = Debug|x86
{34E1DAD4-907A-4ECE-AE6C-50C580E7494D}.Windows|Any CPU.Build.0 = Debug|x86
{784596DC-6833-4A33-B1F5-1E0FCCB875CE}.Debug|x86.ActiveCfg = Debug|x86
{784596DC-6833-4A33-B1F5-1E0FCCB875CE}.Debug|x86.Build.0 = Debug|x86
{784596DC-6833-4A33-B1F5-1E0FCCB875CE}.Release|x86.ActiveCfg = Release|x86
{784596DC-6833-4A33-B1F5-1E0FCCB875CE}.Release|x86.Build.0 = Release|x86
{784596DC-6833-4A33-B1F5-1E0FCCB875CE}.Windows|Any CPU.ActiveCfg = Debug|x86
{784596DC-6833-4A33-B1F5-1E0FCCB875CE}.Windows|Any CPU.Build.0 = Debug|x86
{89FC8A65-234C-44E2-8CED-8F00C488231F}.Debug|x86.ActiveCfg = Debug|x86
{89FC8A65-234C-44E2-8CED-8F00C488231F}.Debug|x86.Build.0 = Debug|x86
{89FC8A65-234C-44E2-8CED-8F00C488231F}.Release|x86.ActiveCfg = Release|x86
{89FC8A65-234C-44E2-8CED-8F00C488231F}.Release|x86.Build.0 = Release|x86
{89FC8A65-234C-44E2-8CED-8F00C488231F}.Windows|Any CPU.ActiveCfg = Debug|x86
{89FC8A65-234C-44E2-8CED-8F00C488231F}.Windows|Any CPU.Build.0 = Debug|x86
{95374549-9553-4C1E-9D89-667755F90E12}.Debug|x86.ActiveCfg = Debug|Any CPU
{95374549-9553-4C1E-9D89-667755F90E12}.Debug|x86.Build.0 = Debug|Any CPU
{95374549-9553-4C1E-9D89-667755F90E12}.Release|x86.ActiveCfg = Debug|Any CPU
Expand All @@ -66,14 +78,15 @@ Global
{5F0FCE20-D1A8-4A77-9BDB-8AB550F2B1E4} = {0D1C1F16-F7A7-456A-8C64-A9516B581863}
{EF589266-D6D1-4836-9AEE-C57AD5F52A4F} = {0D1C1F16-F7A7-456A-8C64-A9516B581863}
{784596DC-6833-4A33-B1F5-1E0FCCB875CE} = {BFCD1029-D09E-4728-BAD5-B0A29BC09C0F}
{34E1DAD4-907A-4ECE-AE6C-50C580E7494D} = {BFCD1029-D09E-4728-BAD5-B0A29BC09C0F}
{89FC8A65-234C-44E2-8CED-8F00C488231F} = {5F0FCE20-D1A8-4A77-9BDB-8AB550F2B1E4}
{95374549-9553-4C1E-9D89-667755F90E12} = {EF589266-D6D1-4836-9AEE-C57AD5F52A4F}
{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1} = {EF589266-D6D1-4836-9AEE-C57AD5F52A4F}
{0507DCB3-938D-435C-8704-A6F767A82E12} = {EF589266-D6D1-4836-9AEE-C57AD5F52A4F}
{C856EFD8-E812-4E61-8B76-E3583D94C233} = {EF589266-D6D1-4836-9AEE-C57AD5F52A4F}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = src\Clients\FlashUnit\FlashUnit.csproj
StartupItem = src\Core\Tripod.Core\Tripod.Core.csproj
Policies = $0
$0.TextStylePolicy = $1
$1.FileWidth = 120
Expand Down

0 comments on commit 9461258

Please sign in to comment.