[gst-cvs] wingo gst-python: gst-python/

[<wi...@fr...>]

CVS Root:       /cvs/gstreamer
Module:         gst-python
Changes by:     wingo
Date:           Tue Jul 12 2005  07:00:15 PDT

Log message:
2005-07-12  Andy Wingo  <wi...@po...>
	* configure.ac (AC_CONFIG_FILES): The makefile handles pygst.py
	now.
	* Makefile.am (install-data-local): Actually install pygst.pth to
	the pythondir, not pyexecdir. Also install a properly sedded
	pygst.py.
	(pygst.py): Sed the builddir into pygst.py, and set not writable
	(to avoid any confusion about which file to edit).
	* pygst.py.in (_pygst_dir): Set _pygst_dir from one variable,
	@PYGSTDIR@, which is manually sedded in from the Makefile, so that
	it works both installed and uninstalled.

Modified files:
    .               : ChangeLog Makefile.am configure.ac pygst.py.in

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/ChangeLog.diff?r1=1.175&r2=1.176
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/Makefile.am.diff?r1=1.24&r2=1.25
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/configure.ac.diff?r1=1.66&r2=1.67
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/pygst.py.in.diff?r1=1.1&r2=1.2

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-python/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- ChangeLog	12 Jul 2005 13:27:31 -0000	1.175
+++ ChangeLog	12 Jul 2005 14:00:03 -0000	1.176
@@ -1,5 +1,18 @@
 2005-07-12  Andy Wingo  <wi...@po...>
 
+	* configure.ac (AC_CONFIG_FILES): The makefile handles pygst.py
+	now.
+	
+	* Makefile.am (install-data-local): Actually install pygst.pth to
+	the pythondir, not pyexecdir. Also install a properly sedded
+	pygst.py.
+	(pygst.py): Sed the builddir into pygst.py, and set not writable
+	(to avoid any confusion about which file to edit).
+
+	* pygst.py.in (_pygst_dir): Set _pygst_dir from one variable,
+	@PYGSTDIR@, which is manually sedded in from the Makefile, so that
+	it works both installed and uninstalled.
 	* configure.ac (AC_CONFIG_FILES):
 	* examples/: Moved all examples up from examples/gst/ into
 	examples/.
Index: Makefile.am
RCS file: /cvs/gstreamer/gst-python/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile.am	1 Jul 2005 10:47:24 -0000	1.24
+++ Makefile.am	12 Jul 2005 14:00:03 -0000	1.25
@@ -19,15 +19,25 @@
 include $(top_srcdir)/common/release.mak
-# install pth file.
-install-data-local:
+pygst.py: pygst.py.in Makefile
+	if test -f $@; then chmod +w $@; fi
+	sed -e "s|@PYGSTDIR\@|$(shell pwd)|g" \
+	    -e "s|@GST_MAJORMINOR\@|$(GST_MAJORMINOR)|g" \
+	    $< > $@
+	chmod -w $@
+all-local: pygst.py
+# rewrite pygst path in installed pygst.py, install pth file.
+install-data-local: Makefile
 	$(mkinstalldirs) $(DESTDIR)$(pythondir)
-	echo "gst-$(GST_MAJORMINOR)" > $(DESTDIR)$(pyexecdir)/pygst.pth
+	sed -e "s|@PYGSTDIR\@|$(PYTHONDIR)/$(GST_MAJORMINOR)|g" \
+	    $(srcdir)/pygst.py.in > $(DESTDIR)$(pythondir)/pygst.py
+	chmod 644 $(DESTDIR)$(pyexecdir)/pygst.py
+	echo "gst-$(GST_MAJORMINOR)" > $(DESTDIR)$(pythondir)/pygst.pth
+# also install pth file in pyexec.
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)$(pyexecdir)
 	echo "gst-$(GST_MAJORMINOR)" > $(DESTDIR)$(pyexecdir)/pygst.pth
-uninstall-local:
-	rm -f $(DESTDIR)$(pythondir)/pygst.pth $(DESTDIR)$(pyexecdir)/pygst.pth
-
-# this file is common to all pygtk versions.
-pyexec_PYTHON = pygst.py
Index: configure.ac
RCS file: /cvs/gstreamer/gst-python/configure.ac,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- configure.ac	12 Jul 2005 13:27:31 -0000	1.66
+++ configure.ac	12 Jul 2005 14:00:03 -0000	1.67
@@ -173,5 +173,4 @@
   docs/gst-python.ent
   testsuite/Makefile
   gst-python.spec
-  pygst.py
 ])
Index: pygst.py.in
RCS file: /cvs/gstreamer/gst-python/pygst.py.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pygst.py.in	1 Jul 2005 10:47:24 -0000	1.1
+++ pygst.py.in	12 Jul 2005 14:00:03 -0000	1.2
@@ -31,7 +31,7 @@
 __all__ = ['require']
-_pygst_dir = '@PYTHONDIR@/gst-@GST_MAJORMINOR@'
+_pygst_dir = '@PYGSTDIR@'
 _pygst_version = '@GST_MAJORMINOR@'