Changeset 756 in ProjectBuilder for devel/pb-modules

Timestamp:

Apr 4, 2009, 7:42:24 PM (16 years ago)

Author:

Bruno Cornec

Message:

pb_distro_init now returns a 7th paramater which is the arch, useful for pbdistrocheck

Location:

devel/pb-modules

Files:

• bin/pbdistrocheck (modified) (1 diff)
• lib/ProjectBuilder/Distribution.pm (modified) (4 diffs)

devel/pb-modules/bin/pbdistrocheck

@@ -28 +28 @@
 pb_log_init($pbdebug, $pbLOG);
 
-my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init();
-print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd))."\n";
+my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n";

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

@@ -42 +42 @@
   # Return information on the running distro
   #
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init();
-  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd)."\n";
+  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
   # 
   # Return information on the requested distro
   #
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init("ubuntu","7.10");
-  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd)."\n";
+  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init("ubuntu","7.10","x86_64");
+  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
   # 
   # Return information on the running distro
   #
   my ($ddir,$dver) = pb_distro_get();
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($ddir,$dver);
-  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd)."\n";
+  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init($ddir,$dver);
+  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
 
 =head1 USAGE
@@ -60 +60 @@
 =over 4
 
-
-=item B<pb_distro_get>
-
-This function returns a list of 2 parameters indicating the distribution name and version of the underlying Linux distribution. The value of those 2 fields may be "unknown" in case the function was unable to recognize on which distribution it is running.
-
-On my home machine it would currently report ("mandriva","2008.0").
-
-=cut
+=item B<pb_distro_init>
+
+This function returns a list of 7 parameters indicating the distribution name, version, family, type of build system, suffix of packages, update command line and architecture of the underlying Linux distribution. The value of the 7 fields may be "unknown" in case the function was unable to recognize on which distribution it is running.
+
+As an example, Ubuntu and Debian are in the same "du" family. As well as RedHat, RHEL, CentOS, fedora are on the same "rh" family.
+Mandriva, Open SuSE and Fedora have all the same "rpm" type of build system. Ubuntu ad Debian have the same "deb" type of build system. 
+And "fc" is the extension generated for all Fedora packages (Version will be added by pb).
+
+When passing the distribution name and version as parameters, the B<pb_distro_init> function returns the parameter of that distribution instead of the underlying one.
+
+Cf: http://linuxmafia.com/faq/Admin/release-files.html
+Ideas taken from http://search.cpan.org/~kerberus/Linux-Distribution-0.14/lib/Linux/Distribution.pm
+
+=cut
+
 
 sub pb_distro_init {
@@ -171 +178 @@
 }
 
-return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd);
-}
-
-=item B<pb_distro_init>
-
-This function returns a list of 5 parameters indicating the distribution name, version, family, type of build system and suffix of packages of the underlying Linux distribution. The value of the 5 fields may be "unknown" in case the function was unable to recognize on which distribution it is running.
-
-As an example, Ubuntu and Debian are in the same "du" family. As well as RedHat, RHEL, CentOS, fedora are on the same "rh" family.
-Mandriva, Open SuSE and Fedora have all the same "rpm" type of build system. Ubuntu ad Debian have the same "deb" type of build system. 
-And "fc" is the extension generated for all Fedora packages (Version will be added by pb).
-
-When passing the distribution name and version as parameters, the B<pb_distro_init> function returns the parameter of that distribution instead of the underlying one.
-
-Cf: http://linuxmafia.com/faq/Admin/release-files.html
-Ideas taken from http://search.cpan.org/~kerberus/Linux-Distribution-0.14/lib/Linux/Distribution.pm
+return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $arch);
+}
+
+=item B<pb_distro_get>
+
+This function returns a list of 2 parameters indicating the distribution name and version of the underlying Linux distribution. The value of those 2 fields may be "unknown" in case the function was unable to recognize on which distribution it is running.
+
+On my home machine it would currently report ("mandriva","2009.0").
 
 =cut
@@ -344 +344 @@
 
 This function install the dependencies required to build the package on an RPM based distro
-dependencies can be passed as a prameter in which case they are not computed
+dependencies can be passed as a parameter in which case they are not computed
 
 =cut