diff options
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 6 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | PLUGINS/src/hello/Makefile | 4 | ||||
| -rw-r--r-- | PLUGINS/src/osddemo/Makefile | 4 | ||||
| -rw-r--r-- | PLUGINS/src/servicedemo/Makefile | 4 | ||||
| -rw-r--r-- | PLUGINS/src/skincurses/Makefile | 4 | ||||
| -rw-r--r-- | PLUGINS/src/sky/Makefile | 4 | ||||
| -rw-r--r-- | PLUGINS/src/status/Makefile | 4 | ||||
| -rw-r--r-- | PLUGINS/src/svdrpdemo/Makefile | 4 | ||||
| -rwxr-xr-x | newplugin | 4 |
11 files changed, 27 insertions, 20 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d504d381..272b280c 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -614,6 +614,8 @@ Oliver Endriss <o.endriss@gmx.de> display in the ST:TNG skin's channel display for suggesting to make CharArray::DataOwnData::assign() in 'libsi' more robust against invalid data + for reporting a problem in extracting APIVERSION with older versions of 'sed' + for fixing broken APIVERSION extraction line in 'newplugin' Reinhard Walter Buchner <rw.buchner@freenet.de> for adding some satellites to 'sources.conf' @@ -1412,6 +1414,7 @@ Udo Richter <udo_richter@gmx.de> --help or --version option for suggesting to add a warning about plugins that don't honor APIVERSION in their Makefile + for providing a shorter version of the 'sed' expression for extracting APIVERSION Sven Kreiensen <svenk@kammer.uni-hannover.de> for his help in keeping 'channels.conf.terr' up to date @@ -4580,7 +4580,7 @@ Video Disk Recorder Revision History +### The version number of VDR's plugin API (taken from VDR's "config.h"): -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') - +APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') + +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) ### The name of the distribution archive: @@ -4652,3 +4652,7 @@ Video Disk Recorder Revision History 2006-04-24: Version 1.4.0 - Fixed initializing 'noapiv' in the Makefile (reported by Ronny Kornexl). +- Fixed extracting APIVERSION to work with older versions of 'sed' (reported by + Oliver Endriss; thanks also to Udo Richter for a shorter version of the 'sed' + expression). +- Fixed broken APIVERSION extraction line in 'newplugin' (thanks to Oliver Endriss). @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 1.90 2006/04/24 17:06:48 kls Exp $ +# $Id: Makefile 1.91 2006/04/24 17:18:06 kls Exp $ .DELETE_ON_ERROR: @@ -81,8 +81,8 @@ DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\" # The version numbers of VDR and the plugin API (taken from VDR's "config.h"): -VDRVERSION = $(shell sed -ne '/define VDRVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' config.h) -APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' config.h) +VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) ifdef VFAT # for people who want their video directory on a VFAT partition diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile index 2106cbf3..cefc3331 100644 --- a/PLUGINS/src/hello/Makefile +++ b/PLUGINS/src/hello/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.13 2006/04/22 09:59:44 kls Exp $ +# $Id: Makefile 1.14 2006/04/24 17:20:58 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -30,7 +30,7 @@ TMPDIR = /tmp ### The version number of VDR's plugin API (taken from VDR's "config.h"): -APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) ### The name of the distribution archive: diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile index 51317afc..f0b13063 100644 --- a/PLUGINS/src/osddemo/Makefile +++ b/PLUGINS/src/osddemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.7 2006/04/22 09:59:49 kls Exp $ +# $Id: Makefile 1.8 2006/04/24 17:21:00 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -30,7 +30,7 @@ TMPDIR = /tmp ### The version number of VDR's plugin API (taken from VDR's "config.h"): -APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) ### The name of the distribution archive: diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile index 31e57a89..08e83c31 100644 --- a/PLUGINS/src/servicedemo/Makefile +++ b/PLUGINS/src/servicedemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.5 2006/04/22 09:59:55 kls Exp $ +# $Id: Makefile 1.6 2006/04/24 17:21:01 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -31,7 +31,7 @@ TMPDIR = /tmp ### The version number of VDR's plugin API (taken from VDR's "config.h"): -APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) ### The name of the distribution archive: diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile index ebb045f1..05c5e053 100644 --- a/PLUGINS/src/skincurses/Makefile +++ b/PLUGINS/src/skincurses/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.5 2006/04/22 10:00:03 kls Exp $ +# $Id: Makefile 1.6 2006/04/24 17:21:02 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -30,7 +30,7 @@ TMPDIR = /tmp ### The version number of VDR's plugin API (taken from VDR's "config.h"): -APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) ### The name of the distribution archive: diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile index 2fad8b5f..6b43441c 100644 --- a/PLUGINS/src/sky/Makefile +++ b/PLUGINS/src/sky/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.7 2006/04/22 10:00:17 kls Exp $ +# $Id: Makefile 1.8 2006/04/24 17:21:03 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -30,7 +30,7 @@ TMPDIR = /tmp ### The version number of VDR's plugin API (taken from VDR's "config.h"): -APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) ### The name of the distribution archive: diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile index 21f88171..8cca7596 100644 --- a/PLUGINS/src/status/Makefile +++ b/PLUGINS/src/status/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.11 2006/04/22 10:00:24 kls Exp $ +# $Id: Makefile 1.12 2006/04/24 17:21:04 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -30,7 +30,7 @@ TMPDIR = /tmp ### The version number of VDR's plugin API (taken from VDR's "config.h"): -APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) ### The name of the distribution archive: diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile index d9fd8349..a191d513 100644 --- a/PLUGINS/src/svdrpdemo/Makefile +++ b/PLUGINS/src/svdrpdemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.5 2006/04/22 10:00:32 kls Exp $ +# $Id: Makefile 1.6 2006/04/24 17:21:06 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -30,7 +30,7 @@ TMPDIR = /tmp ### The version number of VDR's plugin API (taken from VDR's "config.h"): -APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) ### The name of the distribution archive: @@ -12,7 +12,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: newplugin 1.27 2006/04/22 10:04:10 kls Exp $ +# $Id: newplugin 1.28 2006/04/24 17:18:41 kls Exp $ $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n"; @@ -85,7 +85,7 @@ TMPDIR = /tmp ### The version number of VDR's plugin API (taken from VDR's "config.h"): -APIVERSION = \$(shell sed -ne '/define VDRVERSION/ { s/^.*"\(.*\)".*\$\$/\\1/; p }' \$(VDRDIR)/config.h) +APIVERSION = \$(shell sed -ne '/define APIVERSION/s/^.*"\\(.*\\)".*\$\$/\\1/p' \$(VDRDIR)/config.h) ### The name of the distribution archive: |