diff options
author | Will Andrews <will@FreeBSD.org> | 2001-01-01 23:12:31 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2001-01-01 23:12:31 +0000 |
commit | 2f7c6bd9f54f91992f507d3432c6b73922e72421 (patch) | |
tree | 1550b57f0d4ee6e9c60ff1e5d04ad8fd50b15a7e /Tools | |
parent | Fix breakage on 5-CURRENT. (diff) |
Fix breakage when someone uses -t option: pass DISTDIR environment variable
to the extra testing's make procs. Fix _stupid_ mistake where -n option
had no effect on hindering ``cvs add'' and CVSROOT/modules updating.
Cosmetics; remove extra space in generated commit log message and fix the
usage section's style in regards to options that take arguments. Add
missing -g option's mention.
Submitted by: assar (DISTDIR, CVSROOT/modules updating routine bugs)
Notes
Notes:
svn path=/head/; revision=36588
Diffstat (limited to 'Tools')
-rwxr-xr-x | Tools/scripts/addport | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Tools/scripts/addport b/Tools/scripts/addport index 0cffae1911b1..551bb8e6aa74 100755 --- a/Tools/scripts/addport +++ b/Tools/scripts/addport @@ -127,8 +127,8 @@ if ($addlchk && -f $portlint) { push(@commands, "$portlint $plint_args"); push(@commands, "$make $passenv FETCH_BEFORE_ARGS='-btA' checksum") if !$nofetch; if ($more_testing) { - push(@commands, "$make distclean"); - push(@commands, "$make build"); + push(@commands, "$make $passenv distclean"); + push(@commands, "$make $passenv build"); } if (!$nomkdir) { chdir $tmpdir; @@ -261,7 +261,7 @@ foreach my $thisdir (@dirs) { $pkgcomment = $pkgcomment . "\n\n" if ($autofill != -1); # Write out the data to the comment file. open(AUTOFILL, "> $tmpdir/commitfile") or die("Can't open $tmpdir/commitfile for writing: $!"); - print AUTOFILL "Add $portname $portversion, $pkgcomment"; + print AUTOFILL "Add $portname $portversion,$pkgcomment"; print AUTOFILL "PR: $autofill\n" if ($autofill != -1); print AUTOFILL "Submitted by: $orig" if ($autofill != -1); close(AUTOFILL); @@ -294,8 +294,8 @@ foreach my $thisdir (@dirs) { } chdir $category or err(1,"$category"); system("$cp -PRp $thisdir ."); - system("$cvs add `find $portname -type d | grep -v CVS`") && errx(1, "cvs add for dirs failed, aborting."); - system("$cvs add `find $portname -type f | grep -v CVS`") && errx(1, "cvs add for files failed, aborting."); + system("$cvs $n add `find $portname -type d | grep -v CVS`") && errx(1, "cvs add for dirs failed, aborting."); + system("$cvs $n add `find $portname -type f | grep -v CVS`") && errx(1, "cvs add for files failed, aborting."); # figure out where the port name belongs in category Makefile my @ports = &lsports; @@ -328,7 +328,7 @@ foreach my $thisdir (@dirs) { # commit the actual port. chdir "$tmpdir/$category" or err(1, "$tmpdir/$category"); system("$commitfile $cvs $n ci Makefile $portname") && errx(1, "cvs commit failed, aborting."); - if (!$nomodules) { + if (!$nomodules && ($n ne "-n")) { system("$ssh $perl /usr/local/bin/modulesupdate $module ports/$category/$portname") && errx(1, "adding port to modules failed, aborting."); } } @@ -382,7 +382,8 @@ print <<EOF; authors: <will\@FreeBSD.org>, <mharo\@FreeBSD.org> SYNOPSIS - $0 [-h host] [-u user] [-s distdir] [-acfilmnt] -d directory + $0 [-c commitfile] [-h host] [-l PR number] [-s distdir] [-s distdir] + [-afgimnt] -d directory Where "directory" contains the comma-delimited list of root directories of new ports that you wish to @@ -394,6 +395,7 @@ OPTIONS there are no problems. Recommended. -c file Use file in place of normal log message. -f Do not fetch the distfile. + -g Do not commit to CVSROOT/modules. -h host Use a cvshost besides freefall.FreeBSD.org. -i Interactive mode; allow more control over where things are placed. This is required in |