Changeset 865


Ignore:
Timestamp:
Oct 19, 2009, 6:56:22 PM (10 years ago)
Author:
bruno
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:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r848 r865  
    596596        my %build;
    597597        my @pt;
    598         my $tmpl = "";
     598        # We want to at least build for the underlying distro
     599        my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
     600        my $tmpl = "$ddir-$dver-$arch,";
    599601        my %patches;
    600602
     603        # Get list of distributions for which I need to generate build files
    601604        @pt = pb_conf_get_if("vmlist","velist");
    602605        if (defined $pt[0]->{$ENV{'PBPROJ'}}) {
  • devel/pb/lib/ProjectBuilder/Env.pm

    r851 r865  
    153153# Adds a potential conf file now as it's less
    154154# important than the project conf file
    155 my ($vmpath,$vepath) = pb_conf_get("vmpath","vepath");
    156 pb_conf_add("$vmpath->{$ENV{'PBPROJ'}}/.pbrc") if (-f "$vmpath->{$ENV{'PBPROJ'}}/.pbrc");
    157 pb_conf_add("$vepath->{$ENV{'PBPROJ'}}/.pbrc") if (-f "$vepath->{$ENV{'PBPROJ'}}/.pbrc");
     155my ($vmpath,$vepath) = pb_conf_get_if("vmpath","vepath");
     156pb_conf_add("$vmpath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $vmpath) && (-f "$vmpath->{$ENV{'PBPROJ'}}/.pbrc"));
     157pb_conf_add("$vepath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $vepath) && (-f "$vepath->{$ENV{'PBPROJ'}}/.pbrc"));
    158158
    159159#
Note: See TracChangeset for help on using the changeset viewer.