[tasque/restructure: 2/17] [build, repo] Divided Tasque.exe into libtasque.dll and Tasque.exe

From: Antonius Riha <antoniusri src gnome org>
To: commits-list gnome org
Cc:
Subject: [tasque/restructure: 2/17] [build, repo] Divided Tasque.exe into libtasque.dll and Tasque.exe
Date: Wed, 29 Aug 2012 18:18:38 +0000 (UTC)
commit 1ce80c59cfd7b15df7c6c3dde42b4dd5485dea20
Author: Antonius Riha <antoniusriha gmail com>
Date:   Sat Aug 25 21:51:16 2012 +0200

    [build,repo] Divided Tasque.exe into libtasque.dll and Tasque.exe
    
    Though already logically diveded into a frontend and a model,
    everything has been built into a common assembly. Now those
    logical parts have been also separated on the build level and are
    built into libtasque.dll and Tasque.exe.
    
    The Tasque.exe source has been moved into a tasque subfolder
    to make the separation more appearent in the directory tree.

 configure.ac                                |   32 +++---
 src/Addins/Backends/Dummy/Makefile.am       |    3 +-
 src/Addins/Backends/Rtm/Makefile.am         |    3 +-
 src/Addins/Backends/Sqlite/Makefile.am      |    3 +-
 src/Makefile.am                             |  181 +--------------------------
 src/libtasque/Makefile.am                   |   60 +++++++++
 src/{ => tasque}/AbstractTask.cs            |    0
 src/{ => tasque}/AllCategory.cs             |    0
 src/{ => tasque}/AppIndicatorTray.cs        |    0
 src/{ => tasque}/Application.cs             |    0
 src/{ => tasque}/CellRendererDate.cs        |    0
 src/{ => tasque}/CompletedTaskGroup.cs      |    0
 src/{ => tasque}/CompletedTaskGroupModel.cs |    0
 src/{ => tasque}/DateButton.cs              |    0
 src/{ => tasque}/Defines.WIN32.cs           |    0
 src/{ => tasque}/Defines.cs.in              |    0
 src/{ => tasque}/GnomeApplication.cs        |    0
 src/{ => tasque}/GtkApplication.cs          |    0
 src/{ => tasque}/GtkTray.cs                 |    0
 src/{ => tasque}/Logger.cs                  |    0
 src/tasque/Makefile.am                      |  144 +++++++++++++++++++++
 src/{ => tasque}/NoteDialog.cs              |    0
 src/{ => tasque}/NoteWidget.cs              |    0
 src/{ => tasque}/OSXApplication.cs          |    0
 src/{ => tasque}/Preferences.cs             |    0
 src/{ => tasque}/PreferencesDialog.cs       |    0
 src/{ => tasque}/RemoteControl.cs           |    0
 src/{ => tasque}/RemoteControlProxy.cs      |    0
 src/{ => tasque}/RtmDeveloperKey.txt        |    0
 src/{ => tasque}/StatusIconTray.cs          |    0
 src/{ => tasque}/TaskCalendar.cs            |    0
 src/{ => tasque}/TaskGroup.cs               |    0
 src/{ => tasque}/TaskGroupModel.cs          |    0
 src/{ => tasque}/TaskGroupModelFactory.cs   |    0
 src/{ => tasque}/TaskTreeView.cs            |    0
 src/{ => tasque}/TaskWindow.cs              |    0
 src/{ => tasque}/Tasque.exe.config.in       |    0
 src/{ => tasque}/Utilities.cs               |    0
 tasque.csproj => src/tasque/tasque.csproj   |  159 ++++++++++++++++--------
 src/{ => tasque}/tasque.in                  |    0
 src/{ => tasque}/tasque.pc.in               |    0
 tasque.sln                                  |    4 +-
 42 files changed, 335 insertions(+), 254 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a3a36e5..6693674 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,21 +244,23 @@ AC_SUBST(GACUTIL_FLAGS)
 ### End GAC tool ###
 
 AC_CONFIG_FILES([
-./Makefile
-./RtmNet/Makefile
-./src/Makefile
-./src/tasque.pc
-./src/Addins/Backends/Makefile
-./src/Addins/Backends/Dummy/Makefile
-./src/Addins/Backends/Eds/Makefile
-./src/Addins/Backends/Hiveminder/Makefile
-./src/Addins/Backends/IceCore/Makefile
-./src/Addins/Backends/Rtm/Makefile
-./src/Addins/Backends/Sqlite/Makefile
-./data/Makefile
-./data/images/Makefile
-./data/sounds/Makefile
-./po/Makefile.in
+Makefile
+RtmNet/Makefile
+src/Makefile
+src/libtasque/Makefile
+src/tasque/Makefile
+src/tasque/tasque.pc
+src/Addins/Backends/Makefile
+src/Addins/Backends/Dummy/Makefile
+src/Addins/Backends/Eds/Makefile
+src/Addins/Backends/Hiveminder/Makefile
+src/Addins/Backends/IceCore/Makefile
+src/Addins/Backends/Rtm/Makefile
+src/Addins/Backends/Sqlite/Makefile
+data/Makefile
+data/images/Makefile
+data/sounds/Makefile
+po/Makefile.in
 ])
 
 #./src/Backends/Dummy/Makefile
diff --git a/src/Addins/Backends/Dummy/Makefile.am b/src/Addins/Backends/Dummy/Makefile.am
index 7f7ff1b..b813ec7 100644
--- a/src/Addins/Backends/Dummy/Makefile.am
+++ b/src/Addins/Backends/Dummy/Makefile.am
@@ -3,7 +3,8 @@ CSC = $(DMCS)
 CSFILES = *.cs
 
 ASSEMBLIES = \
-	-r:../../../Tasque.exe \
+	-r:../../../libtasque/libtasque.dll \
+	-r:../../../tasque/Tasque.exe \
 	-r:System \
 	-r:Mono.Posix \
 	$(GTK_DOTNET_20_LIBS)
diff --git a/src/Addins/Backends/Rtm/Makefile.am b/src/Addins/Backends/Rtm/Makefile.am
index 809df37..030047f 100644
--- a/src/Addins/Backends/Rtm/Makefile.am
+++ b/src/Addins/Backends/Rtm/Makefile.am
@@ -3,7 +3,8 @@ CSC = $(DMCS)
 CSFILES = *.cs
 
 ASSEMBLIES = \
-	-r:../../../Tasque.exe \
+	-r:../../../libtasque/libtasque.dll \
+	-r:../../../tasque/Tasque.exe \
 	-r:../../../../RtmNet/RtmNet.dll \
 	-r:System \
 	-r:Mono.Posix \
diff --git a/src/Addins/Backends/Sqlite/Makefile.am b/src/Addins/Backends/Sqlite/Makefile.am
index bf1c4d1..e7952da 100644
--- a/src/Addins/Backends/Sqlite/Makefile.am
+++ b/src/Addins/Backends/Sqlite/Makefile.am
@@ -3,7 +3,8 @@ CSC = $(DMCS)
 CSFILES = *.cs
 
 ASSEMBLIES = \
-	-r:../../../Tasque.exe \
+	-r:../../../libtasque/libtasque.dll \
+	-r:../../../tasque/Tasque.exe \
 	-r:System \
 	-r:System.Data \
 	-r:Mono.Data.Sqlite \
diff --git a/src/Makefile.am b/src/Makefile.am
index 7c15a11..3064b5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,180 +1 @@
-SUBDIRS = . Addins/Backends
-
-CSC = $(DMCS)
-
-TARGET = Tasque.exe
-WRAPPER = tasque
-
-if GTK_2_12
-GTK_2_12_CSFLAGS = -define:GTK_2_12
-endif
-
-if ENABLE_DEBUG
-CSFLAGS = -debug -d:DEBUG
-MDBFILES = $(TARGET).mdb
-endif
-
-if ENABLE_NOTIFY_SHARP
-NOTIFY_SHARP_CSFLAGS = -define:ENABLE_NOTIFY_SHARP
-endif
-
-if ENABLE_APPINDICATOR
-APPINDICATOR_CSFILES = $(srcdir)/AppIndicatorTray.cs
-APPINDICATOR_CSFLAGS = -define:APPINDICATOR
-else
-APPINDICATOR_CSFILES =
-endif
-
-CSFILES = \
-	$(srcdir)/AbstractTask.cs \
-	$(srcdir)/AllCategory.cs \
-	$(srcdir)/Application.cs \
-	$(srcdir)/CellRendererDate.cs \
-	$(srcdir)/CompletedTaskGroup.cs \
-	$(srcdir)/DateButton.cs \
-	$(srcdir)/GtkApplication.cs \
-	$(srcdir)/GtkTray.cs \
-	$(srcdir)/GnomeApplication.cs \
-	$(srcdir)/Logger.cs \
-	$(srcdir)/NoteDialog.cs \
-	$(srcdir)/NoteWidget.cs \
-	$(srcdir)/Preferences.cs \
-	$(srcdir)/PreferencesDialog.cs \
-	$(srcdir)/RemoteControl.cs \
-	$(srcdir)/RemoteControlProxy.cs \
-	$(srcdir)/StatusIconTray.cs \
-	$(srcdir)/TaskCalendar.cs \
-	$(srcdir)/TaskGroupModel.cs \
-	$(srcdir)/CompletedTaskGroupModel.cs \
-	$(srcdir)/TaskGroupModelFactory.cs \
-	$(srcdir)/TaskGroup.cs \
-	$(srcdir)/TaskWindow.cs \
-	$(srcdir)/TaskTreeView.cs \
-	$(srcdir)/Utilities.cs \
-	$(TASQUEDLL_CSFILES) \
-	$(APPINDICATOR_CSFILES)
-
-TASQUEDLL_CSFILES = \
-	$(srcdir)/libtasque/DateFormatterFactory.cs \
-	$(srcdir)/libtasque/Extensions.cs \
-	$(srcdir)/libtasque/IBackend.cs \
-	$(srcdir)/libtasque/ICategory.cs \
-	$(srcdir)/libtasque/INativeApplication.cs \
-	$(srcdir)/libtasque/INote.cs \
-	$(srcdir)/libtasque/ITask.cs \
-	$(srcdir)/libtasque/RegularExpressionFormatter.cs \
-	$(srcdir)/libtasque/TaskParser.cs \
-	$(srcdir)/libtasque/TaskPriority.cs \
-	$(srcdir)/libtasque/TaskState.cs \
-	$(srcdir)/libtasque/TranslatableToken.cs \
-	$(foreach file,$(TASQUEDLL_FORMATTERS_CSFILES), $(addprefix $(srcdir)/libtasque/DateFormatters/, $(file)))
-
-TASQUEDLL_FORMATTERS_CSFILES = \
-	DateSeparatedFormatter.cs \
-	DayFormatter.cs \
-	DateFormatter.cs \
-	IDateFormatter.cs \
-	MonthFormatter.cs \
-	OrdinalFormatter.cs \
-	QuantityFormatter.cs \
-	StringInsensitiveComparer.cs \
-	TodayTomorrowFormatter.cs \
-	WeekdayFormatter.cs \
-	WeekFormatter.cs \
-	YearFormatter.cs
-
-RESOURCES = \
-	-resource:$(top_srcdir)/data/images/tasque-16.png \
-	-resource:$(top_srcdir)/data/images/tasque-22.png \
-	-resource:$(top_srcdir)/data/images/tasque-24.png \
-	-resource:$(top_srcdir)/data/images/tasque-32.png \
-	-resource:$(top_srcdir)/data/images/tasque-48.png \
-	-resource:$(top_srcdir)/data/images/note-16.png,note.png \
-	-resource:$(top_srcdir)/data/images/rtmLogo.png \
-	-resource:$(top_srcdir)/data/images/clock-16-0.png \
-	-resource:$(top_srcdir)/data/images/clock-16-1.png \
-	-resource:$(top_srcdir)/data/images/clock-16-2.png \
-	-resource:$(top_srcdir)/data/images/clock-16-3.png \
-	-resource:$(top_srcdir)/data/images/clock-16-4.png \
-	-resource:$(top_srcdir)/data/images/clock-16-5.png \
-	-resource:$(top_srcdir)/data/images/clock-16-6.png \
-	-resource:$(top_srcdir)/data/images/clock-16-7.png \
-	-resource:$(top_srcdir)/data/images/clock-16-8.png \
-	-resource:$(top_srcdir)/data/images/clock-16-9.png \
-	-resource:$(top_srcdir)/data/images/clock-16-10.png \
-	-resource:$(top_srcdir)/data/images/clock-16-11.png
-
-ASSEMBLIES =  \
-	-r:System \
-	-r:System.Core \
-	-r:Mono.Posix \
-	-r:System.Xml \
-	-r:$(top_builddir)/RtmNet/RtmNet \
-	$(GLIB_SHARP_20_LIBS) \
-	$(GNOME_SHARP_20_LIBS) \
-	$(GTK_DOTNET_20_LIBS) \
-	$(NOTIFY_SHARP_LIBS) \
-	$(NDESK_DBUS_10_LIBS) \
-	$(NDESK_DBUS_GLIB_10_LIBS) \
-	$(APPINDICATOR_SHARP_LIBS)
-
-$(TARGET): $(CSFILES) Defines.cs
-	$(CSC) -unsafe -out:$@ -noconfig -codepage:utf8 -warn:4 $(CSFLAGS) $(GTK_2_12_CSFLAGS) \
-	$(NOTIFY_SHARP_CSFLAGS) $(APPINDICATOR_CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
-
-tasquelibdir = $(libdir)/tasque
-tasquelib_DATA = $(TARGET) $(TARGET).config $(MDBFILES)
-
-bin_SCRIPTS = $(WRAPPER)
-
-$(WRAPPER): $(srcdir)/$(WRAPPER).in Makefile
-	sed -e "s|\ prefix\@|$(prefix)|g"               \
-		-e "s|\ exec_prefix\@|$(bindir)|g"			\
-		-e "s|\ libdir\@|$(libdir)|g"				\
-		-e "s|\ pkglibdir\@|$(pkglibdir)|g"         \
-		-e "s|\ bindir\@|$(bindir)|g"               \
-		-e "s|\ target\@|$(TARGET)|g"               \
-		-e "s|\ wrapper\@|$(WRAPPER)|g"             \
-		-e "s|\ srcdir\@|$(PWD)|g"  \
-		< $< > $@
-	chmod +x $(WRAPPER)
-
-$(TARGET).mdb: $(TARGET)
-
-$(TARGET).config: $(srcdir)/$(TARGET).config.in Makefile
-	sed -e "s|\ pkglibdir\@|$(pkglibdir)|" \
-	    < $< > $@
-
-Defines.cs: $(srcdir)/Defines.cs.in Makefile
-	sed -e "s|\ version\@|$(VERSION)|"     \
-		-e "s|\ datadir\@|$(datadir)|"     \
-		-e "s|\ pkglibdir\@|$(pkglibdir)|" \
-		< $< > $@
-
-EXTRA_DIST = \
-	$(CSFILES)					\
-	$(WRAPPER).in				\
-	$(TARGET).config.in		\
-	$(srcdir)/Defines.cs.in		\
-	$(srcdir)/tasque.pc.in		\
-	$(srcdir)/OSXApplication.cs	\
-	$(srcdir)/libtasque/*.cs \
-	$(srcdir)/libtasque/DateFormatters/* \
-	$(srcdir)/libtasque/libtasque.csproj
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = tasque.pc
-
-CLEANFILES = \
-	$(TARGET)					\
-	$(TARGET).config	\
-	$(TARGET).mdb				\
-	$(WRAPPER)					\
-	Defines.cs
-
-DISTCLEANFILES =                        \
-        $(WRAPPER)			\
-	$(TARGET)			\
-	$(TARGET).config	\
-	$(TARGET).mdb		\
-	Defines.cs
+SUBDIRS = libtasque tasque Addins/Backends
diff --git a/src/libtasque/Makefile.am b/src/libtasque/Makefile.am
new file mode 100644
index 0000000..21d5110
--- /dev/null
+++ b/src/libtasque/Makefile.am
@@ -0,0 +1,60 @@
+CSC = $(DMCS)
+
+TARGET = libtasque.dll
+
+if ENABLE_DEBUG
+CSFLAGS = -debug -d:DEBUG
+MDBFILES = $(TARGET).mdb
+endif
+
+CSFILES = \
+	DateFormatterFactory.cs \
+	Extensions.cs \
+	IBackend.cs \
+	ICategory.cs \
+	INativeApplication.cs \
+	INote.cs \
+	ITask.cs \
+	RegularExpressionFormatter.cs \
+	TaskParser.cs \
+	TaskPriority.cs \
+	TaskState.cs \
+	TranslatableToken.cs \
+	DateFormatters/DateSeparatedFormatter.cs \
+	DateFormatters/DayFormatter.cs \
+	DateFormatters/DateFormatter.cs \
+	DateFormatters/IDateFormatter.cs \
+	DateFormatters/MonthFormatter.cs \
+	DateFormatters/OrdinalFormatter.cs \
+	DateFormatters/QuantityFormatter.cs \
+	DateFormatters/StringInsensitiveComparer.cs \
+	DateFormatters/TodayTomorrowFormatter.cs \
+	DateFormatters/WeekdayFormatter.cs \
+	DateFormatters/WeekFormatter.cs \
+	DateFormatters/YearFormatter.cs
+
+ASSEMBLIES = \
+	-r:System \
+	-r:System.Core \
+	-r:Mono.Posix \
+	$(GTK_DOTNET_20_LIBS)
+
+$(TARGET): $(CSFILES)
+	$(CSC) -out:$@ -t:library -noconfig -codepage:utf8 -warn:4 $(CSFLAGS) $^ $(ASSEMBLIES)
+
+tasquelibdir = $(libdir)/tasque
+tasquelib_DATA = $(TARGET) $(MDBFILES)
+
+$(TARGET).mdb: $(TARGET)
+
+EXTRA_DIST = \
+	$(CSFILES) \
+	libtasque.csproj
+
+CLEANFILES = \
+	$(TARGET) \
+	$(TARGET).mdb
+
+DISTCLEANFILES = \
+	$(TARGET) \
+	$(TARGET).mdb
diff --git a/src/AbstractTask.cs b/src/tasque/AbstractTask.cs
similarity index 100%
rename from src/AbstractTask.cs
rename to src/tasque/AbstractTask.cs
diff --git a/src/AllCategory.cs b/src/tasque/AllCategory.cs
similarity index 100%
rename from src/AllCategory.cs
rename to src/tasque/AllCategory.cs
diff --git a/src/AppIndicatorTray.cs b/src/tasque/AppIndicatorTray.cs
similarity index 100%
rename from src/AppIndicatorTray.cs
rename to src/tasque/AppIndicatorTray.cs
diff --git a/src/Application.cs b/src/tasque/Application.cs
similarity index 100%
rename from src/Application.cs
rename to src/tasque/Application.cs
diff --git a/src/CellRendererDate.cs b/src/tasque/CellRendererDate.cs
similarity index 100%
rename from src/CellRendererDate.cs
rename to src/tasque/CellRendererDate.cs
diff --git a/src/CompletedTaskGroup.cs b/src/tasque/CompletedTaskGroup.cs
similarity index 100%
rename from src/CompletedTaskGroup.cs
rename to src/tasque/CompletedTaskGroup.cs
diff --git a/src/CompletedTaskGroupModel.cs b/src/tasque/CompletedTaskGroupModel.cs
similarity index 100%
rename from src/CompletedTaskGroupModel.cs
rename to src/tasque/CompletedTaskGroupModel.cs
diff --git a/src/DateButton.cs b/src/tasque/DateButton.cs
similarity index 100%
rename from src/DateButton.cs
rename to src/tasque/DateButton.cs
diff --git a/src/Defines.WIN32.cs b/src/tasque/Defines.WIN32.cs
similarity index 100%
rename from src/Defines.WIN32.cs
rename to src/tasque/Defines.WIN32.cs
diff --git a/src/Defines.cs.in b/src/tasque/Defines.cs.in
similarity index 100%
rename from src/Defines.cs.in
rename to src/tasque/Defines.cs.in
diff --git a/src/GnomeApplication.cs b/src/tasque/GnomeApplication.cs
similarity index 100%
rename from src/GnomeApplication.cs
rename to src/tasque/GnomeApplication.cs
diff --git a/src/GtkApplication.cs b/src/tasque/GtkApplication.cs
similarity index 100%
rename from src/GtkApplication.cs
rename to src/tasque/GtkApplication.cs
diff --git a/src/GtkTray.cs b/src/tasque/GtkTray.cs
similarity index 100%
rename from src/GtkTray.cs
rename to src/tasque/GtkTray.cs
diff --git a/src/Logger.cs b/src/tasque/Logger.cs
similarity index 100%
rename from src/Logger.cs
rename to src/tasque/Logger.cs
diff --git a/src/tasque/Makefile.am b/src/tasque/Makefile.am
new file mode 100644
index 0000000..6f38d49
--- /dev/null
+++ b/src/tasque/Makefile.am
@@ -0,0 +1,144 @@
+CSC = $(DMCS)
+
+TARGET = Tasque.exe
+WRAPPER = tasque
+
+if GTK_2_12
+GTK_2_12_CSFLAGS = -define:GTK_2_12
+endif
+
+if ENABLE_DEBUG
+CSFLAGS = -debug -d:DEBUG
+MDBFILES = $(TARGET).mdb
+endif
+
+if ENABLE_NOTIFY_SHARP
+NOTIFY_SHARP_CSFLAGS = -define:ENABLE_NOTIFY_SHARP
+endif
+
+if ENABLE_APPINDICATOR
+APPINDICATOR_CSFILES = AppIndicatorTray.cs
+APPINDICATOR_CSFLAGS = -define:APPINDICATOR
+endif
+
+CSFILES = \
+	AbstractTask.cs \
+	AllCategory.cs \
+	Application.cs \
+	CellRendererDate.cs \
+	CompletedTaskGroup.cs \
+	DateButton.cs \
+	GtkApplication.cs \
+	GtkTray.cs \
+	GnomeApplication.cs \
+	Logger.cs \
+	NoteDialog.cs \
+	NoteWidget.cs \
+	Preferences.cs \
+	PreferencesDialog.cs \
+	RemoteControl.cs \
+	RemoteControlProxy.cs \
+	StatusIconTray.cs \
+	TaskCalendar.cs \
+	TaskGroupModel.cs \
+	CompletedTaskGroupModel.cs \
+	TaskGroupModelFactory.cs \
+	TaskGroup.cs \
+	TaskWindow.cs \
+	TaskTreeView.cs \
+	Utilities.cs \
+	$(APPINDICATOR_CSFILES)
+
+RESOURCES = \
+	-resource:$(top_srcdir)/data/images/tasque-16.png \
+	-resource:$(top_srcdir)/data/images/tasque-22.png \
+	-resource:$(top_srcdir)/data/images/tasque-24.png \
+	-resource:$(top_srcdir)/data/images/tasque-32.png \
+	-resource:$(top_srcdir)/data/images/tasque-48.png \
+	-resource:$(top_srcdir)/data/images/note-16.png,note.png \
+	-resource:$(top_srcdir)/data/images/rtmLogo.png \
+	-resource:$(top_srcdir)/data/images/clock-16-0.png \
+	-resource:$(top_srcdir)/data/images/clock-16-1.png \
+	-resource:$(top_srcdir)/data/images/clock-16-2.png \
+	-resource:$(top_srcdir)/data/images/clock-16-3.png \
+	-resource:$(top_srcdir)/data/images/clock-16-4.png \
+	-resource:$(top_srcdir)/data/images/clock-16-5.png \
+	-resource:$(top_srcdir)/data/images/clock-16-6.png \
+	-resource:$(top_srcdir)/data/images/clock-16-7.png \
+	-resource:$(top_srcdir)/data/images/clock-16-8.png \
+	-resource:$(top_srcdir)/data/images/clock-16-9.png \
+	-resource:$(top_srcdir)/data/images/clock-16-10.png \
+	-resource:$(top_srcdir)/data/images/clock-16-11.png
+
+ASSEMBLIES =  \
+	-r:System \
+	-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) \
+	$(GTK_DOTNET_20_LIBS) \
+	$(NOTIFY_SHARP_LIBS) \
+	$(NDESK_DBUS_10_LIBS) \
+	$(NDESK_DBUS_GLIB_10_LIBS) \
+	$(APPINDICATOR_SHARP_LIBS)
+
+$(TARGET): $(CSFILES) Defines.cs
+	$(CSC) -unsafe -out:$@ -noconfig -codepage:utf8 -warn:4 $(CSFLAGS) $(GTK_2_12_CSFLAGS) \
+	$(NOTIFY_SHARP_CSFLAGS) $(APPINDICATOR_CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
+
+tasquelibdir = $(libdir)/tasque
+tasquelib_DATA = $(TARGET) $(TARGET).config $(MDBFILES)
+
+bin_SCRIPTS = $(WRAPPER)
+
+$(WRAPPER): $(WRAPPER).in Makefile
+	sed -e "s|\ prefix\@|$(prefix)|g"               \
+		-e "s|\ exec_prefix\@|$(bindir)|g"			\
+		-e "s|\ libdir\@|$(libdir)|g"				\
+		-e "s|\ pkglibdir\@|$(pkglibdir)|g"         \
+		-e "s|\ bindir\@|$(bindir)|g"               \
+		-e "s|\ target\@|$(TARGET)|g"               \
+		-e "s|\ wrapper\@|$(WRAPPER)|g"             \
+		-e "s|\ srcdir\@|$(PWD)|g"  \
+		< $< > $@
+	chmod +x $(WRAPPER)
+
+$(TARGET).mdb: $(TARGET)
+
+$(TARGET).config: $(TARGET).config.in Makefile
+	sed -e "s|\ pkglibdir\@|$(pkglibdir)|" \
+	    < $< > $@
+
+Defines.cs: Defines.cs.in Makefile
+	sed -e "s|\ version\@|$(VERSION)|"     \
+		-e "s|\ datadir\@|$(datadir)|"     \
+		-e "s|\ pkglibdir\@|$(pkglibdir)|" \
+		< $< > $@
+
+EXTRA_DIST = \
+	$(CSFILES)					\
+	$(WRAPPER).in				\
+	$(TARGET).config.in		\
+	Defines.cs.in		\
+	tasque.pc.in		\
+	OSXApplication.cs
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = tasque.pc
+
+CLEANFILES = \
+	$(TARGET)					\
+	$(TARGET).config	\
+	$(TARGET).mdb				\
+	$(WRAPPER)					\
+	Defines.cs
+
+DISTCLEANFILES =                        \
+        $(WRAPPER)			\
+	$(TARGET)			\
+	$(TARGET).config	\
+	$(TARGET).mdb		\
+	Defines.cs
diff --git a/src/NoteDialog.cs b/src/tasque/NoteDialog.cs
similarity index 100%
rename from src/NoteDialog.cs
rename to src/tasque/NoteDialog.cs
diff --git a/src/NoteWidget.cs b/src/tasque/NoteWidget.cs
similarity index 100%
rename from src/NoteWidget.cs
rename to src/tasque/NoteWidget.cs
diff --git a/src/OSXApplication.cs b/src/tasque/OSXApplication.cs
similarity index 100%
rename from src/OSXApplication.cs
rename to src/tasque/OSXApplication.cs
diff --git a/src/Preferences.cs b/src/tasque/Preferences.cs
similarity index 100%
rename from src/Preferences.cs
rename to src/tasque/Preferences.cs
diff --git a/src/PreferencesDialog.cs b/src/tasque/PreferencesDialog.cs
similarity index 100%
rename from src/PreferencesDialog.cs
rename to src/tasque/PreferencesDialog.cs
diff --git a/src/RemoteControl.cs b/src/tasque/RemoteControl.cs
similarity index 100%
rename from src/RemoteControl.cs
rename to src/tasque/RemoteControl.cs
diff --git a/src/RemoteControlProxy.cs b/src/tasque/RemoteControlProxy.cs
similarity index 100%
rename from src/RemoteControlProxy.cs
rename to src/tasque/RemoteControlProxy.cs
diff --git a/src/RtmDeveloperKey.txt b/src/tasque/RtmDeveloperKey.txt
similarity index 100%
rename from src/RtmDeveloperKey.txt
rename to src/tasque/RtmDeveloperKey.txt
diff --git a/src/StatusIconTray.cs b/src/tasque/StatusIconTray.cs
similarity index 100%
rename from src/StatusIconTray.cs
rename to src/tasque/StatusIconTray.cs
diff --git a/src/TaskCalendar.cs b/src/tasque/TaskCalendar.cs
similarity index 100%
rename from src/TaskCalendar.cs
rename to src/tasque/TaskCalendar.cs
diff --git a/src/TaskGroup.cs b/src/tasque/TaskGroup.cs
similarity index 100%
rename from src/TaskGroup.cs
rename to src/tasque/TaskGroup.cs
diff --git a/src/TaskGroupModel.cs b/src/tasque/TaskGroupModel.cs
similarity index 100%
rename from src/TaskGroupModel.cs
rename to src/tasque/TaskGroupModel.cs
diff --git a/src/TaskGroupModelFactory.cs b/src/tasque/TaskGroupModelFactory.cs
similarity index 100%
rename from src/TaskGroupModelFactory.cs
rename to src/tasque/TaskGroupModelFactory.cs
diff --git a/src/TaskTreeView.cs b/src/tasque/TaskTreeView.cs
similarity index 100%
rename from src/TaskTreeView.cs
rename to src/tasque/TaskTreeView.cs
diff --git a/src/TaskWindow.cs b/src/tasque/TaskWindow.cs
similarity index 100%
rename from src/TaskWindow.cs
rename to src/tasque/TaskWindow.cs
diff --git a/src/Tasque.exe.config.in b/src/tasque/Tasque.exe.config.in
similarity index 100%
rename from src/Tasque.exe.config.in
rename to src/tasque/Tasque.exe.config.in
diff --git a/src/Utilities.cs b/src/tasque/Utilities.cs
similarity index 100%
rename from src/Utilities.cs
rename to src/tasque/Utilities.cs
diff --git a/tasque.csproj b/src/tasque/tasque.csproj
similarity index 50%
rename from tasque.csproj
rename to src/tasque/tasque.csproj
index 9fa2966..b19810a 100644
--- a/tasque.csproj
+++ b/src/tasque/tasque.csproj
@@ -73,64 +73,50 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="data\images\clock-16-0.svg" />
-    <None Include="data\images\note-22.svg" />
-    <None Include="data\images\tasque-icons-source.svg" />
-    <None Include="data\images\tasque.svg" />
-    <None Include="src\Tasque.exe.config.in" />
-    <Compile Include="src\Defines.cs" />
-    <Compile Include="src\GtkTray.cs" />
-    <Compile Include="src\StatusIconTray.cs" />
-    <Compile Include="src\AppIndicatorTray.cs" />
+    <None Include="Tasque.exe.config.in" />
+    <None Include="..\..\data\images\clock-16-0.svg">
+      <Link>data\images\clock-16-0.svg</Link>
+    </None>
+    <None Include="..\..\data\images\note-22.svg">
+      <Link>data\images\note-22.svg</Link>
+    </None>
+    <None Include="..\..\data\images\tasque-icons-source.svg">
+      <Link>data\images\tasque-icons-source.svg</Link>
+    </None>
+    <None Include="..\..\data\images\tasque.svg">
+      <Link>data\images\tasque.svg</Link>
+    </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="data\images\clock-16-0.png" />
-    <Content Include="data\images\clock-16-1.png" />
-    <Content Include="data\images\clock-16-10.png" />
-    <Content Include="data\images\clock-16-11.png" />
-    <Content Include="data\images\clock-16-2.png" />
-    <Content Include="data\images\clock-16-3.png" />
-    <Content Include="data\images\clock-16-4.png" />
-    <Content Include="data\images\clock-16-5.png" />
-    <Content Include="data\images\clock-16-6.png" />
-    <Content Include="data\images\clock-16-7.png" />
-    <Content Include="data\images\clock-16-8.png" />
-    <Content Include="data\images\clock-16-9.png" />
-    <Content Include="data\images\note-16.png" />
-    <Content Include="data\images\rtmLogo.png" />
-    <Content Include="data\images\tasque-16.png" />
-    <Content Include="data\images\tasque-22.png" />
-    <Content Include="data\images\tasque-24.png" />
-    <Content Include="data\images\tasque-32.png" />
-    <Content Include="data\images\tasque-48.png" />
-    <Content Include="data\sounds\notify.wav" />
+    <Compile Include="Defines.cs" />
+    <Compile Include="GtkTray.cs" />
+    <Compile Include="StatusIconTray.cs" />
+    <Compile Include="AppIndicatorTray.cs" />
+    <Compile Include="AbstractTask.cs" />
+    <Compile Include="AllCategory.cs" />
+    <Compile Include="Application.cs" />
+    <Compile Include="CellRendererDate.cs" />
+    <Compile Include="CompletedTaskGroup.cs" />
+    <Compile Include="CompletedTaskGroupModel.cs" />
+    <Compile Include="DateButton.cs" />
+    <None Include="GnomeApplication.cs" />
+    <Compile Include="GtkApplication.cs" />
+    <Compile Include="Logger.cs" />
+    <Compile Include="NoteDialog.cs" />
+    <Compile Include="NoteWidget.cs" />
+    <None Include="OSXApplication.cs" />
+    <Compile Include="Preferences.cs" />
+    <Compile Include="PreferencesDialog.cs" />
+    <Compile Include="TaskCalendar.cs" />
+    <Compile Include="TaskGroup.cs" />
+    <Compile Include="TaskGroupModel.cs" />
+    <Compile Include="TaskGroupModelFactory.cs" />
+    <Compile Include="TaskTreeView.cs" />
+    <Compile Include="TaskWindow.cs" />
+    <Compile Include="Utilities.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="src\AbstractTask.cs" />
-    <Compile Include="src\AllCategory.cs" />
-    <Compile Include="src\Application.cs" />
-    <Compile Include="src\CellRendererDate.cs" />
-    <Compile Include="src\CompletedTaskGroup.cs" />
-    <Compile Include="src\CompletedTaskGroupModel.cs" />
-    <Compile Include="src\DateButton.cs" />
-    <None Include="src\GnomeApplication.cs" />
-    <Compile Include="src\GtkApplication.cs" />
-    <Compile Include="src\Logger.cs" />
-    <Compile Include="src\NoteDialog.cs" />
-    <Compile Include="src\NoteWidget.cs" />
-    <None Include="src\OSXApplication.cs" />
-    <Compile Include="src\Preferences.cs" />
-    <Compile Include="src\PreferencesDialog.cs" />
-    <Compile Include="src\TaskCalendar.cs" />
-    <Compile Include="src\TaskGroup.cs" />
-    <Compile Include="src\TaskGroupModel.cs" />
-    <Compile Include="src\TaskGroupModelFactory.cs" />
-    <Compile Include="src\TaskTreeView.cs" />
-    <Compile Include="src\TaskWindow.cs" />
-    <Compile Include="src\Utilities.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="src\libtasque\libtasque.csproj">
+    <ProjectReference Include="..\libtasque\libtasque.csproj">
       <Project>{784C9AA8-2B28-400B-8CC4-DCDC48CA37F0}</Project>
       <Name>libtasque</Name>
     </ProjectReference>
@@ -143,4 +129,69 @@
     <PostBuildEvent>copy "$(SolutionDir)\winbin" "$(TargetDir)"</PostBuildEvent>
     <PreBuildEvent>copy "$(SolutionDir)\data\images\*.png" "$(ProjectDir)"</PreBuildEvent>
   </PropertyGroup>
+  <ItemGroup>
+    <Folder Include="data\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\data\images\clock-16-0.png">
+      <Link>data\images\clock-16-0.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\clock-16-1.png">
+      <Link>data\images\clock-16-1.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\clock-16-10.png">
+      <Link>data\images\clock-16-10.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\clock-16-11.png">
+      <Link>data\images\clock-16-11.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\clock-16-2.png">
+      <Link>data\images\clock-16-2.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\clock-16-3.png">
+      <Link>data\images\clock-16-3.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\clock-16-4.png">
+      <Link>data\images\clock-16-4.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\clock-16-5.png">
+      <Link>data\images\clock-16-5.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\clock-16-6.png">
+      <Link>data\images\clock-16-6.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\clock-16-7.png">
+      <Link>data\images\clock-16-7.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\clock-16-8.png">
+      <Link>data\images\clock-16-8.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\clock-16-9.png">
+      <Link>data\images\clock-16-9.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\note-16.png">
+      <Link>data\images\note-16.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\rtmLogo.png">
+      <Link>data\images\rtmLogo.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\tasque-16.png">
+      <Link>data\images\tasque-16.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\tasque-22.png">
+      <Link>data\images\tasque-22.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\tasque-24.png">
+      <Link>data\images\tasque-24.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\tasque-32.png">
+      <Link>data\images\tasque-32.png</Link>
+    </Content>
+    <Content Include="..\..\data\images\tasque-48.png">
+      <Link>data\images\tasque-48.png</Link>
+    </Content>
+    <Content Include="..\..\data\sounds\notify.wav">
+      <Link>data\sounds\notify.wav</Link>
+    </Content>
+  </ItemGroup>
 </Project>
diff --git a/src/tasque.in b/src/tasque/tasque.in
similarity index 100%
rename from src/tasque.in
rename to src/tasque/tasque.in
diff --git a/src/tasque.pc.in b/src/tasque/tasque.pc.in
similarity index 100%
rename from src/tasque.pc.in
rename to src/tasque/tasque.pc.in
diff --git a/tasque.sln b/tasque.sln
index 32dfc06..101601a 100644
--- a/tasque.sln
+++ b/tasque.sln
@@ -1,7 +1,7 @@
 ï
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tasque", "tasque.csproj", "{B19B9840-669D-4984-9772-E1F55193A67F}"
+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}"
 EndProject
@@ -61,7 +61,7 @@ Global
 		{CCCC10A5-662D-4788-82D3-25689F3D4D4F} = {E2E6EE06-C957-4D1E-85CA-90F3773597DE}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = tasque.csproj
+		StartupItem = src\tasque\tasque.csproj
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]