Changeset 621 in ProjectBuilder for devel/pb/bin

Timestamp:

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

Author:

Bruno Cornec

Message:

Adds function pb_distro_installdeps to automatically istall dependencies on distro before building

File:

• devel/pb/bin/pb (modified) (7 diffs)

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");