Squashed compiler warnings about code with no effect

[pciutils.git] / maint / release

diff --git a/maint/release b/maint/release
index 67dd3692ab5d0d45cf7146ee7f8dda581e7323af..63b6be0ba5228d7e39a009153e385485ad0b20ce 100755 (executable)
--- a/maint/release
+++ b/maint/release
@@ -1,14 +1,23 @@
 #!/usr/bin/perl
 # A simple script for making releases of the pciutils
-# (c) 2003 Martin Mares <mj@ucw.cz>
+# (c) 2003--2006 Martin Mares <mj@ucw.cz>
 
 use strict;
 use warnings;
 require "maint/release.pm";
 
+# Check API version
+my $apiver = "???";
+open X, "lib/pci.h" or die;
+while (<X>) {
+       /^#define PCI_LIB_VERSION 0x(.{6})$/ and $apiver = $1;
+}
+print "API version is $apiver ... <confirm> "; <STDIN>;
+
 my $r = new UCW::Release("pciutils");
 my $ver = $r->GetVersionFromFile("Makefile", "VERSION=(.*)");
 $r->GetVersionsFromChangelog("ChangeLog", "Released as (.*)\.");
+push @{$r->{"rules"}}, '^win32/config.h' => 's';
 if ($ver =~ /-/) {
        $r->{"ALPHADIR"} = "alpha/";
        $r->{"conditions"}->{"ALPHA_VERSION"} = 1;
@@ -19,12 +28,12 @@ if ($ver =~ /-/) {
 push @{$r->{"uploads"}}, {
        "url" => "scp://atrey.karlin.mff.cuni.cz/~ftp/pub/linux/pci/" . $r->{"ALPHADIR"}
        },{
-       "url" => "scp://master.kernel.org/~ftp/pub/software/utils/pciutils/" . $r->{"ALPHADIR"}
+       "url" => "scp://master.kernel.org/pub/software/utils/pciutils/" . $r->{"ALPHADIR"}
        };
 push @{$r->{"uploads"}}, {
        "url" => "ftp://metalab.unc.edu/incoming/linux/",
        "filter" => '(\.tar\.gz|\.lsm)$'
-       } if !defined $r->{"ALPHADIR"};
+       } if $r->{"ALPHADIR"} eq "";
 $r->ParseOptions;
 $r->InitDist("maint/dist");
 my $reldir = $r->GenPackage;
@@ -33,6 +42,6 @@ $r->GenFile("pciutils.lsm");
 $r->Dispatch;
 if ($r->{"do_upload"}) {
        print "Uploading pci.ids to Jabberwock\n";
-       `scp pci.ids pciids@jabberwock.ucw.cz:05-pciutils.new`; die if $?;
-       `ssh pciids@jabberwock.ucw.cz mv 05-pciutils.new origs/05-pciutils`; die if $?;
+       `scp -C pci.ids pciids\@jabberwock.ucw.cz:05-pciutils.new`; die if $?;
+       `ssh pciids\@jabberwock.ucw.cz mv 05-pciutils.new origs/05-pciutils`; die if $?;
 }