nemo r99 - in trunk: . broker po

[arj svn gnome org]

Author: arj
Date: Mon Mar 17 12:23:58 2008
New Revision: 99
URL: http://svn.gnome.org/viewvc/nemo?rev=99&view=rev

Log:
Better installation

Fixes from Thomas Klausner

Also give out a better error message if the dbus session is not running



Modified:
   trunk/Makefile
   trunk/broker/Tracker.cs
   trunk/broker/Xesam.cs
   trunk/nemo.in
   trunk/po/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Mar 17 12:23:58 2008
@@ -1,10 +1,10 @@
 PRG = nemo.exe
 
-PREFIX=/usr
+PREFIX?=/usr
 
 all:
 	make -C po/
-	gmcs -debug -unsafe dbus/*.cs broker/*.cs metadata/MetadataStore.cs common/*.cs gtk/*.cs uicommon/*.cs gtk-gui/*.cs -resource:images/no-preview.png,no-preview.png -resource:images/close.png,close.png -resource:images/zip.png,zip.png -resource:images/stock_about.png,stock_about.png -resource:images/image-x-generic.png,image-x-generic.png -resource:images/pdf.png,pdf.png -resource:images/text-html.png,text-html.png -resource:images/text-x-generic.png,text-x-generic.png -resource:images/dot.png,dot.png -resource:images/video-x-generic.png,video-x-generic.png -resource:images/x-office-document.png,x-office-document.png -resource:images/x-office-presentation.png,x-office-presentation.png -resource:images/x-office-spreadsheet.png,x-office-spreadsheet.png -resource:images/starred_right.png,starred_right.png -resource:images/big_star.png,big_star.png -resource:images/blue_guy.png,blue_guy.png -resource:images/blue_guy_med.png,blue_guy_med.png -resource:images/small_blue_guy.png,sma
 ll_blue_guy.png -r:System.Data -r:Mono.Data.Sqlite -r:Mono.Posix -r:Mono.Cairo -pkg:gtk-sharp-2.0 -pkg:gnome-sharp-2.0 -pkg:stetic -out:$(PRG)
+	gmcs -debug -unsafe dbus/*.cs broker/*.cs metadata/MetadataStore.cs common/*.cs gtk/*.cs uicommon/*.cs gtk-gui/*.cs -resource:images/no-preview.png,no-preview.png -resource:images/close.png,close.png -resource:images/zip.png,zip.png -resource:images/stock_about.png,stock_about.png -resource:images/image-x-generic.png,image-x-generic.png -resource:images/pdf.png,pdf.png -resource:images/text-html.png,text-html.png -resource:images/text-x-generic.png,text-x-generic.png -resource:images/dot.png,dot.png -resource:images/video-x-generic.png,video-x-generic.png -resource:images/x-office-document.png,x-office-document.png -resource:images/x-office-presentation.png,x-office-presentation.png -resource:images/x-office-spreadsheet.png,x-office-spreadsheet.png -resource:images/starred_right.png,starred_right.png -resource:images/big_star.png,big_star.png -resource:images/blue_guy.png,blue_guy.png -resource:images/blue_guy_med.png,blue_guy_med.png -resource:images/small_blue_guy.png,sma
 ll_blue_guy.png -r:System.Data -r:Mono.Data.Sqlite -r:Mono.Posix -r:Mono.Cairo -pkg:gtk-sharp-2.0 -pkg:gnome-sharp-2.0 -out:$(PRG)
 
 clean:
 	@if test -f $(PRG); then rm $(PRG); fi
@@ -12,14 +12,17 @@
 install: $(PRG)
 	make -C po install
 	@sed -e "s|\ PREFIX\@|$(PREFIX)|g" < nemo.desktop.in > nemo.desktop
-	install -D nemo.desktop $(DESTDIR)$(PREFIX)/share/applications/nemo.desktop
+	install -d $(DESTDIR)$(PREFIX)/share/applications
+	install -m 444 nemo.desktop $(DESTDIR)$(PREFIX)/share/applications/nemo.desktop
 #	@sed -e "s|\ PREFIX\@|$(PREFIX)|g" < nemo-autostart.desktop.in > nemo-autostart.desktop
 #	install -D nemo-autostart.desktop $(DESTDIR)$(PREFIX)/share/gnome/autostart/nemo.desktop
-	install -D images/blue_guy.png $(DESTDIR)$(PREFIX)/share/nemo/nemo.png
-	install -D images/no-preview.png $(DESTDIR)$(PREFIX)/share/nemo/no-preview.png
-	install -D $(PRG) $(DESTDIR)$(PREFIX)/bin/$(PRG)
+	install -d $(DESTDIR)$(PREFIX)/share/nemo
+	install -m 444 images/blue_guy.png $(DESTDIR)$(PREFIX)/share/nemo/nemo.png
+	install -m 444 images/no-preview.png $(DESTDIR)$(PREFIX)/share/nemo/no-preview.png
+	install -d $(DESTDIR)$(PREFIX)/bin
+	install $(PRG) $(DESTDIR)$(PREFIX)/bin/$(PRG)
 	@sed -e "s|\ PREFIX\@|$(PREFIX)|g" < nemo.in > nemo
-	install -D nemo $(DESTDIR)$(PREFIX)/bin/nemo
+	install nemo $(DESTDIR)$(PREFIX)/bin/nemo
 #	@sed -e "s|\ PREFIX\@|$(PREFIX)|g" < nemo-hidden.in > nemo-hidden
 #	install -D nemo-hidden $(DESTDIR)$(PREFIX)/bin/nemo-hidden
 #	@rm nemo nemo-hidden nemo.desktop nemo-autostart.desktop

Modified: trunk/broker/Tracker.cs
==============================================================================
--- trunk/broker/Tracker.cs	(original)
+++ trunk/broker/Tracker.cs	Mon Mar 17 12:23:58 2008
@@ -49,7 +49,16 @@
 			finished = false;
 			iterating = false;
 			
-	        con = Bus.Session;
+			try {
+			    con = Bus.Session;
+			} catch {
+			    System.Console.WriteLine("");
+			    System.Console.WriteLine(Mono.Unix.Catalog.GetString("ERROR: Could not connect to the Dbus session"));
+			    System.Console.WriteLine(Mono.Unix.Catalog.GetString("Please check the DBUS_SESSION_BUS_ADDRESS environment variable"));
+			    System.Console.WriteLine(Mono.Unix.Catalog.GetString("This is normally set by running export `dbus-launch`"));
+			    System.Environment.Exit(0);
+			    
+			}
 
 			//string addr = "unix:path=/tmp/dbus-ABCDEFGHIJ";
 	        //con = new Connection (addr);
@@ -157,4 +166,4 @@
 			});
 	    }
 	}
-}
\ No newline at end of file
+}

Modified: trunk/broker/Xesam.cs
==============================================================================
--- trunk/broker/Xesam.cs	(original)
+++ trunk/broker/Xesam.cs	Mon Mar 17 12:23:58 2008
@@ -42,7 +42,16 @@
 			
 			session_id = "";
 			
-			BusG.Init ();
+			try {
+			    BusG.Init ();
+			} catch {
+			    System.Console.WriteLine("");
+			    System.Console.WriteLine(Mono.Unix.Catalog.GetString("ERROR: Could not connect to the Dbus session"));
+			    System.Console.WriteLine(Mono.Unix.Catalog.GetString("Please check the DBUS_SESSION_BUS_ADDRESS environment variable"));
+			    System.Console.WriteLine(Mono.Unix.Catalog.GetString("This is normally set by running export `dbus-launch`"));
+			    System.Environment.Exit(0);
+			    
+			}
 
 	        con = Bus.Session;
 			

Modified: trunk/nemo.in
==============================================================================
--- trunk/nemo.in	(original)
+++ trunk/nemo.in	Mon Mar 17 12:23:58 2008
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec -a nemo /usr/bin/mono @PREFIX@/bin/nemo.exe
+exec -a nemo mono @PREFIX@/bin/nemo.exe

Modified: trunk/po/Makefile
==============================================================================
--- trunk/po/Makefile	(original)
+++ trunk/po/Makefile	Mon Mar 17 12:23:58 2008
@@ -2,7 +2,7 @@
 
 default: mo
 
-PREFIX=/usr
+PREFIX?=/usr
 
 .PHONY: nemo.pot