[gst-cvs] gstreamer: plugin-scanner: rename plugin-scanner helper binary to gst-plugin-scanner
Tim Mueller
tpm at kemper.freedesktop.org
Wed Nov 18 01:40:52 PST 2009
Module: gstreamer
Branch: master
Commit: 3c7c9692aca0ddf88fcf3ec6528582555454e769
URL: http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=3c7c9692aca0ddf88fcf3ec6528582555454e769
Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date: Mon Nov 16 00:12:22 2009 +0000
plugin-scanner: rename plugin-scanner helper binary to gst-plugin-scanner
and install into a different directory $(libexecdir/gstreamer-0.10) so that
everything is versioned properly.
NOTE: run 'make clean' after updating; if you are running an uninstalled setup,
you will need to update your gst-uninstalled script (unless it's symlinked
to gstreamer core master) and exit/enter your uninstalled environment to get
the updated environment. If you are running an installed setup, you should
run 'make uninstall' before merging this change or remove the old
plugin-scanner binary manually.
Fixes #601698.
---
configure.ac | 4 ++--
docs/faq/gst-uninstalled | 2 +-
docs/gst/Makefile.am | 2 +-
docs/libs/Makefile.am | 2 +-
docs/plugins/Makefile.am | 2 +-
gst/gstpluginloader.c | 8 ++++----
libs/gst/helpers/.gitignore | 2 +-
libs/gst/helpers/Makefile.am | 14 +++++++++-----
.../{plugin-scanner.c => gst-plugin-scanner.c} | 2 +-
tests/check/Makefile.am | 2 +-
tests/examples/manual/Makefile.am | 2 +-
11 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7d21701..2947d14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -687,9 +687,9 @@ GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugi
AC_SUBST(GST_PLUGIN_LDFLAGS, "$GST_PLUGIN_LDFLAGS")
dnl plugin scanner locations
-AS_AC_EXPAND(GST_PLUGIN_SCANNER_INSTALLED,${libexecdir}/plugin-scanner)
+AS_AC_EXPAND(GST_PLUGIN_SCANNER_INSTALLED,${libexecdir}/gstreamer-$GST_MAJORMINOR/gst-plugin-scanner)
AC_DEFINE_UNQUOTED(GST_PLUGIN_SCANNER_INSTALLED,
- "$GST_PLUGIN_SCANNER_INSTALLED", [location of the installed plugin-scanner])
+ "$GST_PLUGIN_SCANNER_INSTALLED", [location of the installed gst-plugin-scanner])
SHAVE_INIT([common],[enable])
diff --git a/docs/faq/gst-uninstalled b/docs/faq/gst-uninstalled
index 65b6371..3477772 100755
--- a/docs/faq/gst-uninstalled
+++ b/docs/faq/gst-uninstalled
@@ -126,7 +126,7 @@ export GST_PLUGIN_SYSTEM_PATH=
rm -f $GST/gstreamer/registry.xml 2>/dev/null
export GST_REGISTRY=$GST/gstreamer/registry.dat
# Point at the uninstalled plugin scanner
-export GST_PLUGIN_SCANNER=$GST/gstreamer/libs/gst/helpers/plugin-scanner
+export GST_PLUGIN_SCANNER=$GST/gstreamer/libs/gst/helpers/gst-plugin-scanner
# once MANPATH is set, it needs at least an "empty"component to keep pulling
# in the system-configured man paths from man.config
diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index 857fee4..d4db483 100644
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -92,7 +92,7 @@ GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
GTKDOC_EXTRA_ENVIRONMENT= \
- GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/plugin-scanner
+ GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/gst-plugin-scanner
# If you need to override some of the declarations, place them in this file
# and uncomment this line.
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 092d75e..4172285 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -96,7 +96,7 @@ GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
GTKDOC_EXTRA_ENVIRONMENT= \
- GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/plugin-scanner
+ GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/gst-plugin-scanner
# If you need to override some of the declarations, place them in this file
# and uncomment this line.
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 35f5c90..0053e1e 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -15,7 +15,7 @@ include $(top_srcdir)/common/upload-doc.mak
# Extra environment needed for Core only...
INSPECT_EXTRA_ENVIRONMENT= \
- GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/plugin-scanner
+ GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/gst-plugin-scanner
# generated basefiles
#basefiles = \
diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
index 10f7688..dd0046b 100644
--- a/gst/gstpluginloader.c
+++ b/gst/gstpluginloader.c
@@ -345,7 +345,7 @@ gst_plugin_loader_try_helper (GstPluginLoader * loader, gchar * location)
{
char *argv[] = { location, "-l", NULL };
- GST_LOG ("Trying to spawn plugin-scanner helper at %s", location);
+ GST_LOG ("Trying to spawn gst-plugin-scanner helper at %s", location);
if (!g_spawn_async_with_pipes (NULL, argv, NULL,
G_SPAWN_DO_NOT_REAP_CHILD /* | G_SPAWN_STDERR_TO_DEV_NULL */ ,
NULL, NULL, &loader->child_pid, &loader->fd_w.fd, &loader->fd_r.fd,
@@ -377,7 +377,7 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
if (loader->child_running)
return TRUE;
- /* Find the plugin-scanner, first try installed then by env-var */
+ /* Find the gst-plugin-scanner, first try installed then by env-var */
helper_bin = g_strdup (GST_PLUGIN_SCANNER_INSTALLED);
res = gst_plugin_loader_try_helper (loader, helper_bin);
g_free (helper_bin);
@@ -392,8 +392,8 @@ gst_plugin_loader_spawn (GstPluginLoader * loader)
res = gst_plugin_loader_try_helper (loader, helper_bin);
g_free (helper_bin);
} else {
- GST_LOG ("Installed plugin scanner failed and "
- "GST_PLUGIN_SCANNER env var not set. No plugin-scanner available");
+ GST_LOG ("Installed plugin scanner failed and GST_PLUGIN_SCANNER "
+ " env var not set. No gst-plugin-scanner available");
}
}
diff --git a/libs/gst/helpers/.gitignore b/libs/gst/helpers/.gitignore
index e3f6e80..faf8158 100644
--- a/libs/gst/helpers/.gitignore
+++ b/libs/gst/helpers/.gitignore
@@ -1,2 +1,2 @@
-plugin-scanner
+gst-plugin-scanner
*.o
diff --git a/libs/gst/helpers/Makefile.am b/libs/gst/helpers/Makefile.am
index b9ca33c..03b86da 100644
--- a/libs/gst/helpers/Makefile.am
+++ b/libs/gst/helpers/Makefile.am
@@ -1,6 +1,10 @@
-helpers_PROGRAMS = plugin-scanner
-helpersdir=$(libexecdir)
+helpers_PROGRAMS = gst-plugin-scanner
+helpersdir=$(libexecdir)/gstreamer-$(GST_MAJORMINOR)
-plugin_scanner_SOURCES = plugin-scanner.c
-plugin_scanner_CFLAGS = $(GST_OBJ_CFLAGS)
-plugin_scanner_LDFLAGS = $(GST_OBJ_LIBS)
+gst_plugin_scanner_SOURCES = gst-plugin-scanner.c
+gst_plugin_scanner_CFLAGS = $(GST_OBJ_CFLAGS)
+gst_plugin_scanner_LDFLAGS = $(GST_OBJ_LIBS)
+
+# clean out the old one to make sure everything is udpated correctly
+# remove again after release
+CLEANFILES = plugin-scanner
diff --git a/libs/gst/helpers/plugin-scanner.c b/libs/gst/helpers/gst-plugin-scanner.c
similarity index 95%
rename from libs/gst/helpers/plugin-scanner.c
rename to libs/gst/helpers/gst-plugin-scanner.c
index a80b64b..0310a74 100644
--- a/libs/gst/helpers/plugin-scanner.c
+++ b/libs/gst/helpers/gst-plugin-scanner.c
@@ -1,7 +1,7 @@
/* GStreamer
* Copyright (C) 2008 Jan Schmidt <jan.schmidt at sun.com>
*
- * plugin-scanner.c: tool to load plugins out of process for scanning
+ * gst-plugin-scanner.c: tool to load plugins out of process for scanning
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index ec3acbd..66b36ba 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -10,7 +10,7 @@ REGISTRY_ENVIRONMENT = \
TESTS_ENVIRONMENT = \
STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)" \
$(REGISTRY_ENVIRONMENT) \
- GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/plugin-scanner \
+ GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/gst-plugin-scanner \
GST_PLUGIN_SYSTEM_PATH= \
GST_PLUGIN_PATH=$(top_builddir)/plugins
diff --git a/tests/examples/manual/Makefile.am b/tests/examples/manual/Makefile.am
index 9564c5b..38c639b 100644
--- a/tests/examples/manual/Makefile.am
+++ b/tests/examples/manual/Makefile.am
@@ -21,7 +21,7 @@ REGISTRY_ENVIRONMENT = \
TESTS_ENVIRONMENT = \
$(REGISTRY_ENVIRONMENT) \
- GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/plugin-scanner \
+ GST_PLUGIN_SCANNER=$(top_builddir)/libs/gst/helpers/gst-plugin-scanner \
GST_PLUGIN_SYSTEM_PATH= \
GST_PLUGIN_PATH=$(top_builddir)/plugins
More information about the Gstreamer-commits
mailing list