From: Thomas V. S. <tho...@us...> - 2002-03-05 12:14:36
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Tue Mar 05 2002 04:14:33 PST Log message: this was the wrong way around Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.6&r2=1.7 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- gst-autogen.sh 2 Mar 2002 12:01:32 -0000 1.6 +++ gst-autogen.sh 5 Mar 2002 12:14:21 -0000 1.7 @@ -190,7 +190,7 @@ done for arg do CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $arg"; done - if test -z "$CONFIGURE_EXT_OPT" + if test ! -z "$CONFIGURE_EXT_OPT" then echo "+ options passed to configure: $CONFIGURE_EXT_OPT" fi |
From: Thomas V. S. <tho...@us...> - 2002-04-10 18:32:51
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Wed Apr 10 2002 05:57:54 PDT Log message: added prefix as a fallthrough for autogen.sh to configure by request of jdahlin fixes http://bugzilla.gnome.org/show_bug.cgi?id=78267 (ain't that cool ?) if anyone knows how to coax getopt into passing unrecognized opts on, please share Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.7&r2=1.8 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gst-autogen.sh 5 Mar 2002 12:14:21 -0000 1.7 +++ gst-autogen.sh 10 Apr 2002 12:57:42 -0000 1.8 @@ -136,7 +136,7 @@ autogen_options () { # we use getopt stuff here, copied things from the example example.bash - TEMP=`getopt -o h --long noconfigure,nocheck,debug,help,with-automake:,with-autoconf: \ + TEMP=`getopt -o h --long noconfigure,nocheck,debug,help,with-automake:,with-autoconf:,prefix:\ -- "$@"` eval set -- "$TEMP" @@ -161,12 +161,18 @@ echo "+ debug output enabled" shift ;; + --prefix) + CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$2" + echo "+ passing --prefix=$2 to configure" + shift 2 + ;; -h|--help) echo "autogen.sh (autogen options) -- (configure options)" echo "autogen.sh help options: " - echo " --noconfigure don\'t run the configure script" - echo " --nocheck don\'t do version checks" + echo " --noconfigure don't run the configure script" + echo " --nocheck don't do version checks" echo " --debug debug the autogen process" + echo " --prefix will be passed on to configure" echo echo " --with-autoconf PATH use autoconf in PATH" echo " --with-automake PATH use automake in PATH" |
From: Thomas V. S. <tho...@us...> - 2002-04-16 14:08:02
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Tue Apr 16 2002 07:07:58 PDT Log message: make autoconf check listen to --nocheck Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.8&r2=1.9 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- gst-autogen.sh 10 Apr 2002 12:57:42 -0000 1.8 +++ gst-autogen.sh 16 Apr 2002 14:07:45 -0000 1.9 @@ -110,13 +110,16 @@ { # autoconf 2.52d has a weird issue involving a yes:no error # so don't allow it's use - ac_version=`$autoconf --version|head -n 1|sed 's/^[a-zA-z\.\ ()]*//;s/ .*$//'` - if test "$ac_version" = "2.52d"; then - echo "autoconf 2.52d has an issue with our current build." - echo "We don't know who's to blame however. So until we do, get a" - echo "regular version. RPM's of a working version are on the gstreamer site." - exit 1 - fi + test -z "$NOCHECK" && { + ac_version=`$autoconf --version|head -n 1|sed 's/^[a-zA-z\.\ ()]*//;s/ .*$//'` + if test "$ac_version" = "2.52d"; then + echo "autoconf 2.52d has an issue with our current build." + echo "We don't know who's to blame however. So until we do, get a" + echo "regular version. RPM's of a working version are on the gstreamer site." + exit 1 + fi + } + return 0 } die_check () |
From: Thomas V. S. <tho...@us...> - 2002-04-18 14:12:21
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Thu Apr 18 2002 07:12:18 PDT Log message: adding / to ignore Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.9&r2=1.10 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gst-autogen.sh 16 Apr 2002 14:07:45 -0000 1.9 +++ gst-autogen.sh 18 Apr 2002 14:12:06 -0000 1.10 @@ -61,7 +61,7 @@ return 1 } # the following line is carefully crafted sed magic - pkg_version=`$COMMAND --version|head -n 1|sed 's/^[a-zA-z\.\ ()]*//;s/ .*$//'` + pkg_version=`$COMMAND --version|head -n 1|sed 's/^[a-zA-z\/\.\ ()]*//;s/ .*$//'` debug "pkg_version $pkg_version" # remove any non-digit characters from the version numbers to permit numeric # comparison |
From: Thomas V. S. <tho...@us...> - 2002-04-18 20:35:00
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Thu Apr 18 2002 13:34:55 PDT Log message: fixes to supply of options and actual version extraction Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.10&r2=1.11 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gst-autogen.sh 18 Apr 2002 14:12:06 -0000 1.10 +++ gst-autogen.sh 18 Apr 2002 20:34:43 -0000 1.11 @@ -27,7 +27,7 @@ if test ! -z "$PKG_PATH" then - COMMAND="$PKG_PATH/$PACKAGE" + COMMAND="$PKG_PATH" else COMMAND="$PACKAGE" fi @@ -61,7 +61,8 @@ return 1 } # the following line is carefully crafted sed magic - pkg_version=`$COMMAND --version|head -n 1|sed 's/^[a-zA-z\/\.\ ()]*//;s/ .*$//'` + #pkg_version=`$COMMAND --version|head -n 1|sed 's/^[a-zA-z\.\ ()]*//;s/ .*$//'` + pkg_version=`$COMMAND --version|head -n 1|sed 's/^.*) //'|sed 's/ (.*)//'` debug "pkg_version $pkg_version" # remove any non-digit characters from the version numbers to permit numeric # comparison |
From: Thomas V. S. <tho...@us...> - 2002-04-18 20:47:07
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Thu Apr 18 2002 13:47:05 PDT Log message: and some messy stuff to adapt to aclocal which is easy to break Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.11&r2=1.12 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gst-autogen.sh 18 Apr 2002 20:34:43 -0000 1.11 +++ gst-autogen.sh 18 Apr 2002 20:46:53 -0000 1.12 @@ -107,6 +107,24 @@ fi } +aclocal_check () +{ + # normally aclocal is part of automake + # so we expect it to be in the same place as automake + # so if a different automake is supplied, we need to adapt as well + # so how's about replacing automake with aclocal in the set var, + # and saving that in $aclocal ? + # note, this will fail if the actual automake isn't called automake* + # or if part of the path before it contains it + if [ -z "$automake" ]; then + echo "Error: no automake variable set !" + return 1 + else + aclocal=`echo $automake | sed s/automake/aclocal/` + debug "aclocal: $aclocal" + fi +} + autoconf_2.52d_check () { # autoconf 2.52d has a weird issue involving a yes:no error |
From: Thomas V. S. <tho...@us...> - 2002-04-28 20:05:13
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Sun Apr 28 2002 08:34:02 PDT Log message: a slight hack to create autoregen.sh Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.12&r2=1.13 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- gst-autogen.sh 18 Apr 2002 20:46:53 -0000 1.12 +++ gst-autogen.sh 28 Apr 2002 15:33:50 -0000 1.13 @@ -1,3 +1,8 @@ +# a silly hack that generates autoregen.sh but it's handy +echo "#!/bin/sh" > autoregen.sh +echo "./autogen.sh $@" >> autoregen.sh +chmod +x autoregen.sh + # helper functions for autogen.sh debug () |
From: Thomas V. S. <tho...@us...> - 2002-05-27 14:38:17
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Mon May 27 2002 07:16:34 PDT Log message: helps when not specifying tools Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.16&r2=1.17 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- gst-autogen.sh 27 May 2002 13:32:47 -0000 1.16 +++ gst-autogen.sh 27 May 2002 14:16:22 -0000 1.17 @@ -131,7 +131,7 @@ then CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-aclocal=$aclocal" fi - if [ ! -x $aclocal ]; then + if [ ! -x `which $aclocal` ]; then echo "Error: cannot execute $aclocal !" return 1 fi @@ -152,7 +152,7 @@ then CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-autoheader=$autoheader" fi - if [ ! -x $autoheader ]; then + if [ ! -x `which $autoheader` ]; then echo "Error: cannot execute $autoheader !" return 1 fi |
From: Thomas V. S. <tho...@us...> - 2002-06-27 14:51:51
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Thu Jun 27 2002 07:51:50 PDT Log message: fix for when version check doesn't work well Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.18&r2=1.19 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- gst-autogen.sh 27 May 2002 20:37:16 -0000 1.18 +++ gst-autogen.sh 27 Jun 2002 14:51:37 -0000 1.19 @@ -74,6 +74,7 @@ pkg_major=`echo $pkg_version | cut -d. -f1 | sed s/[a-zA-Z\-].*//g` pkg_minor=`echo $pkg_version | cut -d. -f2 | sed s/[a-zA-Z\-].*//g` pkg_micro=`echo $pkg_version | cut -d. -f3 | sed s/[a-zA-Z\-].*//g` + test -z "$pkg_major" && pkg_major=0 test -z "$pkg_minor" && pkg_minor=0 test -z "$pkg_micro" && pkg_micro=0 |
From: Thomas V. S. <tho...@us...> - 2002-09-30 07:17:02
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Mon Sep 30 2002 00:17:01 PDT Log message: look for preferable autotool versions if the default one is not acceptable Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.20&r2=1.21 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- gst-autogen.sh 27 Aug 2002 17:45:06 -0000 1.20 +++ gst-autogen.sh 30 Sep 2002 07:16:49 -0000 1.21 @@ -20,6 +20,8 @@ # second argument : optional path where to look for it instead # third argument : source download url # rest of arguments : major, minor, micro version +# all consecutive ones : suggestions for binaries to use +# (if not specified in second argument) { PACKAGE=$1 PKG_PATH=$2 @@ -30,12 +32,8 @@ WRONG= - if test ! -z "$PKG_PATH" - then - COMMAND="$PKG_PATH" - else - COMMAND="$PACKAGE" - fi + # for backwards compatibility, we let PKG_PATH=PACKAGE when PKG_PATH null + if test -z "$PKG_PATH"; then PKG_PATH=$PACKAGE; fi debug "major $MAJOR minor $MINOR micro $MICRO" VERSION=$MAJOR if test ! -z "$MINOR"; then VERSION=$VERSION.$MINOR; else MINOR=0; fi @@ -43,74 +41,77 @@ debug "major $MAJOR minor $MINOR micro $MICRO" - test -z "$NOCHECK" && { - echo -n " checking for $1 >= $VERSION" - if test ! -z "$PKG_PATH"; then echo; echo -n " (in $PKG_PATH)"; fi - echo -n "... " - } || { - # we set a var with the same name as the package, but stripped of - # unwanted chars - VAR=`echo $PACKAGE | sed 's/-//g'` - debug "setting $VAR" - eval $VAR="$COMMAND" - return 0 - } + for SUGGESTION in $PKG_PATH; do + COMMAND="$SUGGESTION" - debug "checking version with $COMMAND" - ($COMMAND --version) < /dev/null > /dev/null 2>&1 || - { - echo "not found !" - echo "You must have $PACKAGE installed to compile $package." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at $URL" - return 1 - } - # the following line is carefully crafted sed magic - #pkg_version=`$COMMAND --version|head -n 1|sed 's/^[a-zA-z\.\ ()]*//;s/ .*$//'` - pkg_version=`$COMMAND --version|head -n 1|sed 's/^.*) //'|sed 's/ (.*)//'` - debug "pkg_version $pkg_version" - # remove any non-digit characters from the version numbers to permit numeric - # comparison - pkg_major=`echo $pkg_version | cut -d. -f1 | sed s/[a-zA-Z\-].*//g` - pkg_minor=`echo $pkg_version | cut -d. -f2 | sed s/[a-zA-Z\-].*//g` - pkg_micro=`echo $pkg_version | cut -d. -f3 | sed s/[a-zA-Z\-].*//g` - test -z "$pkg_major" && pkg_major=0 - test -z "$pkg_minor" && pkg_minor=0 - test -z "$pkg_micro" && pkg_micro=0 + # don't check if asked not to + test -z "$NOCHECK" && { + echo -n " checking for $COMMAND >= $VERSION ... " + } || { + # we set a var with the same name as the package, but stripped of + # unwanted chars + VAR=`echo $PACKAGE | sed 's/-//g'` + debug "setting $VAR" + eval $VAR="$COMMAND" + return 0 + } - debug "found major $pkg_major minor $pkg_minor micro $pkg_micro" + debug "checking version with $COMMAND" + ($COMMAND --version) < /dev/null > /dev/null 2>&1 || + { + echo "not found." + continue + } + # the following line is carefully crafted sed magic + # you don't want to mess with it + #pkg_version=`$COMMAND --version|head -n 1|sed 's/^[a-zA-z\.\ ()]*//;s/ .*$//'` + pkg_version=`$COMMAND --version|head -n 1|sed 's/^.*) //'|sed 's/ (.*)//'` + debug "pkg_version $pkg_version" + # remove any non-digit characters from the version numbers to permit numeric + # comparison + pkg_major=`echo $pkg_version | cut -d. -f1 | sed s/[a-zA-Z\-].*//g` + pkg_minor=`echo $pkg_version | cut -d. -f2 | sed s/[a-zA-Z\-].*//g` + pkg_micro=`echo $pkg_version | cut -d. -f3 | sed s/[a-zA-Z\-].*//g` + test -z "$pkg_major" && pkg_major=0 + test -z "$pkg_minor" && pkg_minor=0 + test -z "$pkg_micro" && pkg_micro=0 + debug "found major $pkg_major minor $pkg_minor micro $pkg_micro" - #start checking the version - debug "version check" + #start checking the version + debug "version check" - if [ ! "$pkg_major" -gt "$MAJOR" ]; then - debug "$pkg_major <= $MAJOR" - if [ "$pkg_major" -lt "$MAJOR" ]; then - WRONG=1 - elif [ ! "$pkg_minor" -gt "$MINOR" ]; then - if [ "$pkg_minor" -lt "$MINOR" ]; then + if [ ! "$pkg_major" -gt "$MAJOR" ]; then + debug "$pkg_major <= $MAJOR" + if [ "$pkg_major" -lt "$MAJOR" ]; then WRONG=1 - elif [ "$pkg_micro" -lt "$MICRO" ]; then - WRONG=1 + elif [ ! "$pkg_minor" -gt "$MINOR" ]; then + if [ "$pkg_minor" -lt "$MINOR" ]; then + WRONG=1 + elif [ "$pkg_micro" -lt "$MICRO" ]; then + WRONG=1 + fi fi fi - fi - if test ! -z "$WRONG"; then - echo "found $pkg_version, not ok !" - echo - echo "You must have $PACKAGE $VERSION or greater to compile $package." - echo "Get the latest version from $URL" - echo - return 1 - else - echo "found $pkg_version, ok." - # we set a var with the same name as the package, but stripped of - # unwanted chars - VAR=`echo $PACKAGE | sed 's/-//g'` - debug "setting $VAR" - eval $VAR="$COMMAND" - fi + if test ! -z "$WRONG"; then + echo "found $pkg_version, not ok !" + continue + else + echo "found $pkg_version, ok." + # we set a var with the same name as the package, but stripped of + # unwanted chars + VAR=`echo $PACKAGE | sed 's/-//g'` + debug "setting $VAR" + eval $VAR="$COMMAND" + return 0 + fi + done + + echo "not found !" + echo "You must have $PACKAGE installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at $URL" + return 1; } aclocal_check () |
From: Thomas V. S. <tho...@us...> - 2002-12-11 17:08:29
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Wed Dec 11 2002 09:08:23 PST Log message: non-gnu fix Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.22&r2=1.23 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- gst-autogen.sh 17 Oct 2002 05:39:12 -0000 1.22 +++ gst-autogen.sh 11 Dec 2002 17:08:10 -0000 1.23 @@ -198,7 +198,7 @@ autogen_options () { - if test `getopt --version | cut -d' ' -f2` != "(enhanced)"; then + if test "x`getopt --version | cut -d' ' -f2`" != "x(enhanced)"; then echo "- non-gnu getopt(1) detected, not running getopt on autogen command-line options" return 0 fi |
From: Thomas V. S. <tho...@us...> - 2003-01-14 15:58:57
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Tue Jan 14 2003 07:58:54 PST Log message: closes #98062 Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.23&r2=1.24 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- gst-autogen.sh 11 Dec 2002 17:08:10 -0000 1.23 +++ gst-autogen.sh 14 Jan 2003 15:58:32 -0000 1.24 @@ -198,19 +198,12 @@ autogen_options () { - if test "x`getopt --version | cut -d' ' -f2`" != "x(enhanced)"; then - echo "- non-gnu getopt(1) detected, not running getopt on autogen command-line options" + if test "x$1" == "x"; then return 0 fi - # we use getopt stuff here, copied things from the example example.bash - # prefix is explicitly carried over to configure by request of jdahlin - TEMP=`getopt -o h --long noconfigure,nocheck,debug,help,with-automake:,with-autoconf:,prefix:\ - -- "$@"` - - eval set -- "$TEMP" - - while true ; do + while test "x$1" != "x" ; do + optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` case "$1" in --noconfigure) NOCONFIGURE=defined @@ -230,10 +223,10 @@ echo "+ debug output enabled" shift ;; - --prefix) - CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$2" - echo "+ passing --prefix=$2 to configure" - shift 2 + --prefix=*) + CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$optarg" + echo "+ passing --prefix=$optarg to configure" + shift ;; -h|--help) echo "autogen.sh (autogen options) -- (configure options)" @@ -249,17 +242,17 @@ echo "to pass options to configure, put them as arguments after -- " exit 1 ;; - --with-automake) - AUTOMAKE=$2 - echo "+ using alternate automake in $2" + --with-automake=*) + AUTOMAKE=$optarg + echo "+ using alternate automake in $optarg" CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-automake=$AUTOMAKE" - shift 2 + shift ;; - --with-autoconf) - AUTOCONF=$2 - echo "+ using alternate autoconf in $2" + --with-autoconf=*) + AUTOCONF=$optarg + echo "+ using alternate autoconf in $optarg" CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-autoconf=$AUTOCONF" - shift 2 + shift ;; --) shift ; break ;; *) echo "Internal error !" ; exit 1 ;; |
From: Thomas V. S. <tho...@us...> - 2003-01-18 14:10:45
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Sat Jan 18 2003 06:10:45 PST Log message: don't exit on unknown args Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.24&r2=1.25 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- gst-autogen.sh 14 Jan 2003 15:58:32 -0000 1.24 +++ gst-autogen.sh 18 Jan 2003 14:10:32 -0000 1.25 @@ -255,7 +255,7 @@ shift ;; --) shift ; break ;; - *) echo "Internal error !" ; exit 1 ;; + *) echo "- ignoring unknown autogen.sh arguments; run $0 --help"; shift ;; esac done |
From: Thomas V. S. <tho...@us...> - 2003-01-18 23:48:04
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Sat Jan 18 2003 15:48:03 PST Log message: fix case for prefix blah (without =) Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.25&r2=1.26 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- gst-autogen.sh 18 Jan 2003 14:10:32 -0000 1.25 +++ gst-autogen.sh 18 Jan 2003 23:47:50 -0000 1.26 @@ -228,6 +228,14 @@ echo "+ passing --prefix=$optarg to configure" shift ;; + --prefix) + shift + echo "DEBUG: $1" + CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$1" + echo "+ passing --prefix=$1 to configure" + shift + ;; + -h|--help) echo "autogen.sh (autogen options) -- (configure options)" echo "autogen.sh help options: " @@ -255,7 +263,7 @@ shift ;; --) shift ; break ;; - *) echo "- ignoring unknown autogen.sh arguments; run $0 --help"; shift ;; + *) echo "- ignoring unknown autogen.sh argument $1"; shift ;; esac done |
From: Thomas V. S. <tho...@us...> - 2003-08-06 09:43:10
|
CVS Root: /cvsroot/gstreamer Module: common Changes by: thomasvs Date: Wed Aug 06 2003 02:43:09 PDT Branch: BRANCH-GSTREAMER-0_6 Log message: fix for autogen failure Modified files: . : gst-autogen.sh Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.26&r2=1.26.4.1 ====Begin Diffs==== Index: gst-autogen.sh =================================================================== RCS file: /cvsroot/gstreamer/common/gst-autogen.sh,v retrieving revision 1.26 retrieving revision 1.26.4.1 diff -u -d -r1.26 -r1.26.4.1 --- gst-autogen.sh 18 Jan 2003 23:47:50 -0000 1.26 +++ gst-autogen.sh 6 Aug 2003 09:42:57 -0000 1.26.4.1 @@ -166,7 +166,7 @@ fi } -autoconf_2.52d_check () +autoconf_2_52d_check () { # autoconf 2.52d has a weird issue involving a yes:no error # so don't allow it's use |
From: Thomas V. S. <tho...@pd...> - 2004-01-13 11:28:18
|
CVS Root: /home/cvs/gstreamer Module: common Changes by: thomasvs Date: Tue Jan 13 2004 03:29:26 PST Log message: adding ChangeLog adding gettext.patch to use around autopoint Added files: . : ChangeLog gettext.patch Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/ChangeLog?rev=1.1&content-type=text/vnd.viewcvs-markup http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/gettext.patch?rev=1.1&content-type=text/vnd.viewcvs-markup ====Begin Diffs==== --- NEW FILE: ChangeLog --- 2004-01-13 Thomas Vander Stichele <thomas at apestaart dot org> * gettext.patch: added; used by autogen.sh to make sure GETTEXT_PACKAGE is understood from po/Makefile.in.in -> po/Makefile.in --- NEW FILE: gettext.patch --- --- po/Makefile.in.in.orig 2004-01-09 16:35:54.000000000 +0100 +++ po/Makefile.in.in 2004-01-09 16:36:43.000000000 +0100 @@ -11,6 +11,9 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ +# thomas: add GETTEXT_PACKAGE substitution as used in Makevars +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + SHELL = /bin/sh @SET_MAKE@ |
From: Thomas V. S. <tho...@pd...> - 2004-05-03 13:36:59
|
CVS Root: /home/cvs/gstreamer Module: common Changes by: thomasvs Date: Mon May 03 2004 06:36:57 PDT Log message: po update snippet Modified files: . : ChangeLog Added files: . : po.mak Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/ChangeLog.diff?r1=1.16&r2=1.17 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/po.mak?rev=1.1&content-type=text/vnd.viewcvs-markup ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /home/cvs/gstreamer/common/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- a/ChangeLog 18 Mar 2004 11:03:03 -0000 1.16 +++ b/ChangeLog 3 May 2004 13:36:45 -0000 1.17 @@ -1,3 +1,8 @@ +2004-05-03 Thomas Vander Stichele <thomas at apestaart dot org> + + * po.mak: + snippet for updating .po files 2004-03-18 Thomas Vander Stichele <thomas at apestaart dot org> * Makefile.am: --- NEW FILE: po.mak --- # rule to download .po po / %.po - download: @LI = $ (@: po / %.po - download = %) && cd po && wget - q - O $$LI.po.tmp http: //www.iro.umontreal.ca/translation/maint/$(PACKAGE)/$$LI && if ! diff $$LI.po $$LI.po.tmp > /dev/null 2>&1; then echo "$$LI.po changed, updated"; mv $$LI.po.tmp $$LI.po; else rm $$LI.po.tmp; fi # a rule to redownload po files download - po: for LI in ` cat po / LINGUAS `; do echo Checking $$LI.po; make po / $$LI. po - download; done |
From: Thomas V. S. <tho...@pd...> - 2004-05-03 13:42:32
|
CVS Root: /cvs/gstreamer Module: common Changes by: thomasvs Date: Mon May 03 2004 06:42:28 PDT Log message: sillyfix Modified files: . : po.mak Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/po.mak.diff?r1=1.1&r2=1.2 ====Begin Diffs==== Index: po.mak =================================================================== RCS file: /cvs/gstreamer/common/po.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- a/po.mak 3 May 2004 13:36:45 -0000 1.1 +++ b/po.mak 3 May 2004 13:42:16 -0000 1.2 @@ -1,18 +1,7 @@ # rule to download .po -po / %.po - download: -@LI = $ (@: po / %.po - download = %) && cd po && wget - q - O $$LI.po.tmp http: - //www.iro.umontreal.ca/translation/maint/$(PACKAGE)/$$LI && if ! diff $$LI.po $$LI.po.tmp > /dev/null 2>&1; then echo "$$LI.po changed, updated"; mv $$LI.po.tmp $$LI.po; else rm $$LI.po.tmp; fi - +po/%.po-download: + @LI=$(@:po/%.po-download=%) && cd po && wget -q -O $$LI.po.tmp http://www.iro.umontreal.ca/translation/maint/$(PACKAGE)/$$LI && if ! diff $$LI.po $$LI.po.tmp > /dev/null 2>&1; then echo "$$LI.po changed, updated"; mv $$LI.po.tmp $$LI.po; else rm $$LI.po.tmp; fi + # a rule to redownload po files -download - po: -for LI - in ` cat po / LINGUAS `; -do - echo Checking $$LI.po; - make - po / - $$LI. - po - - download; -done +download-po: + for LI in `cat po/LINGUAS`; do echo Checking $$LI.po; make po/$$LI.po-download; done |
From: <tho...@fr...> - 2004-12-08 09:15:36
|
CVS Root: /cvs/gstreamer Module: common Changes by: thomasvs Date: Wed Dec 08 2004 01:16:26 PST Log message: allow tool_run to run a failure command Modified files: . : ChangeLog gst-autogen.sh Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/ChangeLog.diff?r1=1.25&r2=1.26 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.33&r2=1.34 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/common/ChangeLog,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ChangeLog 3 Sep 2004 17:50:31 -0000 1.25 +++ ChangeLog 8 Dec 2004 09:16:14 -0000 1.26 @@ -1,3 +1,8 @@ +2004-12-08 Thomas Vander Stichele <thomas at apestaart dot org> + + * gst-autogen.sh: + allow failure command to be run so we can clean upfrom autopoint 2004-09-03 Zeeshan Ali Khattak <ze...@gm...> * m4/gst-feature.m4: Trying to correct the GST_CHECK_CONFIGPROG macro Index: gst-autogen.sh RCS file: /cvs/gstreamer/common/gst-autogen.sh,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- gst-autogen.sh 16 Mar 2004 18:00:19 -0000 1.33 +++ gst-autogen.sh 8 Dec 2004 09:16:14 -0000 1.34 @@ -291,10 +291,12 @@ { tool=$1 options=$2 + run_if_fail=$3 echo "+ running $tool $options..." $tool $options || { echo echo $tool failed + eval $run_if_fail exit 1 } } |
From: <tho...@fr...> - 2005-05-17 14:47:57
|
CVS Root: /cvs/gstreamer Module: common Changes by: thomasvs Date: Tue May 17 2005 07:47:55 PDT Log message: * gst-autogen.sh: only update autoregen.sh on actual runs Modified files: . : ChangeLog gst-autogen.sh Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/ChangeLog.diff?r1=1.28&r2=1.29 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/gst-autogen.sh.diff?r1=1.34&r2=1.35 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/common/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- ChangeLog 11 Mar 2005 13:06:25 -0000 1.28 +++ ChangeLog 17 May 2005 14:47:43 -0000 1.29 @@ -1,3 +1,7 @@ +2005-05-17 Thomas Vander Stichele <thomas at apestaart dot org> + + * gst-autogen.sh: only update autoregen.sh on actual runs 2005-03-11 Thomas Vander Stichele <thomas at apestaart dot org> * m4/check.m4: m4 from the check unit test suite Index: gst-autogen.sh RCS file: /cvs/gstreamer/common/gst-autogen.sh,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- gst-autogen.sh 8 Dec 2004 09:16:14 -0000 1.34 +++ gst-autogen.sh 17 May 2005 14:47:43 -0000 1.35 @@ -1,8 +1,3 @@ -# a silly hack that generates autoregen.sh but it's handy -echo "#!/bin/sh" > autoregen.sh -echo "./autogen.sh $@ \$@" >> autoregen.sh -chmod +x autoregen.sh - # helper functions for autogen.sh debug () @@ -270,6 +265,12 @@ esac done + # a silly hack that generates autoregen.sh but it's handy + echo "#!/bin/sh" > autoregen.sh + echo "./autogen.sh $@ \$@" >> autoregen.sh + chmod +x autoregen.sh for arg do CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $arg"; done if test ! -z "$CONFIGURE_EXT_OPT" then |
From: <tho...@fr...> - 2005-07-08 11:20:01
|
CVS Root: /cvs/gstreamer Module: common Changes by: thomasvs Date: Fri Jul 08 2005 04:19:58 PDT Log message: remove hack for LANG now that we require gtk-doc 1.3 Modified files: . : gtk-doc.mak Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/gtk-doc.mak.diff?r1=1.2&r2=1.3 ====Begin Diffs==== Index: gtk-doc.mak =================================================================== RCS file: /cvs/gstreamer/common/gtk-doc.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gtk-doc.mak 7 Jul 2005 16:41:20 -0000 1.2 +++ gtk-doc.mak 8 Jul 2005 11:19:46 -0000 1.3 @@ -118,9 +118,6 @@ #### html #### -# FIXME: setting LANG=C is a hack to work with gtk-doc < 1.1, because -# that forces a non-utf8 locale. gtk-doc >= 1.1 solves this by calling -# use bytes; in gtkdoc-fixxref html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo '*** Building HTML ***' if test -d html; then rm -rf html; fi @@ -136,7 +133,7 @@ test "x$(HTML_IMAGES)" = "x" || for i in "" $(HTML_IMAGES) ; do \ if test "$$i" != ""; then cp $(srcdir)/$$i html ; fi; done @echo '-- Fixing Crossreferences' - LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp else all-local: |
From: <tho...@fr...> - 2005-08-15 14:50:27
|
CVS Root: /cvs/gstreamer Module: common Changes by: thomasvs Date: Mon Aug 15 2005 07:41:30 PDT Log message: order by element name Modified files: . : gst-xmlinspect.py gtk-doc-plugins.mak Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/gst-xmlinspect.py.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/gtk-doc-plugins.mak.diff?r1=1.3&r2=1.4 ====Begin Diffs==== Index: gst-xmlinspect.py =================================================================== RCS file: /cvs/gstreamer/common/gst-xmlinspect.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gst-xmlinspect.py 15 Aug 2005 14:20:19 -0000 1.1 +++ gst-xmlinspect.py 15 Aug 2005 14:41:18 -0000 1.2 @@ -61,16 +61,22 @@ offset = get_offset(indent) return offset + ("\n" + offset).join(block.split("\n")) - def output_plugin(plugin, indent=0): print "PLUGIN", plugin.get_name() version = ".".join([str(i) for i in plugin.get_version()]) - elements = [] + elements = {} for feature in plugin.get_feature_list(): if isinstance(feature, gst.ElementFactory): - elements.append(output_element_factory(feature, indent + 2)) + elements[feature.get_name()] = feature + elementsoutput = [] + keys = elements.keys() + keys.sort() + for name in keys: + feature = elements[name] + elementsoutput.append(output_element_factory(feature, indent + 2)) + filename = plugin.get_filename() basename = filename if basename: @@ -84,7 +90,7 @@ 'license': xmlencode(plugin.get_license()), 'package': xmlencode(plugin.get_package()), 'origin': xmlencode(plugin.get_origin()), - 'elements': "\n".join(elements), + 'elements': "\n".join(elementsoutput), } block = PLUGIN_TEMPLATE % d Index: gtk-doc-plugins.mak RCS file: /cvs/gstreamer/common/gtk-doc-plugins.mak,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gtk-doc-plugins.mak 15 Aug 2005 14:20:19 -0000 1.3 +++ gtk-doc-plugins.mak 15 Aug 2005 14:41:18 -0000 1.4 @@ -22,10 +22,11 @@ $(DOC_OVERRIDES) \ $(DOC_MODULE)-sections.txt +# we don't add inspect-build.stamp here since this is run manually +# by docs maintainers and result is commited to CVS DOC_STAMPS = \ scan-build.stamp \ tmpl-build.stamp \ - inspect-build.stamp \ sgml-build.stamp \ html-build.stamp \ $(srcdir)/tmpl.stamp \ @@ -110,9 +111,12 @@ inspect: mkdir inspect +# FIXME: inspect.timestamp should be written to by gst-xmlinspect.py +# IFF the output changed; see gtkdoc-mktmpl inspect-build.stamp: inspect $(INSPECT_ENVIRONMENT) $(PYTHON) \ $(top_srcdir)/common/gst-xmlinspect.py inspect + echo -n "timestamp" > inspect.stamp touch inspect-build.stamp inspect.stamp: inspect-build.stamp |
From: <tho...@fr...> - 2005-08-15 14:50:28
|
CVS Root: /cvs/gstreamer Module: common Changes by: thomasvs Date: Mon Aug 15 2005 07:20:31 PDT Log message: adding support files for plugins documentation Modified files: . : ChangeLog gtk-doc-plugins.mak Added files: . : gst-xmlinspect.py plugins.xsl Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/ChangeLog.diff?r1=1.36&r2=1.37 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/gst-xmlinspect.py?rev=1.1&content-type=text/vnd.viewcvs-markup http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/gtk-doc-plugins.mak.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/plugins.xsl?rev=1.1&content-type=text/vnd.viewcvs-markup ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/common/ChangeLog,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- ChangeLog 20 Jul 2005 16:23:01 -0000 1.36 +++ ChangeLog 15 Aug 2005 14:20:19 -0000 1.37 @@ -1,3 +1,13 @@ +2005-08-15 Thomas Vander Stichele <thomas at apestaart dot org> + + * gst-xmlinspect.py: + a first stab at inspecting plugins and outputting an xml description + * gtk-doc-plugins.mak: + a gtk-doc using snippet for plugins documentation + * plugins.xsl: + a stylesheet to convert gst-xmlinspect.py output to docbook output + for inclusion in the gtk-doc stuff 2005-07-20 Ronald S. Bultje <rb...@ro...> * m4/gst-doc.m4: --- NEW FILE: gst-xmlinspect.py --- # -*- Mode: Python -*- # vi:si:et:sw=4:sts=4:ts=4 """ examine all plugins and elements and output xml documentation for them used as part of the plugin documentation build import sys import os import gst INDENT_SIZE = 2 # all templates ELEMENT_TEMPLATE = """<element> <name>%(name)s</name> <longname>%(longname)s</longname> <class>%(class)s</class> <description>%(description)s</description> <author>%(author)s</author> </element>""" PLUGIN_TEMPLATE = """<plugin> <filename>%(filename)s</filename> <basename>%(basename)s</basename> <version>%(version)s</version> <license>%(license)s</license> <package>%(package)s</package> <origin>%(origin)s</origin> <elements> %(elements)s </elements> </plugin>""" def xmlencode(line): """ Replace &, <, and > line = "&".join(line.split("&")) line = "<".join(line.split("<")) line = ">".join(line.split(">")) return line def get_offset(indent): return " " * INDENT_SIZE * indent def output_element_factory(elf, indent=0): print "ELEMENT", elf.get_name() d = { 'name': xmlencode(elf.get_name()), 'longname': xmlencode(elf.get_longname()), 'class': xmlencode(elf.get_klass()), 'description': xmlencode(elf.get_description()), 'author': xmlencode(elf.get_author()), } block = ELEMENT_TEMPLATE % d offset = get_offset(indent) return offset + ("\n" + offset).join(block.split("\n")) def output_plugin(plugin, indent=0): print "PLUGIN", plugin.get_name() version = ".".join([str(i) for i in plugin.get_version()]) elements = [] for feature in plugin.get_feature_list(): if isinstance(feature, gst.ElementFactory): elements.append(output_element_factory(feature, indent + 2)) filename = plugin.get_filename() basename = filename if basename: basename = os.path.basename(basename) 'name': xmlencode(plugin.get_name()), 'description': xmlencode(plugin.get_description()), 'filename': filename, 'basename': basename, 'version': version, 'license': xmlencode(plugin.get_license()), 'package': xmlencode(plugin.get_package()), 'origin': xmlencode(plugin.get_origin()), 'elements': "\n".join(elements), block = PLUGIN_TEMPLATE % d def main(): if sys.argv[1]: os.chdir(sys.argv[1]) all = gst.registry_pool_plugin_list() for plugin in all: filename = "plugin-%s.xml" % plugin.get_name() handle = open(filename, "w") handle.write(output_plugin(plugin)) handle.close() main() Index: gtk-doc-plugins.mak RCS file: /cvs/gstreamer/common/gtk-doc-plugins.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gtk-doc-plugins.mak 5 Aug 2005 18:51:28 -0000 1.2 +++ gtk-doc-plugins.mak 15 Aug 2005 14:20:19 -0000 1.3 @@ -25,6 +25,7 @@ DOC_STAMPS = \ scan-build.stamp \ tmpl-build.stamp \ + inspect-build.stamp \ sgml-build.stamp \ html-build.stamp \ $(srcdir)/tmpl.stamp \ @@ -93,11 +94,39 @@ tmpl.stamp: tmpl-build.stamp @true +#### inspect stuff #### +# this is stuff that should be built/updated manually by people that work +# on docs +# only look at the plugins in this module when building inspect .xml stuff +INSPECT_REGISTRY=$(top_builddir)/docs/plugins/inspect-registry.xml +INSPECT_ENVIRONMENT=\ + GST_PLUGIN_PATH_ONLY=yes \ + GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext \ + GST_REGISTRY=$(INSPECT_REGISTRY) +# update the element and plugin XML descriptions; store in inspect/ +inspect: + mkdir inspect +inspect-build.stamp: inspect + $(INSPECT_ENVIRONMENT) $(PYTHON) \ + $(top_srcdir)/common/gst-xmlinspect.py inspect + touch inspect-build.stamp +inspect.stamp: inspect-build.stamp + @true #### xml #### ### FIXME: make this error out again when docs are fixed for 0.9 -sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) +# first convert inspect/*.xml to xml +sgml-build.stamp: tmpl.stamp inspect.stamp $(CFILE_GLOB) @echo '*** Building XML ***' + @-mkdir -p xml + @for a in inspect/*.xml; do \ + xsltproc $(top_srcdir)/common/plugins.xsl $$a > xml/`basename $$a`; done gtkdoc-mkdb \ --module=$(DOC_MODULE) \ --source-dir=$(DOC_SOURCE_DIR) \ --- NEW FILE: plugins.xsl --- <?xml version='1.0'?> <!--*- mode: xml -*--> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" extension-element-prefixes="exsl" version="1.0"> <xsl:output method="xml" indent="yes" doctype-public ="-//OASIS//DTD DocBook XML V4.1.2//EN" doctype-system = "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"/> <xsl:template match="element"> <xsl:element name="varlistentry"> <xsl:element name="term"> <xsl:element name="link"> <xsl:attribute name="linkend">gst-plugins-base-plugins-<xsl:value-of select="name"/></xsl:attribute> <xsl:value-of select="name" /> </xsl:element> </xsl:element> <xsl:element name="listitem"> <xsl:element name="simpara"><xsl:value-of select="description" /></xsl:element> </xsl:element> <xsl:variable name="name"><xsl:copy-of select="name"/></xsl:variable> <!-- here we write an element-(name)-details.xml file for the element --> <exsl:document href="{concat ('xml/element-', $name, '-details.xml')}" method="xml" indent="yes"> <xsl:element name="variablelist"> <xsl:element name="varlistentry"> <xsl:element name="term">author</xsl:element> <xsl:element name="listitem"> <xsl:element name="simpara"><xsl:value-of select="author" /></xsl:element> </xsl:element> </exsl:document> </xsl:template> <xsl:template match="plugin"> <xsl:element name="refentry"> <xsl:attribute name="id">gst-plugins-base-plugins-plugin-<xsl:value-of select="name"/></xsl:attribute> <xsl:element name="refmeta"> <xsl:element name="refentrytitle"> <xsl:value-of select="name"/> <xsl:element name="manvolnum">3</xsl:element> <xsl:element name="refmiscinfo">FIXME Library</xsl:element> </xsl:element> <!-- refmeta --> <xsl:element name="refnamediv"> <xsl:element name="refname"> <xsl:element name="anchor"> <xsl:attribute name="id">plugin-<xsl:value-of select="name"/></xsl:attribute> <xsl:value-of select="name"/> <xsl:element name="refpurpose"> <xsl:value-of select="description"/> <xsl:element name="refsect1"> <xsl:element name="title">Plugin Information</xsl:element> <xsl:element name="variablelist"> <xsl:element name="varlistentry"> <xsl:element name="term">filename</xsl:element> <xsl:element name="listitem"> <xsl:element name="simpara"><xsl:value-of select="basename" /></xsl:element> </xsl:element> <xsl:element name="title">Elements</xsl:element> <!-- process all elements --> <xsl:apply-templates select="elements"/> <!-- ignore --> <xsl:template match="gst-plugin-paths" /> </xsl:stylesheet> |
From: <tho...@fr...> - 2005-08-15 16:15:37
|
CVS Root: /cvs/gstreamer Module: common Changes by: thomasvs Date: Mon Aug 15 2005 09:14:57 PDT Log message: adding a script to mangle tmpl/*.sgml and insert short/long descs for elements Modified files: . : Makefile.am gtk-doc-plugins.mak Added files: . : mangle-tmpl.py Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/Makefile.am.diff?r1=1.5&r2=1.6 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/gtk-doc-plugins.mak.diff?r1=1.4&r2=1.5 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/mangle-tmpl.py?rev=1.1&content-type=text/vnd.viewcvs-markup ====Begin Diffs==== Index: Makefile.am =================================================================== RCS file: /cvs/gstreamer/common/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.am 5 Aug 2005 17:12:58 -0000 1.5 +++ Makefile.am 15 Aug 2005 16:14:38 -0000 1.6 @@ -1,3 +1,9 @@ SUBDIRS = m4 -EXTRA_DIST = ChangeLog gettext.patch glib-gen.mak gtk-doc.mak release.mak gst-autogen.sh gstdoc-scangobj +EXTRA_DIST = \ + ChangeLog \ + gettext.patch \ + glib-gen.mak gtk-doc.mak release.mak \ + gst-autogen.sh \ + gst-xmlinspect.py mangle-tmpl.py gtk-doc-plugins.mak \ + plugins.xsl gstdoc-scangobj Index: gtk-doc-plugins.mak RCS file: /cvs/gstreamer/common/gtk-doc-plugins.mak,v retrieving revision 1.4 diff -u -d -r1.4 -r1.5 --- gtk-doc-plugins.mak 15 Aug 2005 14:41:18 -0000 1.4 +++ gtk-doc-plugins.mak 15 Aug 2005 16:14:38 -0000 1.5 @@ -116,6 +116,8 @@ inspect-build.stamp: inspect $(INSPECT_ENVIRONMENT) $(PYTHON) \ $(top_srcdir)/common/gst-xmlinspect.py inspect + $(INSPECT_ENVIRONMENT) $(PYTHON) \ + $(top_srcdir)/common/mangle-tmpl.py tmpl echo -n "timestamp" > inspect.stamp touch inspect-build.stamp --- NEW FILE: mangle-tmpl.py --- # -*- Mode: Python -*- # vi:si:et:sw=4:sts=4:ts=4 """ use the output from gst-xmlinspect.py to mangle tmpl/*.sgml and insert/overwrite Short Description and Long Description import glob import re import sys import os import gst class Tmpl: def __init__(self, filename): self.filename = filename self._sectionids = [] self._sections = {} def read(self): """ Read and parse the sections from the given file. lines = open(self.filename).readlines() matcher = re.compile("<!-- ##### SECTION (\S+) ##### -->\n") id = None for line in lines: match = matcher.search(line) if match: id = match.expand("\\1") self._sectionids.append(id) self._sections[id] = [] else: if not id: sys.stderr.write( "WARNING: line before a SECTION header: %s" % line) else: self._sections[id].append(line) def set_section(self, id, content): Replace the given section id with the given content. self._sections[id] = content def output(self): Return the output of the current template in the tmpl/*.sgml format. lines = [] for id in self._sectionids: lines.append("<!-- ##### SECTION %s ##### -->\n" % id) for line in self._sections[id]: lines.append(line) return "".join(lines) def write(self): Write out the template file again, backing up the previous one. target = self.filename + ".mangle.bak" os.rename(self.filename, target) handle = open(self.filename, "w") handle.write(self.output()) handle.close() def main(): if len(sys.argv) > 1 and sys.argv[1]: os.chdir(sys.argv[1]) elements = {} all = gst.registry_pool_plugin_list() for plugin in all: for feature in plugin.get_feature_list(): if isinstance(feature, gst.ElementFactory): elements[feature.get_name()] = feature for file in glob.glob("element-*.sgml"): base = os.path.basename(file) element = base[len("element-"):-len(".sgml")] tmpl = Tmpl(file) tmpl.read() if element in elements.keys(): feature = elements[element] description = feature.get_description() tmpl.set_section("Short_Description", "%s\n\n" % description) tmpl.set_section("Long_Description", '<include xmlns="http://www.w3.org/2003/XInclude" href="element-' + element + '-details.xml" />\n<para>\n\n</para>\n') tmpl.write() main() |
From: <tho...@fr...> - 2005-08-15 16:54:35
|
CVS Root: /cvs/gstreamer Module: common Changes by: thomasvs Date: Mon Aug 15 2005 09:50:38 PDT Log message: * mangle-tmpl.py: keep original Long_Description; only insert an include if it's not already the first line in there * plugins.xsl: output more information for plugins, including an origin hyperlink Modified files: . : ChangeLog mangle-tmpl.py plugins.xsl Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/ChangeLog.diff?r1=1.37&r2=1.38 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/mangle-tmpl.py.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/plugins.xsl.diff?r1=1.2&r2=1.3 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/common/ChangeLog,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- ChangeLog 15 Aug 2005 14:20:19 -0000 1.37 +++ ChangeLog 15 Aug 2005 16:50:25 -0000 1.38 @@ -1,5 +1,13 @@ 2005-08-15 Thomas Vander Stichele <thomas at apestaart dot org> + * mangle-tmpl.py: + keep original Long_Description; only insert an include if it's + not already the first line in there + * plugins.xsl: + output more information for plugins, including an origin hyperlink + +2005-08-15 Thomas Vander Stichele <thomas at apestaart dot org> * gst-xmlinspect.py: a first stab at inspecting plugins and outputting an xml description * gtk-doc-plugins.mak: Index: mangle-tmpl.py RCS file: /cvs/gstreamer/common/mangle-tmpl.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mangle-tmpl.py 15 Aug 2005 16:14:38 -0000 1.1 +++ mangle-tmpl.py 15 Aug 2005 16:50:25 -0000 1.2 @@ -39,6 +39,12 @@ else: self._sections[id].append(line) + def get_section(self, id): + """ + Get the content from the given section. + return self._sections[id] def set_section(self, id, content): """ Replace the given section id with the given content. @@ -88,9 +94,14 @@ feature = elements[element] description = feature.get_description() tmpl.set_section("Short_Description", "%s\n\n" % description) - tmpl.set_section("Long_Description", - '<include xmlns="http://www.w3.org/2003/XInclude" href="element-' + - element + '-details.xml" />\n<para>\n\n</para>\n') + # put in an include if not yet there + line = '<include xmlns="http://www.w3.org/2003/XInclude" href="' + \ + 'element-' + element + '-details.xml" />\n' + section = tmpl.get_section("Long_Description") + if not section[0] == line: + section.insert(0, line) + tmpl.set_section("Long_Description", section) tmpl.write() main() Index: plugins.xsl RCS file: /cvs/gstreamer/common/plugins.xsl,v retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- plugins.xsl 15 Aug 2005 16:31:22 -0000 1.2 +++ plugins.xsl 15 Aug 2005 16:50:25 -0000 1.3 @@ -85,12 +85,47 @@ <xsl:element name="refsect1"> <xsl:element name="title">Plugin Information</xsl:element> <xsl:element name="variablelist"> <xsl:element name="varlistentry"> <xsl:element name="term">filename</xsl:element> <xsl:element name="listitem"> <xsl:element name="simpara"><xsl:value-of select="basename" /></xsl:element> </xsl:element> </xsl:element> + <xsl:element name="varlistentry"> + <xsl:element name="term">version</xsl:element> + <xsl:element name="listitem"> + <xsl:element name="simpara"><xsl:value-of select="version" /></xsl:element> + </xsl:element> + </xsl:element> + <xsl:element name="term">run-time license</xsl:element> + <xsl:element name="simpara"><xsl:value-of select="license" /></xsl:element> + <xsl:element name="term">package</xsl:element> + <xsl:element name="simpara"><xsl:value-of select="package" /></xsl:element> + <xsl:element name="term">origin</xsl:element> + <xsl:element name="simpara"> + <xsl:element name="ulink"> + <xsl:attribute name="url"><xsl:value-of select="origin" /></xsl:attribute> + <xsl:value-of select="origin" /> + </xsl:element> + </xsl:element> </xsl:element> </xsl:element> |