Changeset 865 in ProjectBuilder

Timestamp:

Oct 19, 2009, 6:56:22 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Do not force to have a vepath and vmpath in the .pbrc to start with
• Force to always build for the local distribution

Location:

devel/pb

Files:

• bin/pb (modified) (1 diff)
• lib/ProjectBuilder/Env.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -596 +596 @@
         my %build;
         my @pt;
-        my $tmpl = "";
+        # We want to at least build for the underlying distro
+        my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
+        my $tmpl = "$ddir-$dver-$arch,";
         my %patches;
 
+        # Get list of distributions for which I need to generate build files
         @pt = pb_conf_get_if("vmlist","velist");
         if (defined $pt[0]->{$ENV{'PBPROJ'}}) {

devel/pb/lib/ProjectBuilder/Env.pm

@@ -153 +153 @@
 # Adds a potential conf file now as it's less 
 # important than the project conf file
-my ($vmpath,$vepath) = pb_conf_get("vmpath","vepath");
-pb_conf_add("$vmpath->{$ENV{'PBPROJ'}}/.pbrc") if (-f "$vmpath->{$ENV{'PBPROJ'}}/.pbrc");
-pb_conf_add("$vepath->{$ENV{'PBPROJ'}}/.pbrc") if (-f "$vepath->{$ENV{'PBPROJ'}}/.pbrc");
+my ($vmpath,$vepath) = pb_conf_get_if("vmpath","vepath");
+pb_conf_add("$vmpath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $vmpath) && (-f "$vmpath->{$ENV{'PBPROJ'}}/.pbrc"));
+pb_conf_add("$vepath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $vepath) && (-f "$vepath->{$ENV{'PBPROJ'}}/.pbrc"));
 
 #