conduit r1884 - in trunk: . scripts tools/eog-plugin tools/nautilus-extension tools/totem-plugin

[jstowers svn gnome org]

Author: jstowers
Date: Fri Feb 20 07:32:30 2009
New Revision: 1884
URL: http://svn.gnome.org/viewvc/conduit?rev=1884&view=rev

Log:
2009-02-20  John Stowers  <john stowers gmail com>

	* scripts/install-conduit-extensions.sh: Add
	script to install conduit extension if running conduit
	uninstalled.

	* tools/eog-plugin/Makefile.am:
	* tools/nautilus-extension/Makefile.am:
	* tools/totem-plugin/Makefile.am:
	* tools/totem-plugin/conduit.totem-plugin:
	* tools/totem-plugin/conduit.totem-plugin.in:
	Autofoo jiggery to make unistalled installation
	easier.



Added:
   trunk/scripts/install-conduit-extensions.sh   (contents, props changed)
   trunk/tools/totem-plugin/conduit.totem-plugin   (contents, props changed)
      - copied, changed from r1881, /trunk/tools/totem-plugin/conduit.totem-plugin.in
Removed:
   trunk/tools/totem-plugin/conduit.totem-plugin.in
Modified:
   trunk/ChangeLog
   trunk/tools/eog-plugin/Makefile.am
   trunk/tools/nautilus-extension/Makefile.am
   trunk/tools/totem-plugin/Makefile.am

Added: trunk/scripts/install-conduit-extensions.sh
==============================================================================
--- (empty file)
+++ trunk/scripts/install-conduit-extensions.sh	Fri Feb 20 07:32:30 2009
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+APP="conduit/conduit"
+if [ ! -f $APP ] ; then
+    echo "ERROR: Must be run from top directory"
+    exit 1
+fi
+
+CONDUIT_DIR=`pwd`
+EOG_PLUGIN_DIR=~/.gnome2/eog/plugins/
+TOTEM_PLUGIN_DIR=~/.config/totem/plugins/conduit
+NAUTILUS_PLUGIN_DIR=~/.nautilus/python-extensions
+
+echo "Installing EOG Plugin"
+mkdir -p $EOG_PLUGIN_DIR
+ln -f --symbolic $CONDUIT_DIR/conduit/libconduit.py $CONDUIT_DIR/tools/eog-plugin/conduit.{eog-plugin,py} $EOG_PLUGIN_DIR/
+
+echo "Installing Totem Plugin"
+mkdir -p $TOTEM_PLUGIN_DIR
+ln -f --symbolic $CONDUIT_DIR/conduit/libconduit.py $CONDUIT_DIR/tools/totem-plugin/conduit.{totem-plugin,py} $TOTEM_PLUGIN_DIR/
+
+echo "Installing Nautilus Extension"
+mkdir -p $NAUTILUS_PLUGIN_DIR
+ln -f --symbolic $CONDUIT_DIR/conduit/libconduit.py $CONDUIT_DIR/tools/nautilus-extension/conduit.py $NAUTILUS_PLUGIN_DIR/
+

Modified: trunk/tools/eog-plugin/Makefile.am
==============================================================================
--- trunk/tools/eog-plugin/Makefile.am	(original)
+++ trunk/tools/eog-plugin/Makefile.am	Fri Feb 20 07:32:30 2009
@@ -1,9 +1,9 @@
 if ENABLE_EOG_PLUGIN
-nautextdir = $(EOG_PLUGIN_DIR)
-	nautext_DATA = conduit.py conduit.eog-plugin
+	plugindir = $(EOG_PLUGIN_DIR)
+	plugin_PYTHON = conduit.py
+	plugin_DATA = conduit.eog-plugin
 endif
 
 EXTRA_DIST = \
 	conduit.py \
-	conduit.eog-plugin \
-	README
+	conduit.eog-plugin

Modified: trunk/tools/nautilus-extension/Makefile.am
==============================================================================
--- trunk/tools/nautilus-extension/Makefile.am	(original)
+++ trunk/tools/nautilus-extension/Makefile.am	Fri Feb 20 07:32:30 2009
@@ -1,6 +1,6 @@
 if ENABLE_NAUTILUS_EXTENSION
-nautextdir = $(NAUTILUS_EXTENSION_DIR)
-	nautext_DATA = conduit.py
+	nautextdir = $(NAUTILUS_EXTENSION_DIR)
+	nautext_PYTHON = conduit.py
 endif
 
 EXTRA_DIST = \

Modified: trunk/tools/totem-plugin/Makefile.am
==============================================================================
--- trunk/tools/totem-plugin/Makefile.am	(original)
+++ trunk/tools/totem-plugin/Makefile.am	Fri Feb 20 07:32:30 2009
@@ -1,15 +1,10 @@
-plugin_in_files = conduit.totem-plugin.in
-
 if ENABLE_TOTEM_PLUGIN
-plugindir = $(TOTEM_PLUGIN_DIR)/conduit
-plugin_PYTHON = conduit.py
-
-%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)
-
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+	plugindir = $(TOTEM_PLUGIN_DIR)/conduit
+	plugin_PYTHON = conduit.py
+	plugin_DATA = conduit.totem-plugin
 endif
 
-EXTRA_DIST = $(plugin_in_files) conduit.py
+EXTRA_DIST = \
+	conduit.py \
+	conduit.totem-plugin
+

Copied: trunk/tools/totem-plugin/conduit.totem-plugin (from r1881, /trunk/tools/totem-plugin/conduit.totem-plugin.in)
==============================================================================
--- /trunk/tools/totem-plugin/conduit.totem-plugin.in	(original)
+++ trunk/tools/totem-plugin/conduit.totem-plugin	Fri Feb 20 07:32:30 2009
@@ -2,8 +2,8 @@
 Loader=python
 Module=conduit
 IAge=1
-_Name=Conduit Uploader
-_Description=Upload your videos to a number of video sites.
+Name=Conduit Uploader
+Description=Upload your videos to a number of video sites.
 Authors=Philip Withnall <philip tecnocode co uk>
 Copyright=Copyright  2008 Philip Withnall
 Website=http://www.gnome.org/projects/totem/