banshee r3690 - in trunk/banshee: . build po src/Extensions src/Extensions/Banshee.Lastfm

[abock svn gnome org]

Author: abock
Date: Sun Apr  6 22:34:41 2008
New Revision: 3690
URL: http://svn.gnome.org/viewvc/banshee?rev=3690&view=rev

Log:
2008-04-06  Aaron Bockover  <abock gnome org>

    * build/build.rules.mk: Fixed up the new private icon theme rules so the
    icons get 'installed' when building, installing, and uninstalling; this
    should fix the missing icon issues now when you run banshee installed

    * build/private-icon-theme-installer: A script for installing and
    uninstalling the private icon theme files

    * src/Extensions/Makefile.am: Enabled DAAP again, halex says it won't
    ruin the database now



Added:
   trunk/banshee/build/private-icon-theme-installer   (contents, props changed)
Removed:
   trunk/banshee/build/banshee-1.pc.in
   trunk/banshee/src/Extensions/Banshee.Lastfm/banshee-plugin-lastfm.schemas.in
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/Makefile.am
   trunk/banshee/build/build.rules.mk
   trunk/banshee/po/ChangeLog
   trunk/banshee/po/POTFILES.in
   trunk/banshee/src/Extensions/Makefile.am

Modified: trunk/banshee/build/Makefile.am
==============================================================================
--- trunk/banshee/build/Makefile.am	(original)
+++ trunk/banshee/build/Makefile.am	Sun Apr  6 22:34:41 2008
@@ -19,6 +19,7 @@
 
 EXTRA_DIST = \
 	icon-theme-installer \
+	private-icon-theme-installer \
 	GConfSchemaExtractor.cs \
 	TranslatorExtractor.cs \
 	gconf-schema-rules

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Sun Apr  6 22:34:41 2008
@@ -1,3 +1,6 @@
+UNIQUE_FILTER_PIPE = tr [:space:] \\n | sort | uniq
+BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE)
+
 SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES))
 SOURCES_BUILD += $(top_srcdir)/src/AssemblyInfo.cs
 
@@ -5,16 +8,17 @@
 RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
 	-resource:$(resource),$(notdir $(resource)))
 
-THEME_ICONS = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png)
+INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)"
+THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png)
+THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
 
 ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
 ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
 
 INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
 
-FILTER_LINK_PIPE = tr [:space:] \\n | sort | uniq
-FILTERED_LINK = $(shell echo "$(LINK)" | $(FILTER_LINK_PIPE))
-DEP_LINK = $(shell echo "$(LINK)" | $(FILTER_LINK_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
+FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
+DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
 
 OUTPUT_FILES = \
 	$(ASSEMBLY_FILE) \
@@ -23,14 +27,13 @@
 moduledir = $(INSTALL_DIR_RESOLVED)
 module_SCRIPTS = $(OUTPUT_FILES)
 
-all: $(ASSEMBLY_FILE)
+all: $(ASSEMBLY_FILE) theme-icons
 
 build-debug:
 	@echo $(DEP_LINK)
 
 $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
 	@mkdir -p $(top_builddir)/bin
-	@(test -d $(srcdir)/ThemeIcons && mkdir -p $(top_builddir)/bin/share/$(PACKAGE)/icons/hicolor && cp -rf $(srcdir)/ThemeIcons/* $(top_builddir)/bin/share/$(PACKAGE)/icons/hicolor) || true
 	@colors=no; \
 	case $$TERM in \
 		"xterm" | "rxvt" | "rxvt-unicode") \
@@ -48,8 +51,18 @@
 		cp $(notdir $  config) $(top_builddir)/bin; \
 	fi;
 
-EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS)
+theme-icons: $(THEME_ICONS_SOURCE)
+	@$(INSTALL_ICONS) -il "$(BUILD_DATA_DIR)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+
+install-data-local: $(THEME_ICONS_SOURCE)
+	@$(INSTALL_ICONS) -i "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+	
+uninstall-local: $(THEME_ICONS_SOURCE)
+	@$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+
+EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
 
 CLEANFILES = $(OUTPUT_FILES) *.dll *.mdb *.exe
 DISTCLEANFILES = *.pidb
 MAINTAINERCLEANFILES = Makefile.in
+

Added: trunk/banshee/build/private-icon-theme-installer
==============================================================================
--- (empty file)
+++ trunk/banshee/build/private-icon-theme-installer	Sun Apr  6 22:34:41 2008
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+mkinstalldirs=$1; shift
+install_data=$1; shift
+action=$1; shift
+dest_dir=$1; shift
+src_dir=$1; shift
+
+for icon in $@; do
+	dest_dir_build="${dest_dir}/icons/hicolor/$(dirname ${icon})"
+	if [[ ${action} == "-i" || ${action} == "-il" ]]; then
+		src_file="${src_dir}/ThemeIcons/${icon}"
+		$mkinstalldirs "${dest_dir_build}"
+		if [[ ${action} == "-i" ]]; then 
+			echo "Installing private icon theme icon: ${icon}"
+		fi
+		$install_data "${src_file}" "${dest_dir_build}"
+	else
+		echo "Uninstalling private icon theme icon: ${icon}"
+		rm -f "${dest_dir_build}/$(basename ${icon})"
+	fi
+done
+

Modified: trunk/banshee/po/POTFILES.in
==============================================================================
--- trunk/banshee/po/POTFILES.in	(original)
+++ trunk/banshee/po/POTFILES.in	Sun Apr  6 22:34:41 2008
@@ -10,8 +10,9 @@
 data/audio-profiles/wav.xml.in
 data/audio-profiles/wma.xml.in
 data/banshee-1.desktop.in.in
-libbanshee/gst-cd-rip-0.10.c
+libbanshee/banshee-ripper.c
 libbanshee/gst-transcode-0.10.c
+src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs
 src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
 src/Clients/Nereid/Nereid/PlayerInterface.cs
 src/Clients/Nereid/Nereid/ViewContainer.cs
@@ -24,7 +25,9 @@
 src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
 src/Core/Banshee.Services/Banshee.Library/HomeDirectoryImportSource.cs
 src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
+src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs
 src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs
+src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs
 src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
 src/Core/Banshee.Services/Banshee.Networking/NetworkDetect.cs
 src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
@@ -40,8 +43,6 @@
 src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
 src/Core/Banshee.Services/Banshee.Sources/Source.cs
 src/Core/Banshee.Services/Banshee.Web/Browser.cs
-src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileComboBox.cs
-src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileConfigurationDialog.cs
 src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs
 src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs
 src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs
@@ -60,6 +61,8 @@
 src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs
 src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs
 src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs
+src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs
+src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs
 src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs
 src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs
 src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs
@@ -70,6 +73,16 @@
 src/Core/Banshee.Widgets/Banshee.Widgets/RatingMenuItem.cs
 src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
 src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs
+src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs
+src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
+src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs
+src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs
+src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs
+src/Extensions/Banshee.Bookmarks/Banshee.Bookmarks/BookmarksService.cs
+src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs
+src/Extensions/Banshee.Daap/Banshee.Daap/DaapLoginDialog.cs
+src/Extensions/Banshee.Daap/Banshee.Daap/DaapPlaylistSource.cs
+src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
 src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs
 src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs
 src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs
@@ -80,6 +93,7 @@
 src/Extensions/Banshee.Lastfm/Resources/lastfm.glade
 src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
 src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs
+src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
 src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
 src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs
 src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs
@@ -88,7 +102,10 @@
 src/Libraries/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs
 src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs
 src/Libraries/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs
+src/Libraries/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs
+src/Libraries/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs
 src/Libraries/Hyena/Hyena.Query/DateQueryValue.cs
+src/Libraries/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs
 src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs
 src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs
 src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs

Modified: trunk/banshee/src/Extensions/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Makefile.am	Sun Apr  6 22:34:41 2008
@@ -1,8 +1,7 @@
-# DO NOT ENABLE DAAP!!!!!!!
-
 SUBDIRS = \
 	Banshee.AudioCd \
 	Banshee.Bookmarks \
+	Banshee.Daap \
 	Banshee.Lastfm \
 	Banshee.MultimediaKeys \
 	Banshee.NotificationArea \