1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed extracting APIVERSION to work with older versions of 'sed'; Fixed broken APIVERSION extraction line in 'newplugin'

This commit is contained in:
Klaus Schmidinger 2006-04-24 17:53:19 +02:00
parent c4d90dff6b
commit bf4f8e0da3
11 changed files with 27 additions and 20 deletions

View File

@ -614,6 +614,8 @@ Oliver Endriss <o.endriss@gmx.de>
display in the ST:TNG skin's channel display display in the ST:TNG skin's channel display
for suggesting to make CharArray::DataOwnData::assign() in 'libsi' more robust for suggesting to make CharArray::DataOwnData::assign() in 'libsi' more robust
against invalid data 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> Reinhard Walter Buchner <rw.buchner@freenet.de>
for adding some satellites to 'sources.conf' for adding some satellites to 'sources.conf'
@ -1412,6 +1414,7 @@ Udo Richter <udo_richter@gmx.de>
--help or --version option --help or --version option
for suggesting to add a warning about plugins that don't honor APIVERSION in their for suggesting to add a warning about plugins that don't honor APIVERSION in their
Makefile Makefile
for providing a shorter version of the 'sed' expression for extracting APIVERSION
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date

View File

@ -4580,7 +4580,7 @@ Video Disk Recorder Revision History
+### The version number of VDR's plugin API (taken from VDR's "config.h"): +### 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') -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: ### The name of the distribution archive:
@ -4652,3 +4652,7 @@ Video Disk Recorder Revision History
2006-04-24: Version 1.4.0 2006-04-24: Version 1.4.0
- Fixed initializing 'noapiv' in the Makefile (reported by Ronny Kornexl). - 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).

View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # 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: .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"): # 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) VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' config.h) APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
ifdef VFAT ifdef VFAT
# for people who want their video directory on a VFAT partition # for people who want their video directory on a VFAT partition

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the 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"): ### 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: ### The name of the distribution archive:

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the 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"): ### 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: ### The name of the distribution archive:

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the 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"): ### 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: ### The name of the distribution archive:

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the 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"): ### 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: ### The name of the distribution archive:

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the 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"): ### 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: ### The name of the distribution archive:

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the 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"): ### 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: ### The name of the distribution archive:

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the 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"): ### 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: ### The name of the distribution archive:

View File

@ -12,7 +12,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # 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"; $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"): ### 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: ### The name of the distribution archive: