banshee r3054 - in trunk/banshee: . build docs src/Core/Banshee.Widgets src/Core/Banshee.Widgets/Banshee.Widgets

[abock svn gnome org]

Author: abock
Date: Sun Jan 27 06:23:50 2008
New Revision: 3054
URL: http://svn.gnome.org/viewvc/banshee?rev=3054&view=rev

Log:
Major build changes

Added:
   trunk/banshee/docs/Makefile.am
   trunk/banshee/docs/monodoc.mk
Removed:
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/ActiveUserEvent.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/ActiveUserEventsManager.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/AltProgressBar.cs
Modified:
   trunk/banshee/   (props changed)
   trunk/banshee/build/build.environment.mk
   trunk/banshee/build/build.rules.mk
   trunk/banshee/src/Core/Banshee.Widgets/Makefile.am

Modified: trunk/banshee/build/build.environment.mk
==============================================================================
--- trunk/banshee/build/build.environment.mk	(original)
+++ trunk/banshee/build/build.environment.mk	Sun Jan 27 06:23:50 2008
@@ -23,112 +23,83 @@
 
 # Internal directories/libraries
 
-# Ext
-DIR_EXT = $(top_srcdir)/ext
-
 # Extras
-DIR_EXTRAS = $(top_srcdir)/src/Extras
-
-DIR_BOO = $(DIR_EXTRAS)/Boo
-if EXTERNAL_BOO
-LINK_BOO = $(BOO_LIBS)
-else
-LINK_BOO = \
-	-r:$(DIR_BOO)/Boo.Lang.dll \
-	-r:$(DIR_BOO)/Boo.Lang.Compiler.dll \
-	-r:$(DIR_BOO)/Boo.Lang.Interpreter.dll
-endif
-
-DIR_BOOBUDDY = $(DIR_EXTRAS)/BooBuddy
-MONO_BASE_PATH += $(DIR_BOOBUDDY)
-REF_BOOBUDDY = $(LINK_GTK) $(LINK_BOO)
-LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
-LINK_BOOBUDDY_DEPS = $(REF_BOOBUDDY) $(LINK_BOOBUDDY)
-
-DIR_GNOME_KEYRING = $(DIR_EXTRAS)/Gnome.Keyring
-MONO_BASE_PATH += $(DIR_GNOME_KEYRING)
-REF_GNOME_KEYRING = $(LINK_DBUS) $(LINK_MONO_POSIX)
-LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-LINK_GNOME_KEYRING_DEPS = $(REF_GNOME_KEYRING) $(LINK_GNOME_KEYRING)
-
-DIR_LAST_FM = $(DIR_EXTRAS)/Last.FM
-MONO_BASE_PATH += $(DIR_LAST_FM)
-REF_LAST_FM = $(LINK_GTK) $(LINK_GNOME_KEYRING_DEPS)
-LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
-LINK_LAST_FM_DEPS = $(REF_LAST_FM) $(LINK_LAST_FM)
-
-DIR_MUSICBRAINZ = $(DIR_EXTRAS)/MusicBrainz
-MONO_BASE_PATH += $(DIR_MUSICBRAINZ)
-REF_MUSICBRAINZ = $(LINK_SYSTEM)
-LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
-LINK_MUSICBRAINZ_DEPS = $(REF_MUSICBRAINZ) $(LINK_MUSICBRAINZ)
+#DIR_EXTRAS = $(top_srcdir)/src/Extras
+#
+#DIR_BOO = $(DIR_EXTRAS)/Boo
+#if EXTERNAL_BOO
+#LINK_BOO = $(BOO_LIBS)
+#else
+#LINK_BOO = \
+#	-r:$(DIR_BOO)/Boo.Lang.dll \
+#	-r:$(DIR_BOO)/Boo.Lang.Compiler.dll \
+#	-r:$(DIR_BOO)/Boo.Lang.Interpreter.dll
+#endif
+#
+#DIR_BOOBUDDY = $(DIR_EXTRAS)/BooBuddy
+#MONO_BASE_PATH += $(DIR_BOOBUDDY)
+#REF_BOOBUDDY = $(LINK_GTK) $(LINK_BOO)
+#LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
+#LINK_BOOBUDDY_DEPS = $(REF_BOOBUDDY) $(LINK_BOOBUDDY)
+#
+#DIR_GNOME_KEYRING = $(DIR_EXTRAS)/Gnome.Keyring
+#MONO_BASE_PATH += $(DIR_GNOME_KEYRING)
+#REF_GNOME_KEYRING = $(LINK_DBUS) $(LINK_MONO_POSIX)
+#LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
+#LINK_GNOME_KEYRING_DEPS = $(REF_GNOME_KEYRING) $(LINK_GNOME_KEYRING)
+#
+#DIR_LAST_FM = $(DIR_EXTRAS)/Last.FM
+#MONO_BASE_PATH += $(DIR_LAST_FM)
+#REF_LAST_FM = $(LINK_GTK) $(LINK_GNOME_KEYRING_DEPS)
+#LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+#LINK_LAST_FM_DEPS = $(REF_LAST_FM) $(LINK_LAST_FM)
+#
+#DIR_MUSICBRAINZ = $(DIR_EXTRAS)/MusicBrainz
+#MONO_BASE_PATH += $(DIR_MUSICBRAINZ)
+#REF_MUSICBRAINZ = $(LINK_SYSTEM)
+#LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+#LINK_MUSICBRAINZ_DEPS = $(REF_MUSICBRAINZ) $(LINK_MUSICBRAINZ)
 
+DIR_BIN = $(top_builddir)/bin
 
 # Core
-DIR_CORE = $(top_srcdir)/src/Core
-
-DIR_HYENA = $(DIR_CORE)/Hyena
-MONO_BASE_PATH += $(DIR_HYENA)
 REF_HYENA = $(LINK_SYSTEM) $(LINK_SQLITE)
-LINK_HYENA = -r:$(DIR_HYENA)/Hyena.dll
+LINK_HYENA = -r:$(DIR_BIN)/Hyena.dll
 LINK_HYENA_DEPS = $(REF_HYENA) $(LINK_HYENA)
 
-DIR_HYENA_GUI = $(DIR_CORE)/Hyena.Gui
-MONO_BASE_PATH += $(DIR_HYENA_GUI)
 REF_HYENA_GUI = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_CAIRO) $(LINK_GTK)
-LINK_HYENA_GUI = -r:$(DIR_HYENA_GUI)/Hyena.Gui.dll
+LINK_HYENA_GUI = -r:$(DIR_BIN)/Hyena.Gui.dll
 LINK_HYENA_GUI_DEPS = $(REF_HYENA_GUI) $(LINK_HYENA_GUI)
 
-DIR_BANSHEE_CORE = $(DIR_CORE)/Banshee.Core
-MONO_BASE_PATH += $(DIR_BANSHEE_CORE)
 REF_BANSHEE_CORE = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) \
 	$(LINK_DBUS) $(LINK_TAGLIB) $(LINK_GCONF)
-LINK_BANSHEE_CORE = -r:$(DIR_BANSHEE_CORE)/Banshee.Core.dll
+LINK_BANSHEE_CORE = -r:$(DIR_BIN)/Banshee.Core.dll
 LINK_BANSHEE_CORE_DEPS = $(REF_BANSHEE_CORE) $(LINK_BANSHEE_CORE)
 
-DIR_BANSHEE_SERVICES = $(DIR_CORE)/Banshee.Services
-MONO_BASE_PATH += $(DIR_BANSHEE_SERVICES)
 REF_BANSHEE_SERVICES = $(LINK_SQLITE) $(LINK_BANSHEE_CORE_DEPS) \
 	$(LINK_MONO_ADDINS_DEPS)
-LINK_BANSHEE_SERVICES = -r:$(DIR_BANSHEE_SERVICES)/Banshee.Services.dll
+LINK_BANSHEE_SERVICES = -r:$(DIR_BIN)/Banshee.Services.dll
 LINK_BANSHEE_SERVICES_DEPS = $(REF_BANSHEE_SERVICES) $(LINK_BANSHEE_SERVICES)
 
-DIR_BANSHEE_WIDGETS = $(DIR_CORE)/Banshee.Widgets
-MONO_BASE_PATH += $(DIR_BANSHEE_WIDGETS)
 REF_BANSHEE_WIDGETS = $(LINK_MONO_POSIX) $(LINK_CAIRO) $(LINK_GTK)
-LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
+LINK_BANSHEE_WIDGETS = -r:$(DIR_BIN)/Banshee.Widgets.dll
 LINK_BANSHEE_WIDGETS_DEPS = $(REF_BANSHEE_WIDGETS) $(LINK_BANSHEE_WIDGETS)
 
-DIR_BANSHEE_THICKCLIENT = $(DIR_CORE)/Banshee.ThickClient
-MONO_BASE_PATH += $(DIR_BANSHEE_THICKCLIENT)
 REF_BANSHEE_THICKCLIENT = $(LINK_BANSHEE_WIDGETS_DEPS) \
 	$(LINK_BANSHEE_SERVICES_DEPS) $(LINK_HYENA_GUI_DEPS) $(LINK_MONO_ADDINS_SETUP_DEPS) $(LINK_MONO_ADDINS_GUI_DEPS)
-LINK_BANSHEE_THICKCLIENT = -r:$(DIR_BANSHEE_THICKCLIENT)/Banshee.ThickClient.dll
+LINK_BANSHEE_THICKCLIENT = -r:$(DIR_BIN)/Banshee.ThickClient.dll
 LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \
 	$(LINK_BANSHEE_THICKCLIENT)
 
-DIR_NEREID = $(DIR_CORE)/Nereid
-MONO_BASE_PATH += $(DIR_NEREID)
 REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 
 
 # Backends
-DIR_BACKENDS = $(top_srcdir)/src/Backends
-
-DIR_BACKEND_GSTREAMER = $(DIR_BACKENDS)/Banshee.GStreamer
-MONO_ADDINS_PATH += $(DIR_BACKEND_GSTREAMER)
 REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
 
 
 # Extensions
-DIR_EXTENSIONS = $(top_srcdir)/src/Extensions
-
-DIR_EXTENSION_MULTIMEDIAKEYS = $(DIR_EXTENSIONS)/Banshee.MultimediaKeys
-MONO_ADDINS_PATH += $(DIR_EXTENSION_MULTIMEDIAKEYS)
 REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
-
-DIR_EXTENSION_NOTIFICATIONAREA = $(DIR_EXTENSIONS)/Banshee.NotificationArea
-MONO_ADDINS_PATH += $(DIR_EXTENSION_NOTIFICATIONAREA) 
 REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 
 

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Sun Jan 27 06:23:50 2008
@@ -8,22 +8,25 @@
 	-resource:$(resource),$(notdir $(resource)))
 
 ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
-ASSEMBLY_FILE = $(ASSEMBLY).$(ASSEMBLY_EXTENSION)
+ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
 
 INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
 
 moduledir = $(INSTALL_DIR_RESOLVED)
-module_SCRIPTS = $(ASSEMBLY_FILE) $(ASSEMBLY_FILE).mdb
+module_SCRIPTS = 
+
+OUTPUT_FILES = \
+	$(ASSEMBLY_FILE) \
+	$(ASSEMBLY_FILE).mdb
 
 all: $(ASSEMBLY_FILE)
 
 $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED_FULL)
-	@echo "$(SOURCES_BUILD)" | tr [:space:] \\n > $(ASSEMBLY_FILE).sources
-	@mkdir -p $(top_builddir)/build
-	$(BUILD) -target:$(TARGET) -out:$@ $(LINK) $(RESOURCES_BUILD) @$(ASSEMBLY_FILE).sources
-	@rm -f $(ASSEMBLY_FILE).sources
+	@mkdir -p $(top_builddir)/bin
+	@echo "Compiling $(notdir $@)..."
+	@$(BUILD) -target:$(TARGET) -out:$@ $(LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
 
 EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED_FULL)
 
-CLEANFILES = $(ASSEMBLY_FILE) $(ASSEMBLY_FILE).mdb *.dll *.mdb *.exe
+CLEANFILES = $(OUTPUT_FILES) *.dll *.mdb *.exe
 MAINTAINERCLEANFILES = Makefile.in

Added: trunk/banshee/docs/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/banshee/docs/Makefile.am	Sun Jan 27 06:23:50 2008
@@ -0,0 +1,7 @@
+SUBDIRS = \
+	Hyena \
+	Banshee
+
+EXTRA_DIST = monodoc.mk
+MAINTAINERCLEANFILES = Makefile.in
+

Added: trunk/banshee/docs/monodoc.mk
==============================================================================
--- (empty file)
+++ trunk/banshee/docs/monodoc.mk	Sun Jan 27 06:23:50 2008
@@ -0,0 +1,46 @@
+DOC_UPDATER = @MONODOCER@ -delete
+DOC_ASSEMBLER = @MDASSEMBLER@ --out $(DOC_PACKAGE) --ecma
+
+ASSEMBLIES_BUILD = $(foreach asm,$(DOC_ASSEMBLIES),$(addprefix -assembly:,$(asm)))
+
+if BUILD_DOCS
+
+monodocdir = $(DOCDIR)
+monodoc_DATA = \
+	$(DOC_PACKAGE).zip \
+	$(DOC_PACKAGE).tree \
+	$(DOC_PACKAGE).source
+
+$(DOC_PACKAGE).zip $(DOC_PACKAGE).tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
+	$(DOC_ASSEMBLER) $(srcdir)/en
+
+update-docs: $(ASSEMBLIES)
+	$(DOC_UPDATER) $(ASSEMBLIES_BUILD) -path:en/
+
+update-svn:
+	@for remove in $$(find en -iregex .*\.remove$$); do \
+		real_remove=$${remove%.remove}; \
+		mv $$remove $$real_remove; \
+		svn delete $$real_remove; \
+	done; \
+	for add in $$(svn status | grep ^? | awk '{print $$2}'); do \
+		svn add $$add; \
+	done;
+
+endif
+
+merge:
+	monodoc --merge-changes $$HOME/.config/monodoc/changeset.xml .
+
+EXTRA_DIST = \
+	$(srcdir)/en/*/*.xml \
+	$(srcdir)/en/*.xml \
+	$(DOC_PACKAGE).source
+	
+DISTCLEANFILES = \
+	$(DOC_PACKAGE).zip \
+	$(DOC_PACKAGE).tree
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+

Modified: trunk/banshee/src/Core/Banshee.Widgets/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Makefile.am	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Makefile.am	Sun Jan 27 06:23:50 2008
@@ -4,9 +4,6 @@
 LINK = $(REF_BANSHEE_WIDGETS)
 SOURCES =  \
 	Banshee.Widgets/ActionButton.cs \
-	Banshee.Widgets/ActiveUserEvent.cs \
-	Banshee.Widgets/ActiveUserEventsManager.cs \
-	Banshee.Widgets/AltProgressBar.cs \
 	Banshee.Widgets/ComplexMenuItem.cs \
 	Banshee.Widgets/CoverArtThumbnail.cs \
 	Banshee.Widgets/CoverArtView.cs \