GNOME.org
 

[tasque/restructure: 4/17] [repo] Move RtmNet to new src/Libraries folder

commit 8dbd085765b7422e81b63211ea67da01d4a7537e
Author: Antonius Riha <antoniusriha gmail com>
Date:   Sat Aug 25 22:33:41 2012 +0200

    [repo] Move RtmNet to new src/Libraries folder
    
    This unifies all source code in the src/ folder.

 .gitignore                                         |    6 +-
 Makefile.am                                        |    2 +-
 RtmNet/Makefile.am                                 |   64 --------------------
 configure.ac                                       |    2 +-
 src/Addins/Backends/Rtm/Makefile.am                |    2 +-
 .../Libraries/RtmNet}/ApiKeyRequiredException.cs   |    0
 {RtmNet => src/Libraries/RtmNet}/AssemblyInfo.cs   |    0
 {RtmNet => src/Libraries/RtmNet}/Auth.cs           |    0
 .../RtmNet}/AuthenticationRequiredException.cs     |    0
 {RtmNet => src/Libraries/RtmNet}/Categories.cs     |    0
 {RtmNet => src/Libraries/RtmNet}/Contacts.cs       |    0
 .../Libraries/RtmNet}/DateGranularity.cs           |    0
 {RtmNet => src/Libraries/RtmNet}/Enums.cs          |    0
 .../Libraries/RtmNet}/GroupSearchResults.cs        |    0
 {RtmNet => src/Libraries/RtmNet}/Groups.cs         |    0
 {RtmNet => src/Libraries/RtmNet}/HttpUtility.cs    |    0
 {RtmNet => src/Libraries/RtmNet}/License.txt       |    0
 {RtmNet => src/Libraries/RtmNet}/List.cs           |    0
 src/Libraries/RtmNet/Makefile.am                   |   64 ++++++++++++++++++++
 {RtmNet => src/Libraries/RtmNet}/Methods.cs        |    0
 {RtmNet => src/Libraries/RtmNet}/Note.cs           |    0
 {RtmNet => src/Libraries/RtmNet}/Response.cs       |    0
 .../Libraries/RtmNet}/ResponseXmlException.cs      |    0
 {RtmNet => src/Libraries/RtmNet}/Rtm.cs            |    0
 .../Libraries/RtmNet}/RtmApiException.cs           |    0
 {RtmNet => src/Libraries/RtmNet}/RtmException.cs   |    0
 {RtmNet => src/Libraries/RtmNet}/RtmNet.csproj     |    0
 {RtmNet => src/Libraries/RtmNet}/RtmNet.mdp        |    0
 .../Libraries/RtmNet}/RtmWebException.cs           |    0
 .../RtmNet}/SignatureRequiredException.cs          |    0
 {RtmNet => src/Libraries/RtmNet}/Tags.cs           |    0
 {RtmNet => src/Libraries/RtmNet}/Task.cs           |    0
 {RtmNet => src/Libraries/RtmNet}/User.cs           |    0
 {RtmNet => src/Libraries/RtmNet}/Utils.cs          |    0
 .../Libraries/RtmNet}/example_app.config           |    0
 src/Makefile.am                                    |    2 +-
 src/tasque/Makefile.am                             |    1 -
 tasque.sln                                         |    2 +-
 38 files changed, 72 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 826c2ff..f319f85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,6 +88,6 @@ Makefile.in
 /src/Addins/Backends/*/*.dll
 /src/Addins/Backends/*/*.mdb
 
-# /RtmNet
-/RtmNet/*.dll
-/RtmNet/*.mdb
+# /src/Libraries/RtmNet
+/src/Libraries/RtmNet/*.dll
+/src/Libraries/RtmNet/*.mdb
diff --git a/Makefile.am b/Makefile.am
index c7af24f..4a7dc32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = RtmNet src data po
+SUBDIRS = src data po
 
 pkgdata_DATA =  $(DLL_REFERENCES)
 DLL_REFERENCES =   
diff --git a/configure.ac b/configure.ac
index 6693674..27ad969 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,8 +245,8 @@ AC_SUBST(GACUTIL_FLAGS)
 
 AC_CONFIG_FILES([
 Makefile
-RtmNet/Makefile
 src/Makefile
+src/Libraries/RtmNet/Makefile
 src/libtasque/Makefile
 src/tasque/Makefile
 src/tasque/tasque.pc
diff --git a/src/Addins/Backends/Rtm/Makefile.am b/src/Addins/Backends/Rtm/Makefile.am
index 030047f..ca255b3 100644
--- a/src/Addins/Backends/Rtm/Makefile.am
+++ b/src/Addins/Backends/Rtm/Makefile.am
@@ -5,7 +5,7 @@ CSFILES = *.cs
 ASSEMBLIES = \
 	-r:../../../libtasque/libtasque.dll \
 	-r:../../../tasque/Tasque.exe \
-	-r:../../../../RtmNet/RtmNet.dll \
+	-r:../../../Libraries/RtmNet/RtmNet.dll \
 	-r:System \
 	-r:Mono.Posix \
 	$(GTK_DOTNET_20_LIBS)
diff --git a/RtmNet/ApiKeyRequiredException.cs b/src/Libraries/RtmNet/ApiKeyRequiredException.cs
similarity index 100%
rename from RtmNet/ApiKeyRequiredException.cs
rename to src/Libraries/RtmNet/ApiKeyRequiredException.cs
diff --git a/RtmNet/AssemblyInfo.cs b/src/Libraries/RtmNet/AssemblyInfo.cs
similarity index 100%
rename from RtmNet/AssemblyInfo.cs
rename to src/Libraries/RtmNet/AssemblyInfo.cs
diff --git a/RtmNet/Auth.cs b/src/Libraries/RtmNet/Auth.cs
similarity index 100%
rename from RtmNet/Auth.cs
rename to src/Libraries/RtmNet/Auth.cs
diff --git a/RtmNet/AuthenticationRequiredException.cs b/src/Libraries/RtmNet/AuthenticationRequiredException.cs
similarity index 100%
rename from RtmNet/AuthenticationRequiredException.cs
rename to src/Libraries/RtmNet/AuthenticationRequiredException.cs
diff --git a/RtmNet/Categories.cs b/src/Libraries/RtmNet/Categories.cs
similarity index 100%
rename from RtmNet/Categories.cs
rename to src/Libraries/RtmNet/Categories.cs
diff --git a/RtmNet/Contacts.cs b/src/Libraries/RtmNet/Contacts.cs
similarity index 100%
rename from RtmNet/Contacts.cs
rename to src/Libraries/RtmNet/Contacts.cs
diff --git a/RtmNet/DateGranularity.cs b/src/Libraries/RtmNet/DateGranularity.cs
similarity index 100%
rename from RtmNet/DateGranularity.cs
rename to src/Libraries/RtmNet/DateGranularity.cs
diff --git a/RtmNet/Enums.cs b/src/Libraries/RtmNet/Enums.cs
similarity index 100%
rename from RtmNet/Enums.cs
rename to src/Libraries/RtmNet/Enums.cs
diff --git a/RtmNet/GroupSearchResults.cs b/src/Libraries/RtmNet/GroupSearchResults.cs
similarity index 100%
rename from RtmNet/GroupSearchResults.cs
rename to src/Libraries/RtmNet/GroupSearchResults.cs
diff --git a/RtmNet/Groups.cs b/src/Libraries/RtmNet/Groups.cs
similarity index 100%
rename from RtmNet/Groups.cs
rename to src/Libraries/RtmNet/Groups.cs
diff --git a/RtmNet/HttpUtility.cs b/src/Libraries/RtmNet/HttpUtility.cs
similarity index 100%
rename from RtmNet/HttpUtility.cs
rename to src/Libraries/RtmNet/HttpUtility.cs
diff --git a/RtmNet/License.txt b/src/Libraries/RtmNet/License.txt
similarity index 100%
rename from RtmNet/License.txt
rename to src/Libraries/RtmNet/License.txt
diff --git a/RtmNet/List.cs b/src/Libraries/RtmNet/List.cs
similarity index 100%
rename from RtmNet/List.cs
rename to src/Libraries/RtmNet/List.cs
diff --git a/src/Libraries/RtmNet/Makefile.am b/src/Libraries/RtmNet/Makefile.am
new file mode 100644
index 0000000..8c25ea8
--- /dev/null
+++ b/src/Libraries/RtmNet/Makefile.am
@@ -0,0 +1,64 @@
+CSC = $(DMCS)
+
+TARGET = RtmNet.dll
+
+if ENABLE_DEBUG
+CSFLAGS = -debug -d:DEBUG
+MDBFILES = $(TARGET).mdb
+endif
+
+CSFILES = \
+	ApiKeyRequiredException.cs		\
+	AssemblyInfo.cs			\
+	Auth.cs				\
+	AuthenticationRequiredException.cs	\
+	Categories.cs				\
+	Contacts.cs				\
+	DateGranularity.cs			\
+	Enums.cs				\
+	Groups.cs				\
+	GroupSearchResults.cs			\
+	HttpUtility.cs			\
+	List.cs				\
+	Methods.cs				\
+	Note.cs				\
+	Response.cs				\
+	ResponseXmlException.cs		\
+	RtmApiException.cs			\
+	Rtm.cs				\
+	RtmException.cs			\
+	RtmWebException.cs			\
+	SignatureRequiredException.cs		\
+	Tags.cs				\
+	Task.cs				\
+	User.cs				\
+	Utils.cs
+
+
+RESOURCES = 
+
+ASSEMBLIES =  \
+	-r:System \
+	-r:System.Xml
+
+$(TARGET): $(CSFILES)
+	$(CSC) -unsafe -out:$@ -t:library -noconfig -codepage:utf8 -warn:4 $(CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
+
+$(TARGET).mdb: $(TARGET)
+
+tasquelibdir = $(libdir)/tasque
+tasquelib_DATA = $(TARGET) $(MDBFILES)
+
+bin_SCRIPTS = $(WRAPPER)
+
+
+EXTRA_DIST = \
+	$(CSFILES)
+
+CLEANFILES = \
+	$(TARGET)					\
+	$(TARGET).mdb
+
+DISTCLEANFILES =                        \
+	$(TARGET)			\
+	$(TARGET).mdb
diff --git a/RtmNet/Methods.cs b/src/Libraries/RtmNet/Methods.cs
similarity index 100%
rename from RtmNet/Methods.cs
rename to src/Libraries/RtmNet/Methods.cs
diff --git a/RtmNet/Note.cs b/src/Libraries/RtmNet/Note.cs
similarity index 100%
rename from RtmNet/Note.cs
rename to src/Libraries/RtmNet/Note.cs
diff --git a/RtmNet/Response.cs b/src/Libraries/RtmNet/Response.cs
similarity index 100%
rename from RtmNet/Response.cs
rename to src/Libraries/RtmNet/Response.cs
diff --git a/RtmNet/ResponseXmlException.cs b/src/Libraries/RtmNet/ResponseXmlException.cs
similarity index 100%
rename from RtmNet/ResponseXmlException.cs
rename to src/Libraries/RtmNet/ResponseXmlException.cs
diff --git a/RtmNet/Rtm.cs b/src/Libraries/RtmNet/Rtm.cs
similarity index 100%
rename from RtmNet/Rtm.cs
rename to src/Libraries/RtmNet/Rtm.cs
diff --git a/RtmNet/RtmApiException.cs b/src/Libraries/RtmNet/RtmApiException.cs
similarity index 100%
rename from RtmNet/RtmApiException.cs
rename to src/Libraries/RtmNet/RtmApiException.cs
diff --git a/RtmNet/RtmException.cs b/src/Libraries/RtmNet/RtmException.cs
similarity index 100%
rename from RtmNet/RtmException.cs
rename to src/Libraries/RtmNet/RtmException.cs
diff --git a/RtmNet/RtmNet.csproj b/src/Libraries/RtmNet/RtmNet.csproj
similarity index 100%
rename from RtmNet/RtmNet.csproj
rename to src/Libraries/RtmNet/RtmNet.csproj
diff --git a/RtmNet/RtmNet.mdp b/src/Libraries/RtmNet/RtmNet.mdp
similarity index 100%
rename from RtmNet/RtmNet.mdp
rename to src/Libraries/RtmNet/RtmNet.mdp
diff --git a/RtmNet/RtmWebException.cs b/src/Libraries/RtmNet/RtmWebException.cs
similarity index 100%
rename from RtmNet/RtmWebException.cs
rename to src/Libraries/RtmNet/RtmWebException.cs
diff --git a/RtmNet/SignatureRequiredException.cs b/src/Libraries/RtmNet/SignatureRequiredException.cs
similarity index 100%
rename from RtmNet/SignatureRequiredException.cs
rename to src/Libraries/RtmNet/SignatureRequiredException.cs
diff --git a/RtmNet/Tags.cs b/src/Libraries/RtmNet/Tags.cs
similarity index 100%
rename from RtmNet/Tags.cs
rename to src/Libraries/RtmNet/Tags.cs
diff --git a/RtmNet/Task.cs b/src/Libraries/RtmNet/Task.cs
similarity index 100%
rename from RtmNet/Task.cs
rename to src/Libraries/RtmNet/Task.cs
diff --git a/RtmNet/User.cs b/src/Libraries/RtmNet/User.cs
similarity index 100%
rename from RtmNet/User.cs
rename to src/Libraries/RtmNet/User.cs
diff --git a/RtmNet/Utils.cs b/src/Libraries/RtmNet/Utils.cs
similarity index 100%
rename from RtmNet/Utils.cs
rename to src/Libraries/RtmNet/Utils.cs
diff --git a/RtmNet/example_app.config b/src/Libraries/RtmNet/example_app.config
similarity index 100%
rename from RtmNet/example_app.config
rename to src/Libraries/RtmNet/example_app.config
diff --git a/src/Makefile.am b/src/Makefile.am
index 3064b5a..96122a5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = libtasque tasque Addins/Backends
+SUBDIRS = Libraries/RtmNet libtasque tasque Addins/Backends
diff --git a/src/tasque/Makefile.am b/src/tasque/Makefile.am
index 6f38d49..5a8bd69 100644
--- a/src/tasque/Makefile.am
+++ b/src/tasque/Makefile.am
@@ -75,7 +75,6 @@ ASSEMBLIES =  \
 	-r:System.Core \
 	-r:Mono.Posix \
 	-r:System.Xml \
-	-r:$(top_builddir)/RtmNet/RtmNet \
 	-r:../libtasque/libtasque.dll \
 	$(GLIB_SHARP_20_LIBS) \
 	$(GNOME_SHARP_20_LIBS) \
diff --git a/tasque.sln b/tasque.sln
index 101601a..8b436d5 100644
--- a/tasque.sln
+++ b/tasque.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tasque", "src\tasque\tasque.csproj", "{B19B9840-669D-4984-9772-E1F55193A67F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RtmNet", "RtmNet\RtmNet.csproj", "{0AA1B96E-03DE-4D26-B4FD-507E988FD9B7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RtmNet", "src\Libraries\RtmNet\RtmNet.csproj", "{0AA1B96E-03DE-4D26-B4FD-507E988FD9B7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libtasque", "src\libtasque\libtasque.csproj", "{784C9AA8-2B28-400B-8CC4-DCDC48CA37F0}"
 EndProject
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]