banshee r3376 - in trunk/banshee: . build data po src/Clients/Nereid tests

From: abock svn gnome org
To: svn-commits-list gnome org
Subject: banshee r3376 - in trunk/banshee: . build data po src/Clients/Nereid tests
Date: Tue, 4 Mar 2008 22:03:42 +0000 (GMT)
Author: abock
Date: Tue Mar  4 22:03:42 2008
New Revision: 3376
URL: http://svn.gnome.org/viewvc/banshee?rev=3376&view=rev

Log:
Fix more build stuffs

Added:
   trunk/banshee/po/sort-potfiles   (contents, props changed)
Removed:
   trunk/banshee/README.trunk
Modified:
   trunk/banshee/build/Makefile.am
   trunk/banshee/build/build.rules.mk
   trunk/banshee/configure.ac
   trunk/banshee/data/Makefile.am
   trunk/banshee/po/POTFILES.in
   trunk/banshee/po/POTFILES.skip
   trunk/banshee/src/Clients/Nereid/   (props changed)
   trunk/banshee/tests/Makefile.am

Modified: trunk/banshee/build/Makefile.am
==============================================================================
--- trunk/banshee/build/Makefile.am	(original)
+++ trunk/banshee/build/Makefile.am	Tue Mar  4 22:03:42 2008
@@ -16,7 +16,7 @@
 
 $(TRANSLATOR_EXTRACTOR_ASSEMBLY): TranslatorExtractor.cs
 	$(MCS) -out:$@ $< && $(MONO) $@ $(top_builddir)/po > \
-		$(top_srcdir)/src/Core/Banshee.Core/Resources/translators.xml
+		$(top_builddir)/data/translators.xml
 
 EXTRA_DIST = \
 	icon-theme-installer \

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Tue Mar  4 22:03:42 2008
@@ -1,10 +1,8 @@
-SOURCES_EXPANDED = $(foreach expr, $(SOURCES), $(wildcard $(expr)))
-SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES_EXPANDED))
+SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES))
 SOURCES_BUILD += $(top_srcdir)/src/AssemblyInfo.cs
 
-RESOURCES_EXPANDED = $(foreach expr, $(RESOURCES), $(wildcard $(expr)))
-RESOURCES_EXPANDED_FULL = $(addprefix $(srcdir)/, $(RESOURCES_EXPANDED))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED_FULL), \
+RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
 	-resource:$(resource),$(notdir $(resource)))
 
 ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
@@ -21,7 +19,7 @@
 
 all: $(ASSEMBLY_FILE)
 
-$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED_FULL)
+$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED)
 	@mkdir -p $(top_builddir)/bin
 	@echo -e "\033[1mCompiling $(notdir $@)...\033[0m"
 	@$(BUILD) -target:$(TARGET) -out:$@ $(LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
@@ -29,7 +27,7 @@
 		cp $(notdir $  config) $(top_builddir)/bin; \
 	fi;
 
-EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED_FULL)
+EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED)
 
 CLEANFILES = $(OUTPUT_FILES) *.dll *.mdb *.exe
 DISTCLEANFILES = *.pidb

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Tue Mar  4 22:03:42 2008
@@ -1,6 +1,6 @@
 dnl Automake setup
 
-AC_INIT([banshee-preview], [0.90.1])
+AC_INIT([banshee-preview], [0.99.1]) # 1.0 Alpha 1
 AC_CANONICAL_SYSTEM
 AC_PREREQ(2.13)
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
@@ -45,7 +45,7 @@
 	System.Web
 	System.Web.Services
 	Mono.Cairo
-	Mono.Data.Sqlite
+	Mono.Data.SqliteClient
 	Mono.Posix
 	ICSharpCode.SharpZipLib
 ])
@@ -63,7 +63,7 @@
 SHAMROCK_CHECK_MONO_NUNIT
 
 dnl Boo libraries and compiler (optional)
-BANSHEE_CHECK_BOO
+#BANSHEE_CHECK_BOO
 
 dnl External TagLib# libraries (optional)
 BANSHEE_CHECK_TAGLIB_SHARP
@@ -79,16 +79,16 @@
 AM_GCONF_SOURCE_2
 
 dnl DAP support (each module is optional)
-BANSHEE_CHECK_DAP_IPOD
-BANSHEE_CHECK_DAP_NJB
-BANSHEE_CHECK_DAP_MTP
-BANSHEE_CHECK_DAP_KARMA
+#BANSHEE_CHECK_DAP_IPOD
+#BANSHEE_CHECK_DAP_NJB
+#BANSHEE_CHECK_DAP_MTP
+#BANSHEE_CHECK_DAP_KARMA
 
 dnl DAAP support (optional)
-BANSHEE_CHECK_DAAP
+#BANSHEE_CHECK_DAAP
 
 dnl i18n
-SHAMROCK_CONFIGURE_I18N(banshee2)
+SHAMROCK_CONFIGURE_I18N(banshee-preview)
 
 dnl generated files
 AC_OUTPUT([
@@ -112,8 +112,6 @@
 tests/Makefile
 
 extras/Makefile
-extras/tools/Makefile
-extras/tools/banshee-import
 
 libbanshee/Makefile
 
@@ -130,10 +128,6 @@
 src/Core/Banshee.ThickClient/Makefile
 src/Core/Banshee.Widgets/Makefile
 
-src/Dap/Makefile
-src/Dap/Banshee.DapCore/Makefile
-src/Dap/Banshee.Dap.MassStorage/Makefile
-
 src/Backends/Makefile
 src/Backends/Banshee.Gnome/Makefile
 src/Backends/Banshee.GStreamer/Makefile
@@ -171,21 +165,20 @@
     C Compiler:        ${CC}
     Mono C# Compiler:  ${MCS}
     Mono Runtime:      ${MONO}
- 
-    Digital Audio Players (DAP):
-      iPod:            ${enable_ipodsharp}
-      NJB:             ${enable_njbsharp}
-      MTP:             ${enable_mtp_dap}
-      Karma:           ${enable_karmasharp}
-
-    DAAP Support:      ${enable_daap}${zeroconf_lib}
 "
-if test -d ${expanded_libdir}/banshee; then
+#    Digital Audio Players (DAP):
+#      iPod:            ${enable_ipodsharp}
+#      NJB:             ${enable_njbsharp}
+#      MTP:             ${enable_mtp_dap}
+#      Karma:           ${enable_karmasharp}
+#
+#    DAAP Support:      ${enable_daap}${zeroconf_lib}
+#"
+
+if test -d ${expanded_libdir}/${PACKAGE}; then
 	echo "WARNING: An existing Banshee install is in ${expanded_libdir}/banshee"
 	echo "         Remove the existing install before installing this build."
 	echo "         Installing over an existing install will cause conflicts!"
 	echo 
 fi
 
-grep -v "Pass " README.trunk
-

Modified: trunk/banshee/data/Makefile.am
==============================================================================
--- trunk/banshee/data/Makefile.am	(original)
+++ trunk/banshee/data/Makefile.am	Tue Mar  4 22:03:42 2008
@@ -26,3 +26,4 @@
 MAINTAINERCLEANFILES = \
 	Makefile.in
 
+CLEANFILES = translators.xml

Modified: trunk/banshee/po/POTFILES.in
==============================================================================
--- trunk/banshee/po/POTFILES.in	(original)
+++ trunk/banshee/po/POTFILES.in	Tue Mar  4 22:03:42 2008
@@ -1,7 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
-data/audio-profiles/aac.xml.in
 data/audio-profiles/base.xml.in
 data/audio-profiles/flac.xml.in
 data/audio-profiles/mp3-lame.xml.in
@@ -14,73 +13,72 @@
 libbanshee/gst-cd-rip-0.10.c
 libbanshee/gst-transcode-0.10.c
 src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
+src/Clients/Nereid/Nereid/PlayerInterface.cs
+src/Clients/Nereid/Nereid/ViewContainer.cs
 src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs
 src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
 src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs
+src/Core/Banshee.Services/Banshee.Collection.Database/LibraryAlbumInfo.cs
+src/Core/Banshee.Services/Banshee.Collection.Database/LibraryArtistInfo.cs
 src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs
+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/ThreadPoolImportSource.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
 src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs
 src/Core/Banshee.Services/Banshee.Playlists.Formats/AsxPlaylistFormat.cs
 src/Core/Banshee.Services/Banshee.Playlists.Formats/M3uPlaylistFormat.cs
 src/Core/Banshee.Services/Banshee.Playlists.Formats/PlsPlaylistFormat.cs
-src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs
-src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs
-src/Core/Banshee.Services/Banshee.Web/Browser.cs
-src/Core/Banshee.Services/Banshee.Collection.Database/LibraryAlbumInfo.cs
-src/Core/Banshee.Services/Banshee.Collection.Database/LibraryArtistInfo.cs
-src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs
-src/Core/Banshee.Services/Banshee.Networking/NetworkDetect.cs
-src/Core/Banshee.Services/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
 src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
+src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs
 src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs
 src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs
+src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs
 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/Resources/banshee-dialogs.glade
+src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BetaReleaseViewOverlay.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
 src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs
 src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs
+src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/PreferencesDialog.cs
 src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs
 src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
+src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
 src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
+src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs
 src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
 src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
 src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
+src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedMessageBar.cs
 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.Sources.Gui/SourceView.cs
-src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs
-src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/PreferencesDialog.cs
-src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedMessageBar.cs
-src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
-src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs
 src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs
 src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs
-src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/QueryBuilder.cs
-src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/QueryBuilderModel.cs
 src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs
+src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
 src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs
+src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade
 src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs
 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/Clients/Nereid/Nereid/PlayerInterface.cs
-src/Clients/Nereid/Nereid/ViewContainer.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/LastfmSource.cs
 src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSourceContents.cs
+src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
 src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationEditor.cs
 src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs
 src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationType.cs
 src/Extensions/Banshee.Lastfm/Resources/lastfm.glade
-src/Extensions/Banshee.Lastfm/banshee-plugin-lastfm.schemas.in
 src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
 src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs
 src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
@@ -95,4 +93,5 @@
 src/Libraries/Hyena/Hyena.Query/DateQueryValue.cs
 src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs
 src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs
+src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
 src/Libraries/Lastfm/Lastfm/RadioConnection.cs

Modified: trunk/banshee/po/POTFILES.skip
==============================================================================
--- trunk/banshee/po/POTFILES.skip	(original)
+++ trunk/banshee/po/POTFILES.skip	Tue Mar  4 22:03:42 2008
@@ -1,3 +1,4 @@
+data/audio-profiles/aac.xml.in
 old-code/Core/Banshee.Base/ActionManager.cs
 old-code/Core/Banshee.Base/AudioCd/AudioCdCore.cs
 old-code/Core/Banshee.Base/AudioCd/AudioCdDisk.cs

Added: trunk/banshee/po/sort-potfiles
==============================================================================
--- (empty file)
+++ trunk/banshee/po/sort-potfiles	Tue Mar  4 22:03:42 2008
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+head -n 3 < POTFILES.in > POTFILES.in.tmp 
+grep -v "^[\\[#]" < POTFILES.in | sort >> POTFILES.in.tmp
+mv POTFILES.in.tmp POTFILES.in
+

Modified: trunk/banshee/tests/Makefile.am
==============================================================================
--- trunk/banshee/tests/Makefile.am	(original)
+++ trunk/banshee/tests/Makefile.am	Tue Mar  4 22:03:42 2008
@@ -5,15 +5,15 @@
 
 ASSEMBLY_NAME = banshee-tests
 ASSEMBLY = $(ASSEMBLY_NAME).dll
-ASSEMBLY_CSFILES =  \
-	Banshee.Core/FileNamePatternTests.cs \
-	Banshee.Core/KernelTests.cs \
-	Banshee.Services/PlaylistFormatTests.cs \
-	Banshee.Services/Xspf/Xspf.cs \
-	Hyena/CryptoUtilTests.cs \
-	Hyena/RangeCollectionTests.cs
-
-CFS=Hyena/RangeCollectionTests.cs Hyena/CryptoUtilTests.cs Hyena/StringUtilTests.cs
+ASSEMBLY_CSFILES = \
+	$(srcdir)/Hyena/CryptoUtilTests.cs \
+	$(srcdir)/Hyena/RangeCollectionTests.cs \
+	$(srcdir)/Hyena/StringUtilTests.cs
+
+#	Banshee.Core/KernelTests.cs
+#	Banshee.Core/FileNamePatternTests.cs
+#	Banshee.Services/PlaylistFormatTests.cs
+#	Banshee.Services/Xspf/Xspf.cs
 
 NUNIT_TESTER_NAME = ConsoleUi
 NUNIT_TESTER = $(NUNIT_TESTER_NAME).exe
@@ -22,7 +22,7 @@
 	ConsoleUi.cs
 
 $(ASSEMBLY): $(ASSEMBLY_CSFILES)
-	$(MCS) $(MCS_FLAGS) $(NUNIT_FLAGS) -out:$@ -target:library -r:System.Xml $(LINK_HYENA_DEPS) $(CFS)
+	$(MCS) $(MCS_FLAGS) $(NUNIT_FLAGS) -out:$@ -target:library -r:System.Xml $(LINK_HYENA_DEPS) $(ASSEMBLY_CSFILES)
 
 $(NUNIT_TESTER): $(NUNIT_TESTER_CSFILES)
 	$(MCS) $(MCS_FLAGS) -out:$@ $(NUNIT_FLAGS) $(NUNIT_TESTER_CSFILES)
@@ -34,6 +34,8 @@
 	MONO_PATH="$(top_builddir)/bin" mono --debug $(NUNIT_TESTER) $(ASSEMBLY)
 endif
 
+EXTRA_DIST = $(ASSEMBLY_CSFILES)
+
 CLEANFILES = $(ASSEMBLY) $(NUNIT_TESTER) TestResult.xml
 DISTCLEANFILES = *.mdb *.dll *.exe
 MAINTAINERCLEANFILES = Makefile.in
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]