Plugin packages now expand into a dir with only the name and version number

6 files changed, 24 insertions, 12 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 78d3d184..eb86b300 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -134,6 +134,8 @@ Stefan Huelswitt <huels@iname.com>
  indicates if the plugin will not be able to perform its task
  for suggesting to add the cPlugin::Housekeeping() function
  for suggesting to add 'insert' capabilities to cList
+ for suggesting to make 'package' target in the plugin's Makefile produce a package that
+ expands to a directory with just the plugin name and version number
 
 Ulrich Röder <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
diff --git a/HISTORY b/HISTORY
index a1cf5d66..57c322a8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1277,3 +1277,6 @@ Video Disk Recorder Revision History
 - Added the cPlugin::Housekeeping() function (suggested by Stefan Huelswitt).
 - Updated channels.conf.cable (thanks to Uwe Scheffler).
 - Added 'insert' capabilities to cList (suggested by Stefan Huelswitt).
+- Changed the 'package' target in the plugin's Makefile to produce a package that
+  expands to a directory with just the plugin name and version number (suggested
+  by Stefan Huelswitt).
diff --git a/PLUGINS.html b/PLUGINS.html
index 3ecad7e5..de1a2ae9 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -117,21 +117,25 @@ from the web, it will typically have a name like
 <p>
 and will unpack into a directory named
 <p>
-<tt>vdr-hello-0.0.1</tt>
+<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
+<tt>hello-0.0.1</tt>
+<!--X1.1.2--></td></tr></table>
 <p>
 To use the <tt>plugins</tt> and <tt>plugins-clean</tt> targets from the VDR <tt>Makefile</tt>
 you need to unpack such an archive into the <tt>VDR/PLUGINS/src</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
+<!--X1.1.2--><table width=100%><tr><td bgcolor=red>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-ln -s vdr-hello-0.0.1 hello
+ln -s hello-0.0.1 hello
 </pre></td></tr></table><p>
 
 Since the VDR <tt>Makefile</tt> only searches for directories with names consisting
 of only lowercase characters and digits, it will only follow the symbolic links, which
 should lead to the current version of the plugin you want to use. This way you can
-have several different versions of a plugin source (like <tt>vdr-hello-0.0.1</tt> and
-<tt>vdr-hello-0.0.2</tt>) and define which one to actually use through the symbolic link.
+have several different versions of a plugin source (like <tt>hello-0.0.1</tt> and
+<tt>hello-0.0.2</tt>) and define which one to actually use through the symbolic link.
+<!--X1.1.2--></td></tr></table>
 
 <a name="Initializing a new plugin directory"><hr><h2>Initializing a new plugin directory</h2>
 
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 31b668e8..4df316fd 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -13,3 +13,4 @@ VDR Plugin 'hello' Revision History
 
 - Changed return type of cPluginHello::Start().
 - Added cPluginHello::Housekeeping().
+- Modified package generation.
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index fb764cdc..fbd74508 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.1 2002/05/09 15:17:44 kls Exp $
+# $Id: Makefile 1.2 2002/05/12 15:09:07 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -27,7 +27,8 @@ VDRVERSION = `grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }'
 
 ### The name of the distribution archive:
 
-ARCHIVE = vdr-$(PLUGIN)-$(VERSION)
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
@@ -70,9 +71,9 @@ package: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(ARCHIVE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution archive created as $(ARCHIVE).tgz
+	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/newplugin b/newplugin
index 8254f3a2..a30961b6 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.3 2002/05/12 10:14:47 kls Exp $
+# $Id: newplugin 1.4 2002/05/12 15:02:13 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -82,7 +82,8 @@ VDRVERSION = `grep 'define VDRVERSION ' \$(VDRDIR)/config.h | awk '{ print \$\$3
 
 ### The name of the distribution archive:
 
-ARCHIVE = vdr-\$(PLUGIN)-\$(VERSION)
+ARCHIVE = \$(PLUGIN)-\$(VERSION)
+PACKAGE = vdr-\$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
@@ -125,9 +126,9 @@ package: clean
 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
 	\@mkdir \$(TMPDIR)/\$(ARCHIVE)
 	\@cp -a * \$(TMPDIR)/\$(ARCHIVE)
-	\@tar czf \$(ARCHIVE).tgz -C \$(TMPDIR) \$(ARCHIVE)
+	\@tar czf \$(PACKAGE).tgz -C \$(TMPDIR) \$(ARCHIVE)
 	\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
-	\@echo Distribution archive created as \$(ARCHIVE).tgz
+	\@echo Distribution package created as \$(PACKAGE).tgz
 
 clean:
 	\@-rm -f \$(OBJS) \$(DEPFILE) *.so *.tgz core* *~