git://git.jankratochvil.net
/
macros.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include '--deb' and '--debtest' for '--help' text.
[macros.git]
/
AutoGen.pm
diff --git
a/AutoGen.pm
b/AutoGen.pm
index
de75b41
..
e202fc4
100644
(file)
--- a/
AutoGen.pm
+++ b/
AutoGen.pm
@@
-43,6
+43,9
@@
HERE
}
die "You are missing some modules - install them by:\n"
."\tperl -MCPAN -e 'install qw(".join(" ",@missing).")'\n"
}
die "You are missing some modules - install them by:\n"
."\tperl -MCPAN -e 'install qw(".join(" ",@missing).")'\n"
+ ."If you see messages: Writing Makefile for <packagename> -- NOT OK\n"
+ ."you may did not have installed make(1) while configuring Perl CPAN.\n"
+ ."Install make(1) and type 'o conf init' in: perl -MCPAN -e shell\n"
if @missing;
}
if @missing;
}
@@
-56,6
+59,8
@@
Beware: '.basename($0).' is a tool only for maintainers!
Supported parameters:
--rpm Build RPM packages locally (needs /usr/src/(redhat|packages)/ access)
--rpmtest Build RPM like "rpm" but w/o gpg/pgp signing
Supported parameters:
--rpm Build RPM packages locally (needs /usr/src/(redhat|packages)/ access)
--rpmtest Build RPM like "rpm" but w/o gpg/pgp signing
+ --deb Build DEB packages locally
+ --debtest Build DEB like "deb" but w/o gpg/pgp signing
--clean Standard cleanup method
--fullclean Like clean but even the .cvsignore files are removed
--copy Behave exactly like in default mode but copy all instead of symlinks
--clean Standard cleanup method
--fullclean Like clean but even the .cvsignore files are removed
--copy Behave exactly like in default mode but copy all instead of symlinks
@@
-214,20
+219,20
@@
my($class,%args)=@_;
$class->_prepdist($name);
_system "make $name.spec";
my $spec=_readfile "$name.spec";
$class->_prepdist($name);
_system "make $name.spec";
my $spec=_readfile "$name.spec";
- my $patch=($spec=~/^Patch\d*:\s*(.*)$/m)[0];
+ my $patch=($spec=~/^Patch\d*
\s*
:\s*(.*)$/m)[0];
_system "make dist";
if (!$patch) {
_copy "$name-*.tar.gz",_rpmeval("_sourcedir");
}
else {
my @origs;
_system "make dist";
if (!$patch) {
_copy "$name-*.tar.gz",_rpmeval("_sourcedir");
}
else {
my @origs;
- for my $glob ("orig-$name-*.tar.{gz,Z}") {
+ for my $glob ("orig-$name-*.tar.{gz,Z
,bz2
}") {
@origs=glob $glob;
confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
}
@origs=glob $glob;
confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
}
- my
$base=($origs[0]=~/^orig-(.*)[.]tar[.](?:gz|Z)$/)[0]
;
+ my
($base,$ext)=($origs[0]=~/^orig-(.*)[.]tar[.](gz|Z|bz2)$/)
;
_copy $origs[0],_rpmeval("_sourcedir")."/".($origs[0]=~/^orig-(.*)$/)[0];
_copy $origs[0],_rpmeval("_sourcedir")."/".($origs[0]=~/^orig-(.*)$/)[0];
- _system "tar x
z
f ".$origs[0];
+ _system "tar x
".($ext eq "bz2" ? "j" : "z")."
f ".$origs[0];
_mkdir $base."-orig";
# FIXME: Copy also dot-prefixed files!
_move \1,$base."/*",$base."-orig/";
_mkdir $base."-orig";
# FIXME: Copy also dot-prefixed files!
_move \1,$base."/*",$base."-orig/";
@@
-267,7
+272,7
@@
my($class,%args)=@_;
_system "make distdir";
# Copy 'orig' archive after &_prepdist which would delete it.
my @origs;
_system "make distdir";
# Copy 'orig' archive after &_prepdist which would delete it.
my @origs;
- for my $glob ("orig-$name-*.tar.{gz,Z}") {
+ for my $glob ("orig-$name-*.tar.{gz,Z
,bz2
}") {
@origs=glob $glob;
if (@origs) {
confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
@origs=glob $glob;
if (@origs) {
confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;