Changeset 2100 in ProjectBuilder


Ignore:
Timestamp:
Jul 20, 2016, 3:56:50 PM (5 years ago)
Author:
Bruno Cornec
Message:
  • Fix tag name for test versions for rpm (0.date.letter.rev)
  • Fix tar file names for test versions and their usage in the setup macro and adapt PBSRC
  • Fix #136 for rpm packages
  • Simplify target dir setup
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r2097 r2100  
    10721072
    10731073    # If we deal with a test dir, we want to keep the date in tar file and dir name
    1074     my $pbextdir = "";
     1074    my $pbextdirpkg = "";
    10751075        if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
    1076             $pbextdir = strftime("%Y%m%d%H%M%S", @date);
    1077     }
     1076            $pbextdirpkg = strftime("%Y%m%d%H%M%S", @date);
     1077    }
     1078    my $pbextdir = ".0.".$pbextdirpkg;
    10781079
    10791080    foreach my $pbpkg (@pkgs) {
     
    11021103                $letter = "f";
    11031104            }
    1104             $pbtag = "0.$pbextdir.$letter$pbrev";
     1105            $pbtag = "0.$pbextdirpkg.$letter$pbrev";
    11051106            $ENV{'PBPROJTAG'} = $pbtag;
    11061107        } elsif ((defined $pkgt) && (defined $pkgt->{$pbpkg})) {
     
    25852586            # Nothing to do here
    25862587        } else {
    2587             pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done ; $cmd\' | bash -e\"","Preparing $tdir on $cptarget");
     2588            pb_system("$shcmd \"rm -rf $tdir ; mkdir -p $tdir ; $cmd\' | bash -e\"","Preparing $tdir on $cptarget");
    25882589        }
    25892590    } else {
  • pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec

    r2083 r2100  
    2828
    2929%prep
    30 %setup -q -n %{srcname}-%{version}
     30%setup -q -n %{srcname}-%{version}PBEXTDIR
    3131
    3232%build
  • pbconf/devel/pbfilter/all.pbf

    r2098 r2100  
    1111
    1212# PBSRC is replaced by the source package format
    13 filter PBSRC = src/%{srcname}-%{version}.tar.gz
     13filter PBSRC = src/%{srcname}-%{version}$pb->{'extdir'}.tar.gz
    1414
    1515# PBVER is replaced by the version ($pb->{'ver'} in code)
  • pbconf/devel/pbmkbm/rpm/pbmkbm.spec

    r1832 r2100  
    2727
    2828%prep
    29 %setup -q
     29%setup -q -n %{srcname}-%{version}PBEXTDIR
    3030
    3131%build
  • pbconf/devel/project-builder/rpm/project-builder.spec

    r2083 r2100  
    2929
    3030%prep
    31 %setup -q
     31%setup -q -n %{srcname}-%{version}PBEXTDIR
    3232
    3333%build
  • pbconf/devel/rpmbootstrap/rpm/rpmbootstrap.spec

    r1832 r2100  
    2929
    3030%prep
    31 %setup -q
     31%setup -q -n %{srcname}-%{version}PBEXTDIR
    3232
    3333%build
Note: See TracChangeset for help on using the changeset viewer.