Merge branch 're-org' of git://gitorious.org/~bl8/sparkleshare/bl8s-sparkleshare into integration
This commit is contained in:
commit
96a347bcc1
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -4,10 +4,6 @@
|
||||||
*.userprefs
|
*.userprefs
|
||||||
*.pidb
|
*.pidb
|
||||||
*.gmo
|
*.gmo
|
||||||
/SparkleShare/bin
|
|
||||||
/SparkleShare/obj
|
|
||||||
/notify-sharp/bin
|
|
||||||
/notify-sharp/obj
|
|
||||||
po/POTFILES
|
po/POTFILES
|
||||||
Makefile.in
|
Makefile.in
|
||||||
Makefile
|
Makefile
|
||||||
|
@ -31,7 +27,7 @@ missing
|
||||||
po/.intltool-merge-cache
|
po/.intltool-merge-cache
|
||||||
po/Makefile.in.in
|
po/Makefile.in.in
|
||||||
po/stamp-it
|
po/stamp-it
|
||||||
SparkleShare/AssemblyInfo.cs
|
SparkleLib/AssemblyInfo.cs
|
||||||
build/m4/shave/shave
|
build/m4/shave/shave
|
||||||
build/m4/*.m4
|
build/m4/*.m4
|
||||||
build/m4/shave/shave-libtool
|
build/m4/shave/shave-libtool
|
||||||
|
|
11
FriendFace/Makefile.am
Normal file
11
FriendFace/Makefile.am
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
ASSEMBLY = FriendFace
|
||||||
|
TARGET = library
|
||||||
|
|
||||||
|
LINK = $(REF_FRIENDFACE)
|
||||||
|
|
||||||
|
SOURCES = \
|
||||||
|
FriendFace.cs \
|
||||||
|
GravatarIconProvider.cs \
|
||||||
|
IconProvider.cs
|
||||||
|
|
||||||
|
include $(top_srcdir)/build/build.mk
|
|
@ -1,6 +1,8 @@
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
build \
|
build \
|
||||||
NotifySharp \
|
NotifySharp \
|
||||||
|
FriendFace \
|
||||||
|
SparkleLib \
|
||||||
SparkleShare \
|
SparkleShare \
|
||||||
SparkleDiff \
|
SparkleDiff \
|
||||||
data \
|
data \
|
||||||
|
|
|
@ -3,14 +3,10 @@ TARGET = exe
|
||||||
|
|
||||||
LINK = $(REF_SPARKLEDIFF)
|
LINK = $(REF_SPARKLEDIFF)
|
||||||
|
|
||||||
SOURCES = \
|
SOURCES = \
|
||||||
$(top_srcdir)/SparkleShare/Defines.cs \
|
RevisionImage.cs \
|
||||||
$(top_srcdir)/FriendFace/FriendFace.cs \
|
RevisionView.cs \
|
||||||
$(top_srcdir)/FriendFace/IconProvider.cs \
|
SparkleDiff.cs \
|
||||||
$(top_srcdir)/FriendFace/GravatarIconProvider.cs \
|
SparkleDiffWindow.cs
|
||||||
SparkleDiff.cs \
|
|
||||||
SparkleDiffWindow.cs \
|
|
||||||
RevisionView.cs \
|
|
||||||
RevisionImage.cs
|
|
||||||
|
|
||||||
include $(top_srcdir)/build/build.mk
|
include $(top_srcdir)/build/build.mk
|
||||||
|
|
|
@ -20,6 +20,7 @@ using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
using SparkleLib;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
|
||||||
|
|
70
SparkleDiff/SparkleDiff.csproj
Normal file
70
SparkleDiff/SparkleDiff.csproj
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||||
|
<ProductVersion>8.0.50727</ProductVersion>
|
||||||
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
|
<ProjectGuid>{17BF02CB-852A-4756-BA05-EC454643C428}</ProjectGuid>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<RootNamespace>SparkleDiff</RootNamespace>
|
||||||
|
<AssemblyName>SparkleDiff</AssemblyName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>..\bin</OutputPath>
|
||||||
|
<DefineConstants>DEBUG</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<ConsolePause>false</ConsolePause>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
|
<DebugType>none</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>..\bin</OutputPath>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<ConsolePause>false</ConsolePause>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="SparkleDiff.cs" />
|
||||||
|
<Compile Include="SparkleDiffWindow.cs" />
|
||||||
|
<Compile Include="RevisionView.cs" />
|
||||||
|
<Compile Include="RevisionImage.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\FriendFace\FriendFace.csproj">
|
||||||
|
<Project>{3BA434AF-494F-4F5D-9D21-B7BD24FD67AF}</Project>
|
||||||
|
<Name>FriendFace</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\SparkleLib\SparkleLib.csproj">
|
||||||
|
<Project>{2C914413-B31C-4362-93C7-1AE34F09112A}</Project>
|
||||||
|
<Name>SparkleLib</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="System" />
|
||||||
|
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
|
||||||
|
<Package>gtk-sharp-2.0</Package>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Mono.Posix" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
|
<ProjectExtensions>
|
||||||
|
<MonoDevelop>
|
||||||
|
<Properties InternalTargetFrameworkVersion="3.5">
|
||||||
|
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am">
|
||||||
|
<BuildFilesVar Sync="true" Name="SOURCES" />
|
||||||
|
<DeployFilesVar />
|
||||||
|
<ResourcesVar />
|
||||||
|
<OthersVar />
|
||||||
|
<GacRefVar />
|
||||||
|
<AsmRefVar />
|
||||||
|
<ProjectRefVar />
|
||||||
|
</MonoDevelop.Autotools.MakefileInfo>
|
||||||
|
</Properties>
|
||||||
|
</MonoDevelop>
|
||||||
|
</ProjectExtensions>
|
||||||
|
</Project>
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleLib {
|
||||||
|
|
||||||
public class Defines {
|
public class Defines {
|
||||||
|
|
14
SparkleLib/Makefile.am
Normal file
14
SparkleLib/Makefile.am
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
ASSEMBLY = SparkleLib
|
||||||
|
TARGET = library
|
||||||
|
|
||||||
|
LINK = $(REF_SPARKLELIB)
|
||||||
|
|
||||||
|
SOURCES = \
|
||||||
|
Defines.cs \
|
||||||
|
SparkleFetcher.cs \
|
||||||
|
SparkleHelpers.cs \
|
||||||
|
SparklePaths.cs \
|
||||||
|
SparklePlatform.cs \
|
||||||
|
SparkleRepo.cs
|
||||||
|
|
||||||
|
include $(top_srcdir)/build/build.mk
|
|
@ -14,12 +14,11 @@
|
||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
using Gtk;
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleLib {
|
||||||
|
|
||||||
public class SparkleFetcher {
|
public class SparkleFetcher {
|
||||||
|
|
|
@ -23,7 +23,7 @@ using System.Security.Cryptography;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleLib {
|
||||||
|
|
||||||
public static class SparkleHelpers
|
public static class SparkleHelpers
|
||||||
{
|
{
|
62
SparkleLib/SparkleLib.csproj
Normal file
62
SparkleLib/SparkleLib.csproj
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||||
|
<ProductVersion>8.0.50727</ProductVersion>
|
||||||
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
|
<ProjectGuid>{2C914413-B31C-4362-93C7-1AE34F09112A}</ProjectGuid>
|
||||||
|
<OutputType>Library</OutputType>
|
||||||
|
<RootNamespace>SparkleLib</RootNamespace>
|
||||||
|
<AssemblyName>SparkleLib</AssemblyName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>..\bin</OutputPath>
|
||||||
|
<DefineConstants>DEBUG</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<ConsolePause>false</ConsolePause>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
|
<DebugType>none</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>..\bin</OutputPath>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<ConsolePause>false</ConsolePause>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="System" />
|
||||||
|
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
|
||||||
|
<Package>gtk-sharp-2.0</Package>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Mono.Posix" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="SparkleRepo.cs" />
|
||||||
|
<Compile Include="SparkleFetcher.cs" />
|
||||||
|
<Compile Include="Defines.cs" />
|
||||||
|
<Compile Include="SparkleHelpers.cs" />
|
||||||
|
<Compile Include="SparklePaths.cs" />
|
||||||
|
<Compile Include="SparklePlatform.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
|
<ProjectExtensions>
|
||||||
|
<MonoDevelop>
|
||||||
|
<Properties InternalTargetFrameworkVersion="3.5">
|
||||||
|
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am">
|
||||||
|
<BuildFilesVar Sync="true" Name="SOURCES" />
|
||||||
|
<DeployFilesVar />
|
||||||
|
<ResourcesVar />
|
||||||
|
<OthersVar />
|
||||||
|
<GacRefVar />
|
||||||
|
<AsmRefVar />
|
||||||
|
<ProjectRefVar />
|
||||||
|
</MonoDevelop.Autotools.MakefileInfo>
|
||||||
|
</Properties>
|
||||||
|
</MonoDevelop>
|
||||||
|
</ProjectExtensions>
|
||||||
|
</Project>
|
|
@ -14,11 +14,11 @@
|
||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
using Mono.Unix;
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using Mono.Unix;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleLib {
|
||||||
|
|
||||||
public static class SparklePaths
|
public static class SparklePaths
|
||||||
{
|
{
|
|
@ -14,16 +14,14 @@
|
||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
using Gtk;
|
|
||||||
using Mono.Unix;
|
using Mono.Unix;
|
||||||
using SparkleShare;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Timers;
|
using System.Timers;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleLib {
|
||||||
|
|
||||||
public class SparkleRepo
|
public class SparkleRepo
|
||||||
{
|
{
|
|
@ -7,6 +7,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotifySharp", "NotifySharp\
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FriendFace", "FriendFace\FriendFace.csproj", "{3BA434AF-494F-4F5D-9D21-B7BD24FD67AF}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FriendFace", "FriendFace\FriendFace.csproj", "{3BA434AF-494F-4F5D-9D21-B7BD24FD67AF}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleDiff", "SparkleDiff\SparkleDiff.csproj", "{17BF02CB-852A-4756-BA05-EC454643C428}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "SparkleLib\SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
@ -17,6 +21,14 @@ Global
|
||||||
{005CCA8E-DFBF-464A-B6DA-452C62D4589C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{005CCA8E-DFBF-464A-B6DA-452C62D4589C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{005CCA8E-DFBF-464A-B6DA-452C62D4589C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{005CCA8E-DFBF-464A-B6DA-452C62D4589C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{005CCA8E-DFBF-464A-B6DA-452C62D4589C}.Release|Any CPU.Build.0 = Release|Any CPU
|
{005CCA8E-DFBF-464A-B6DA-452C62D4589C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{17BF02CB-852A-4756-BA05-EC454643C428}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{17BF02CB-852A-4756-BA05-EC454643C428}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{17BF02CB-852A-4756-BA05-EC454643C428}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{17BF02CB-852A-4756-BA05-EC454643C428}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{3BA434AF-494F-4F5D-9D21-B7BD24FD67AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{3BA434AF-494F-4F5D-9D21-B7BD24FD67AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{3BA434AF-494F-4F5D-9D21-B7BD24FD67AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{3BA434AF-494F-4F5D-9D21-B7BD24FD67AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{3BA434AF-494F-4F5D-9D21-B7BD24FD67AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{3BA434AF-494F-4F5D-9D21-B7BD24FD67AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
|
|
@ -8,14 +8,8 @@ LINK = $(REF_SPARKLESHARE)
|
||||||
|
|
||||||
|
|
||||||
SOURCES = \
|
SOURCES = \
|
||||||
Defines.cs \
|
|
||||||
SparkleBubble.cs \
|
SparkleBubble.cs \
|
||||||
SparkleFetcher.cs \
|
|
||||||
SparkleHelpers.cs \
|
|
||||||
SparkleIntro.cs \
|
SparkleIntro.cs \
|
||||||
SparklePaths.cs \
|
|
||||||
SparklePlatform.cs \
|
|
||||||
SparkleRepo.cs \
|
|
||||||
SparkleShare.cs \
|
SparkleShare.cs \
|
||||||
SparkleSpinner.cs \
|
SparkleSpinner.cs \
|
||||||
SparkleStatusIcon.cs \
|
SparkleStatusIcon.cs \
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Mono.Unix;
|
using Mono.Unix;
|
||||||
using SparkleShare;
|
using SparkleLib;
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
|
@ -18,6 +18,7 @@ using Gtk;
|
||||||
using Mono.Unix;
|
using Mono.Unix;
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
using SparkleLib;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
|
||||||
|
|
|
@ -42,29 +42,26 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="SparkleBubble.cs" />
|
<Compile Include="SparkleBubble.cs" />
|
||||||
<Compile Include="SparkleFetcher.cs" />
|
|
||||||
<Compile Include="SparkleIntro.cs" />
|
<Compile Include="SparkleIntro.cs" />
|
||||||
<Compile Include="SparkleHelpers.cs" />
|
|
||||||
<Compile Include="SparklePaths.cs" />
|
|
||||||
<Compile Include="SparklePlatform.cs" />
|
|
||||||
<Compile Include="SparkleRepo.cs" />
|
|
||||||
<Compile Include="SparkleShare.cs" />
|
<Compile Include="SparkleShare.cs" />
|
||||||
<Compile Include="SparkleSpinner.cs" />
|
<Compile Include="SparkleSpinner.cs" />
|
||||||
<Compile Include="SparkleStatusIcon.cs" />
|
<Compile Include="SparkleStatusIcon.cs" />
|
||||||
<Compile Include="SparkleUI.cs" />
|
<Compile Include="SparkleUI.cs" />
|
||||||
<Compile Include="SparkleWindow.cs" />
|
<Compile Include="SparkleWindow.cs" />
|
||||||
<Compile Include="SparkleIntro.cs" />
|
|
||||||
<Compile Include="Defines.cs" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\NotifySharp\NotifySharp.csproj">
|
<ProjectReference Include="..\NotifySharp\NotifySharp.csproj">
|
||||||
<Project>{005CCA8E-DFBF-464A-B6DA-452C62D4589C}</Project>
|
<Project>{005CCA8E-DFBF-464A-B6DA-452C62D4589C}</Project>
|
||||||
<Name>NotifySharp</Name>
|
<Name>NotifySharp</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\SparkleLib\SparkleLib.csproj">
|
||||||
|
<Project>{2C914413-B31C-4362-93C7-1AE34F09112A}</Project>
|
||||||
|
<Name>SparkleLib</Name>
|
||||||
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
<MonoDevelop>
|
<MonoDevelop>
|
||||||
<Properties>
|
<Properties InternalTargetFrameworkVersion="3.5">
|
||||||
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am">
|
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am">
|
||||||
<BuildFilesVar Sync="true" Name="SOURCES" />
|
<BuildFilesVar Sync="true" Name="SOURCES" />
|
||||||
<DeployFilesVar />
|
<DeployFilesVar />
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using System.Timers;
|
using System.Timers;
|
||||||
|
using SparkleLib;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Mono.Unix;
|
using Mono.Unix;
|
||||||
using SparkleShare;
|
using SparkleLib;
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Mono.Unix;
|
using Mono.Unix;
|
||||||
using Mono.Unix.Native;
|
using Mono.Unix.Native;
|
||||||
using SparkleShare;
|
using SparkleLib;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Mono.Unix;
|
using Mono.Unix;
|
||||||
using SparkleShare;
|
using SparkleLib;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
|
|
@ -30,13 +30,17 @@ REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS
|
||||||
LINK_NOTIFY_SHARP = -r:$(DIR_BIN)/NotifySharp.dll
|
LINK_NOTIFY_SHARP = -r:$(DIR_BIN)/NotifySharp.dll
|
||||||
LINK_NOTIFY_SHARP_DEPS = $(REF_NOTIFY_SHARP) $(LINK_NOTIFY_SHARP)
|
LINK_NOTIFY_SHARP_DEPS = $(REF_NOTIFY_SHARP) $(LINK_NOTIFY_SHARP)
|
||||||
|
|
||||||
REF_SPARKLESHARE = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_DBUS) $(LINK_NOTIFY_SHARP_DEPS) $(LINK_MONO_POSIX)
|
REF_FRIENDFACE = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_MONO_POSIX)
|
||||||
LINK_SPARKLESHARE = -r:$(DIR_BIN)/SparkleShare.exe
|
LINK_FRIENDFACE = -r:$(DIR_BIN)/FriendFace.dll
|
||||||
LINK_SPARKLESHARE_DEPS = $(REF_SPARKLESHARE) $(LINK_SPARKLESHARE)
|
LINK_FRIENDFACE_DEPS = $(REF_FRIENDFACE) $(LINK_FRIENDFACE)
|
||||||
|
|
||||||
REF_SPARKLEDIFF = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_DBUS) $(LINK_MONO_POSIX)
|
REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_MONO_POSIX)
|
||||||
LINK_SPARKLEDIFF = -r:$(DIR_BIN)/SparkleShare.exe
|
LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll
|
||||||
LINK_SPARKLEDIFF_DEPS = $(REF_SPARKLEDIFF) $(LINK_SPARKLEDIFF)
|
LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB)
|
||||||
|
|
||||||
|
REF_SPARKLESHARE = $(LINK_DBUS) $(LINK_NOTIFY_SHARP_DEPS) $(LINK_SPARKLELIB_DEPS)
|
||||||
|
|
||||||
|
REF_SPARKLEDIFF = $(LINK_FRIENDFACE_DEPS) $(LINK_SPARKLELIB_DEPS)
|
||||||
|
|
||||||
# Cute hack to replace a space with something
|
# Cute hack to replace a space with something
|
||||||
colon:= :
|
colon:= :
|
||||||
|
|
|
@ -9,7 +9,7 @@ ASSEMBLY_INFO_SOURCE_REAL = \
|
||||||
then \
|
then \
|
||||||
echo "$(addprefix $(srcdir)/, $(ASSEMBLY_INFO_SOURCE))"; \
|
echo "$(addprefix $(srcdir)/, $(ASSEMBLY_INFO_SOURCE))"; \
|
||||||
else \
|
else \
|
||||||
echo "$(top_srcdir)/SparkleShare/AssemblyInfo.cs"; \
|
echo "$(top_srcdir)/SparkleLib/AssemblyInfo.cs"; \
|
||||||
fi)
|
fi)
|
||||||
|
|
||||||
SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES))
|
SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES))
|
||||||
|
|
|
@ -88,11 +88,13 @@ build/m4/shave/shave
|
||||||
build/m4/shave/shave-libtool
|
build/m4/shave/shave-libtool
|
||||||
data/Makefile
|
data/Makefile
|
||||||
data/icons/Makefile
|
data/icons/Makefile
|
||||||
|
FriendFace/Makefile
|
||||||
NotifySharp/Makefile
|
NotifySharp/Makefile
|
||||||
SparkleDiff/Makefile
|
SparkleDiff/Makefile
|
||||||
|
SparkleLib/AssemblyInfo.cs
|
||||||
|
SparkleLib/Defines.cs
|
||||||
|
SparkleLib/Makefile
|
||||||
SparkleShare/sparkleshare
|
SparkleShare/sparkleshare
|
||||||
SparkleShare/Defines.cs
|
|
||||||
SparkleShare/AssemblyInfo.cs
|
|
||||||
SparkleShare/Makefile
|
SparkleShare/Makefile
|
||||||
SparkleShare/Nautilus/Makefile
|
SparkleShare/Nautilus/Makefile
|
||||||
SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
|
SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
|
||||||
|
|
|
@ -4,14 +4,14 @@
|
||||||
[encoding: UTF-8]
|
[encoding: UTF-8]
|
||||||
SparkleDiff/SparkleDiff.cs
|
SparkleDiff/SparkleDiff.cs
|
||||||
SparkleDiff/SparkleDiffWindow.cs
|
SparkleDiff/SparkleDiffWindow.cs
|
||||||
|
SparkleLib/SparkleFetcher.cs
|
||||||
|
SparkleLib/SparkleHelpers.cs
|
||||||
|
SparkleLib/SparklePaths.cs
|
||||||
|
SparkleLib/SparklePlatform.cs
|
||||||
|
SparkleLib/SparkleRepo.cs
|
||||||
SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
|
SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
|
||||||
SparkleShare/SparkleBubble.cs
|
SparkleShare/SparkleBubble.cs
|
||||||
SparkleShare/SparkleFetcher.cs
|
|
||||||
SparkleShare/SparkleHelpers.cs
|
|
||||||
SparkleShare/SparkleIntro.cs
|
SparkleShare/SparkleIntro.cs
|
||||||
SparkleShare/SparklePaths.cs
|
|
||||||
SparkleShare/SparklePlatform.cs
|
|
||||||
SparkleShare/SparkleRepo.cs
|
|
||||||
SparkleShare/SparkleShare.cs
|
SparkleShare/SparkleShare.cs
|
||||||
SparkleShare/SparkleSpinner.cs
|
SparkleShare/SparkleSpinner.cs
|
||||||
SparkleShare/SparkleStatusIcon.cs
|
SparkleShare/SparkleStatusIcon.cs
|
||||||
|
|
Loading…
Reference in a new issue