Changeset 2097 in ProjectBuilder


Ignore:
Timestamp:
Jul 10, 2016, 12:25:50 AM (5 years ago)
Author:
Bruno Cornec
Message:

Fix #136

Start of fix by building a correct tar file and rpm names
Use a revision based on the SCM first letter, the SCM id and the date,
using the future stable version to build and a revision of 0

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r2093 r2097  
    10791079    foreach my $pbpkg (@pkgs) {
    10801080        $ENV{'PBPKG'} = $pbpkg;
     1081        $pbrev = $ENV{'PBREVISION'};
    10811082
    10821083        if ((defined $pkgv) && (defined $pkgv->{$pbpkg})) {
     
    10851086            $pbver = $ENV{'PBPROJVER'};
    10861087        }
    1087         # If it's a test version, then tag == 0
     1088        # If it's a test version, then build a tag to fit distributions need
    10881089        if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
    1089             $pbtag = "0";
     1090            my $letter = "";
     1091            if ($scheme =~ /svn/) {
     1092                $letter = "s";
     1093            } elsif ($scheme =~ /cvs/) {
     1094                $letter = "c";
     1095            } elsif ($scheme =~ /svk/) {
     1096                $letter = "k";
     1097            } elsif ($scheme =~ /hg/) {
     1098                $letter = "h";
     1099            } elsif ($scheme =~ /git/) {
     1100                $letter = "g";
     1101            } else {
     1102                $letter = "f";
     1103            }
     1104            $pbtag = "0.$pbextdir.$letter$pbrev";
    10901105            $ENV{'PBPROJTAG'} = $pbtag;
    10911106        } elsif ((defined $pkgt) && (defined $pkgt->{$pbpkg})) {
     
    10951110        }
    10961111
    1097         $pbrev = $ENV{'PBREVISION'};
    10981112        pb_log(0,"\n");
    10991113        pb_log(0,"Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n");
  • pbconf/devel/pb.pb

    r2078 r2097  
    3535# Global version/tag for the project
    3636#
    37 projver pb = devel
     37projver pb = 0.14.1
    3838projtag pb = 1
    3939
Note: See TracChangeset for help on using the changeset viewer.