beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'backend-dlls' of https://github.com/shish/SparkleShare into shish

Browse source
This commit is contained in:
Hylke Bons 2012-03-01 16:34:45 +00:00
parent c71e233dce 6835489eff
commit fda4cc3f26
8 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -1,4 +1,4 @@
basedirs = build SparkleLib data po
basedirs = build SparkleLib SparkleLib/Git data po
SUBDIRS = $(basedirs) $(GUISUBDIRS)
DIST_SUBDIRS = $(basedirs) SparkleShare

22
SparkleLib/Git/Makefile.am Executable file
View file

@ -0,0 +1,22 @@
ASSEMBLY = SparkleLib.Git
TARGET = library
LINK = -r:$(DIR_BIN)/SparkleLib.dll
SOURCES = \
SparkleGit.cs \
SparkleFetcherGit.cs \
SparkleRepoGit.cs
install-data-hook:
for ASM in $(EXTRA_BUNDLE); do \
$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
done;
uninstall-hook:
for ASM in $(EXTRA_BUNDLE); do \
rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
done;
include $(top_srcdir)/build/build.mk

1
SparkleLib/Git/SparkleFetcherGit.cs
View file

@ -20,6 +20,7 @@ using System.IO;
using System.Diagnostics;
using System.Text.RegularExpressions;
using System.Threading;
using SparkleLib;
namespace SparkleLib {

1
SparkleLib/Git/SparkleGit.cs
View file

@ -18,6 +18,7 @@
using System;
using System.IO;
using System.Diagnostics;
using SparkleLib;
namespace SparkleLib {

1
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -19,6 +19,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Text.RegularExpressions;
using SparkleLib;
namespace SparkleLib {

3
SparkleLib/Makefile.am
View file

@ -3,9 +3,6 @@ TARGET = library
SOURCES = \
Defines.cs \
Git/SparkleFetcherGit.cs \
Git/SparkleGit.cs \
Git/SparkleRepoGit.cs \
SparkleAnnouncement.cs \
SparkleBackend.cs \
SparkleChangeSet.cs \

4
SparkleShare/SparkleControllerBase.cs
View file

@ -614,7 +614,7 @@ namespace SparkleShare {
try {
repo = (SparkleRepoBase) Activator.CreateInstance (
Type.GetType ("SparkleLib.SparkleRepo" + backend + ", SparkleLib"),
Type.GetType ("SparkleLib.SparkleRepo" + backend + ", SparkleLib." + backend),
folder_path
);
@ -1015,7 +1015,7 @@ namespace SparkleShare {
try {
this.fetcher = (SparkleFetcherBase) Activator.CreateInstance (
Type.GetType ("SparkleLib.SparkleFetcher" + backend + ", SparkleLib"),
Type.GetType ("SparkleLib.SparkleFetcher" + backend + ", SparkleLib." + backend),
server,
remote_folder,
tmp_folder

1
configure.ac
View file

@ -157,6 +157,7 @@ data/plugins/Makefile
SparkleLib/AssemblyInfo.cs
SparkleLib/Defines.cs
SparkleLib/Makefile
SparkleLib/Git/Makefile
SparkleShare/sparkleshare
SparkleShare/Makefile
SparkleShare/Mac/Makefile