Updated maintainer scripts

[checkmail.git] / maint / release.pm

diff --git a/maint/release.pm b/maint/release.pm
index cad091e30c9866c0026c0d4aef480475f0e544c5..71e281b2709abb8026924bc94158a39ae01abcd8 100644 (file)
--- a/maint/release.pm
+++ b/maint/release.pm
@@ -17,7 +17,8 @@ sub new($$) {
                        # p=preprocess, s=subst, -=discard
                        '(^|/)(CVS|\.arch-ids|{arch}|\.git|tmp)/' => '-',
                        '\.(lsm|spec)$' => 'ps',
-                       '(^|/)README$' => 's'
+                       '(^|/)README$' => 's',
+                       '\.swp$' => '-',
                        ],
                "directories" => [
                        ],
@@ -27,11 +28,12 @@ sub new($$) {
                "LSMDATE" => `date '+%y%m%d' | tr -d '\n'`,
                "distfiles" => [
                        ],
-               "archivedir" => "/home/mj/tmp/archives/$basename",
+               "archivedir" => $ENV{HOME} . "/archives/sw/$basename",
                "uploads" => [
                        ],
                "notifiers" => [
                        ],
+               "test_cmd" => "make",
                # Options
                "do_test" => 1,
                "do_patch" => 1,
@@ -264,8 +266,9 @@ sub Test($) {
        my $dd = $s->{"DISTDIR"};
        my $pkg = $s->{"PKG"};
        my $log = "$dd/$pkg.log";
+       my $test_cmd = $s->{"test_cmd"};
        print "Doing a test compilation\n";
-       `( cd $dd/$pkg && make ) >$log 2>&1`;
+       `( cd $dd/$pkg && $test_cmd ) >$log 2>&1`;
        die "There were errors. Please inspect $log" if $?;
        `grep -q [Ww]arning $log`;
        $? or print "There were warnings! Please inspect $log.\n";
@@ -356,7 +359,7 @@ sub AddUcwNotifier($) {
                print "Updating web pages\n";
                my $pkg = $s->{'PACKAGE'};
                my $ver = $s->{'VERSION'};
-               `ssh jw 'cd www && bin/release-prog $pkg $ver'`; die if $?;
+               `ssh jw 'cd web && bin/release-prog $pkg $ver'`; die if $?;
        };
 };