Changeset 969 in ProjectBuilder

Timestamp:

Feb 16, 2010, 8:03:47 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug for suffix computation, following the change of interface for pb_distro_get_param
• pbdistrocheck now has a man page. Build files adapted accordingly

Files:

• devel/pb-modules/Makefile.PL (modified) (1 diff)
• devel/pb-modules/bin/pbdistrocheck (modified) (2 diffs)
• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec (modified) (1 diff)

devel/pb-modules/Makefile.PL

@@ -18 +18 @@
     AUTHOR        => 'Bruno Cornec <bruno#project-builder.org>',
     EXE_FILES     => [ qw( bin/pbdistrocheck ) ],
+    MAN1PODS      => { 'bin/pbdistrocheck' => '$(INST_MAN1DIR)/pbdistrocheck.$(MAN1EXT)', },
     MAN3PODS      => {  'lib/ProjectBuilder/Distribution.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Distribution.$(MAN3EXT)',
                         'lib/ProjectBuilder/Conf.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Conf.$(MAN3EXT)',

devel/pb-modules/bin/pbdistrocheck

@@ -14 +14 @@
 use ProjectBuilder::Distribution;
 use ProjectBuilder::Base;
+
+=pod
+
+=head1 NAME
+
+pb, aka project-builder.org - builds packages for your projects
+
+=head1 DESCRIPTION
+
+pb helps you build various packages directly from your project sources.
+pbdistrocheck is a command from the pb project providing the same type of services as lsb_release, but extended.
+
+=head1 SYNOPSIS
+
+pbdistrocheck [-d][-v] [distro-ver-arch]
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-v|--verbose>
+
+Print a brief help message and exits.
+
+=item B<-d|--description>
+
+generate a short format user friendly
+(by default, generate a longer format, comma separated allowing parsing)
+
+=back 
+
+=head1 ARGUMENTS
+
+arguments are optional. If none given, analyzes the underlying operating system
+If one is given, it should have the format osname-version-architecture, and in that case pbdistrocheck will provide all the information related to that OS needed by pb.
+
+=head1 WEB SITES
+
+The main Web site of the project is available at L<http://www.project-builder.org/>. Bug reports should be filled using the trac instance of the project at L<http://trac.project-builder.org/>.
+
+=head1 USER MAILING LIST
+
+Cf: L<http://www.mondorescue.org/sympa/info/pb-announce> for announces and L<http://www.mondorescue.org/sympa/info/pb-devel> for the development of the pb project.
+
+=head1 CONFIGURATION FILES
+
+Uses the main /etc/pb/pb.conf (or /usr/local/etc/pb/pb.conf if installed from files) configuration file to give its answers.
+
+=head1 AUTHORS
+
+The Project-Builder.org team L<http://trac.project-builder.org/> lead by Bruno Cornec L<mailto:bruno@project-builder.org>.
+
+=head1 COPYRIGHT
+
+Project-Builder.org is distributed under the GPL v2.0 license
+described in the file C<COPYING> included with the distribution.
+
+=cut
 
 my %opts;                   # CLI Options
@@ -31 +89 @@
 pb_log_init($pbdebug, $pbLOG);
 
-my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+my $dist = shift @ARGV || undef ;
+my @param = undef;
+@param = split(/-/,$dist) if (defined $dist);
+
+my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init(@param);
 if (defined $opts{'d'}) {
-    print "\u$ddir $dver\n";
+    print "\u$ddir $dver $arch\n";
 } else {
     print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n";

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -114 +114 @@
 my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver");
 
+# Dig into the tuple to find the best answer
 $dfam = pb_distro_get_param($ddir,$dver,$darch,$osfamily);
 $dtype = $ostype->{$dfam} if (defined $ostype->{$dfam});
@@ -127 +128 @@
 $dver =~ s/\.// if ($drmdot eq "true");
 
-if ((not defined $dsuf) || ($dsuf eq "unknown")) {
+if ((not defined $dsuf) || ($dsuf eq "")) {
     # By default suffix is a concatenation of .ddir and dver
     $dsuf = ".$ddir$dver" 

pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec

@@ -53 +53 @@
 %{perlvendorlib}/*
 %{_bindir}/*
-#%{_mandir}/man1/*
+%{_mandir}/man1/*
 %{_mandir}/man3/*