Changeset 2271


Ignore:
Timestamp:
Aug 30, 2017, 5:07:54 PM (3 months ago)
Author:
bruno
Message:

file install now uses precise directories for tar files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r2270 r2271  
    38873887
    38883888# We need to have that pb_distro_get_context function
    3889 # Get it from Project-Builder::Distribution
     3889# Get it from ProjectBuilder::Distribution
    38903890# And we now need the conf file required for this to work created above
    38913891
     
    40034003    if ($itype =~ /^file/) {
    40044004        my $cmdget;
     4005        my ($pbver1,$pbver2,$pbextdir);
     4006        my ($tmp1,$tmp2);
    40054007        if (defined $sbx) {
    40064008            # Install from sandbox mean using the result of the just passed sbx2build command
    40074009            # Get content saved in cms2build
    40084010            my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.yml","pbpkg");
    4009             my $pbextdir = pb_get_extdir();
     4011            $pbextdir = pb_get_extdir();
    40104012            die "Unable to get package list" if (not defined $pkg);
    40114013
     
    40164018            pb_log(2,"Vertag1: $vertag1\n");
    40174019            pb_log(2,"Vertag2: $vertag2\n");
    4018             my ($pbver1,$tmp1) = split(/-/,$vertag1);
    4019             my ($pbver2,$tmp2) = split(/-/,$vertag2);
     4020            ($pbver1,$tmp1) = split(/-/,$vertag1);
     4021            ($pbver2,$tmp2) = split(/-/,$vertag2);
    40204022            $cmdget = "mv /tmp/ProjectBuilder-$pbver1$pbextdir.tar.gz ProjectBuilder-latest.tar.gz ; mv /tmp/project-builder-$pbver2$pbextdir.tar.gz project-builder-latest.tar.gz";
    40214023        } else {
     
    40474049EOF
    40484050        print SCRIPT " $cmdget ; ";
    4049         print SCRIPT << 'EOF'
    4050 gzip -cd ProjectBuilder-latest.tar.gz | tar xf - ; cd ProjectBuilder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf ProjectBuilder-* ; gzip -cd project-builder-latest.tar.gz | tar xf - ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-* ;","Building Project-Builder");
     4051        print SCRIPT << "EOF"
     4052gzip -cd ProjectBuilder-latest.tar.gz | tar xf - ; cd ProjectBuilder-$pbver1$pbextdir ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf ProjectBuilder-* ; gzip -cd project-builder-latest.tar.gz | tar xf - ; cd project-builder-$pbver2$pbextdir ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-* ;","Building Project-Builder");
    40514053EOF
    40524054    } elsif ($itype =~ /^pkg/) {
Note: See TracChangeset for help on using the changeset viewer.