Changeset 621 in ProjectBuilder

Timestamp:

Nov 30, 2008, 1:27:48 AM (15 years ago)

Author:

Bruno Cornec

Message:

Adds function pb_distro_installdeps to automatically istall dependencies on distro before building

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (4 diffs)
• pb/bin/pb (modified) (7 diffs)

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

@@ -20 +20 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_init pb_get_distro);
+our @EXPORT = qw(pb_distro_init pb_get_distro pb_distro_installdeps);
 
 =pod
@@ -39 +39 @@
   # Return information on the running distro
   #
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();
-  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf)."\n";
+  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init();
+  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd)."\n";
   # 
   # Return information on the requested distro
   #
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init("ubuntu","7.10");
-  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf)."\n";
+  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init("ubuntu","7.10");
+  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd)."\n";
   # 
   # Return information on the running distro
   #
   my ($ddir,$dver) = pb_get_distro();
-  my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($ddir,$dver);
-  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf)."\n";
+  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($ddir,$dver);
+  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd)."\n";
 
 =head1 USAGE
@@ -163 +163 @@
     $dfam="unknown";
 }
+
+# Update command needs to be run by root
+$dupd = "sudo ".$dupd;
 
 return($ddir, $dver, $dfam, $dtype, $dsuf, $dupd);
@@ -329 +332 @@
 }
 
+
+=over 4
+
+=item B<pb_distro_installdeps>
+
+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
+
+=cut
+
+sub pb_distro_installdeps {
+
+# SPEC file
+my $f = shift || undef;
+my $dtype = shift || undef;
+my $dupd = shift || undef;
+my $deps = shift || undef;
+
+# Protection
+return if (not defined $dupd);
+
+# Get dependecies in the build file if not forced
+$deps = pb_distro_getdeps("$f", $dtype) if (not defined $deps);
+pb_log(2,"deps: $deps\n");
+return if (not defined $deps);
+if ($deps !~ /^[    ]*$/) {
+    pb_system("$dupd $deps","Installing dependencies ($deps)");
+    }
+}
+
+=over 4
+
+=item B<pb_distro_getdeps>
+
+This function computes the dependencies indicated in the build file and return them as a string of packages to install
+
+=cut
+
+sub pb_distro_getdeps {
+
+my $f = shift || undef;
+my $dtype = shift || undef;
+
+my $regexp = "";
+my $deps = "";
+my $sep = $/;
+
+pb_log(3,"entering pb_distro_getdeps: $dtype - $f\n");
+# Protection
+return if (not defined $dtype);
+if ($dtype eq  "rpm") {
+    # In RPM this could include files, but we do not handle them atm.
+    $regexp = '^BuildRequires:(.*)$';
+} elsif ($dtype eq "du") {
+    $regexp = '^Build-Depends:(.*)$';
+} elsif ($dtype eq "ebuild") {
+    $sep = '"'.$/;
+    $regexp = '^DEPEND="(.*)"\n'
+} else {
+    # No idea
+    return;
+}
+pb_log(2,"regexp: $regexp\n");
+
+
+# Protection
+return if (not defined $f);
+
+# Preserve separator before using the one we need
+my $oldsep = $/;
+$/ = $sep;
+open(DESC,"$f") || die "Unable to open $f";
+while (<DESC>) {
+    pb_log(4,"read: $_\n");
+    next if (! /$regexp/);
+    chomp();
+    # What we found with the regexp is the list of deps.
+    pb_log(2,"found deps: $_\n");
+    s/$regexp/$1/;
+    # Remove conditions
+    s/>[=]*.*,//g;
+    # Improve string format (remove , and spaces at start, end and in double
+    s/,//g;
+    s/^\s*//;
+    s/\s*$//;
+    s/\s+/ /g;
+    $deps .= " ".$_;
+}
+close(DESC);
+$/ = $oldsep;
+pb_log(2,"now deps: $deps\n");
+my $deps2 = "";
+
+# Avoid to install what is already there
+foreach my $p (split(/ /,$deps)) {
+    if ($dtype eq  "rpm") {
+        my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet");
+        next if ($res eq 0);
+    } elsif ($dtype eq "du") {
+        my $res = pb_system("dpkg -L $p","","quiet");
+        next if ($res eq 0);
+    } elsif ($dtype eq "ebuild") {
+    } else {
+        # Not reached
+    }
+    pb_log(2,"found deps2: $p\n");
+    $deps2 .= " $p";
+}
+
+$deps2 =~ s/^\s*//;
+pb_log(2,"now deps2: $deps2\n");
+return($deps2);
+}
+
 =back 
 

devel/pb/bin/pb

@@ -837 +837 @@
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
+                    pb_distro_installdeps("$f",$dtype,$pbupd);
                     pb_system("rpmbuild $specialdef --define \'packager $ENV{'PBPACKAGER'}\' --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}","verbose");
                     last;
@@ -861 +862 @@
             chmod 0755,"debian/rules";
 
+            pb_distro_installdeps("debian/control",$dtype,$pbupd);
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
             # Get the name of the generated packages
@@ -913 +915 @@
             foreach my $f (@ebuildfile) {
                 if ($f =~ /\.ebuild$/) {
+                    pb_distro_installdeps("$f",$dtype,$pbupd);
                     move($f,"$tmpd/$pbpkg-$pbver.ebuild");
                     pb_system("cd $tmpd ; ebuild $pbpkg-$pbver.ebuild clean ; ebuild $pbpkg-$pbver.ebuild digest ; ebuild $pbpkg-$pbver.ebuild package","verbose");
@@ -932 +935 @@
             symlink "pbconf/$ddir-$dver-$arch","install" || die "Unable to symlink to pbconf/$ddir-$dver-$arch";
             if (-x "install/pbslack") {
+                pb_distro_installdeps("./install/pbslack",$dtype,$pbupd);
                 pb_system("./install/pbslack","Building package");
                 pb_system("sudo /sbin/makepkg -p -l y -c y $pbpkg","Packaging $pbpkg","verbose");
@@ -1028 +1032 @@
             ($odir,$over,$oarch) = split(/-/,$v);
         }
-        ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($odir,$over);
+        ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($odir,$over);
         pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
 
@@ -1449 +1453 @@
         my ($name,$ver,$darch) = split(/-/,$v);
         chomp($darch);
-        my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver);
+        my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver);
 
         if ($vetype eq "chroot") {
@@ -1986 +1990 @@
         pb_system("apt-get -y install wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libmodule-build-perl libdate-manip-perl libmail-sendmail-perl liblocale-gettext-perl","$cmtall");
     } else  {
-        pb_system("apt-get update; apt-get -y install wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libmodule-build-perl libdate-manip-perl libmail-sendmail-perl liblocale-gettext-perl","$cmtall");
+        pb_system("apt-get update; $pbupd wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libmodule-build-perl libdate-manip-perl libmail-sendmail-perl liblocale-gettext-perl","$cmtall");
     }
 } elsif ( $dfam eq "gen" ) {
         #system "emerge -u system";
-        pb_system("$pbudp wget sudo ntp DateManip File-MimeInfo Mail-Sendmail Locale-gettext","$cmtall");
+        pb_system("$pbupd wget sudo ntp DateManip File-MimeInfo Mail-Sendmail Locale-gettext","$cmtall");
 } else {
     pb_log(0,"No pkg to install\n");