Changeset 2284


Ignore:
Timestamp:
Sep 4, 2017, 1:21:15 PM (2 weeks ago)
Author:
bruno
Message:

Now uses pbprojurl instead of pburl to be consistent with pbconfurl

Location:
devel
Files:
4 deleted
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • devel/pb-doc/pb-demo

    r2252 r2284  
    216216  projtag:
    217217    afio : 1
    218   pburl:
     218  pbprojurl:
    219219    afio : ftp://localhost/src/afio-2.5.tar.gz
    220220  pbrepo:
  • devel/pb-modules/etc/pb.yml.pod

    r2283 r2284  
    633633
    634634
    635 =item B<pburl>
    636 
    637  Nature: Optional
    638  Key: project (as defined in the -p option or PBPROJ environment variable)
    639  Value: B<pburl> giving access to where the project is stored. Normaly provided by the project, but could be overloaded for specific authentication information in the home configuration file or when using a DVCS
     635=item B<pbprojurl>
     636
     637 Nature: Optional
     638 Key: project (as defined in the -p option or PBPROJ environment variable)
     639 Value: B<pbprojurl> giving access to where the project is stored. Normaly provided by the project, but could be overloaded for specific authentication information in the home configuration file or when using a DVCS
    640640 Conffile: home|project
    641  Example: pburl linuxcoe = cvs+ssh://:ext:user@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe, pburl pb = svk:////local/pb
     641 Example: pbprojurl linuxcoe = cvs+ssh://:ext:user@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe, pbprojurl pb = svk:////local/pb
    642642
    643643=item B<pbusesshagent>
  • devel/pb-modules/lib/ProjectBuilder/Env.pm

    r2267 r2284  
    109109#
    110110# We have commit acces to these
    111 #  pburl:
     111#  pbprojurl:
    112112#    example: cvs+ssh://user\@example.cvs.sourceforge.net:/cvsroot/example
    113 #  pburl:
     113#  pbprojurl:
    114114#    pb: svn+ssh://svn.project-builder.org/mondo/svn/pb
    115115#
     
    212212            pb_vcs_conf_update_v0("$p->{$ENV{'PBPROJ'}}/.pbrc","$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
    213213            pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
    214             my ($pburl) = pb_conf_get("pburl");
    215             my ($scheme, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
     214            my ($pbprojurl) = pb_conf_get("pbprojurl");
     215            my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbprojurl->{$ENV{'PBPROJ'}});
    216216            #pb_vcs_add_if_not_in($scheme,"$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
    217217        }
     
    465465# What is the project URL
    466466#
    467 #  pburl:
     467#  pbprojurl:
    468468#    $ENV{'PBPROJ'}: svn://svn.$ENV{'PBPROJ'}.org/$ENV{'PBPROJ'}/devel
    469469#    $ENV{'PBPROJ'}: svn+ssh://user\@svn.$ENV{'PBPROJ'}.org/$ENV{'PBPROJ'}/devel
  • devel/pb-modules/lib/ProjectBuilder/VCS.pm

    r2268 r2284  
    757757pb_conf_update_v0($orig,$dest);
    758758# Adding this new file to VCS (not removing the previous one)
    759 my ($pburl) = pb_conf_get("pburl");
    760 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
     759my ($pbprojurl) = pb_conf_get("pbprojurl");
     760my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbprojurl->{$ENV{'PBPROJ'}});
    761761pb_vcs_add_if_not_in($scheme,$dest);
    762762}
  • devel/pb/bin/pb

    r2279 r2284  
    503503 # Url of the project
    504504 #
    505   pburl:
     505  pbprojurl:
    506506    linuxcoe : cvs+ssh://:ext:bcornec@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe
    507507 
     
    538538    mondorescue: $ENV{'HOME'}/mondo/svn/pbconf
    539539 
    540  # pbdir points to the directory where the CMS content of the pburl is checked out
     540 # pbdir points to the directory where the CMS content of the pbprojurl is checked out
    541541 # If not defined, pbdir is under pbdefdir/pbproj
    542542 # Only defined if we have access to the dev of the project
     
    575575=item Update your $project.yml configuration file.
    576576
    577 You need to set the pburl, pbrepo, pbwf, pbpackager, projver, projtag, testver, delivery, and defpkgdir lines as described in the configuration file. The pburl entry is used to find the source for your package. The pbrepo entry is used to build the .repo or .sources.list files for use by downloaders of the package. The pbwf entry indicates that the source tar file is named by I<package-name>-I<version>. The pbpackager entry will be stored in the packages and should be you or your team. The projver/projtag entries indicate the version of the software and the version of the packaging scripts. The testver entry when true indicates that the package is in a test version, so no log file is computed (can be long), and version is made up using a timstamp. The delivery entry gives the subdirectory under which the packages will be delivered on the repository, and the defpkgdir entry corresponds to the local subdirectory hosting the package content.
     577You need to set the pbprojurl, pbrepo, pbwf, pbpackager, projver, projtag, testver, delivery, and defpkgdir lines as described in the configuration file. The pbprojurl entry is used to find the source for your package. The pbrepo entry is used to build the .repo or .sources.list files for use by downloaders of the package. The pbwf entry indicates that the source tar file is named by I<package-name>-I<version>. The pbpackager entry will be stored in the packages and should be you or your team. The projver/projtag entries indicate the version of the software and the version of the packaging scripts. The testver entry when true indicates that the package is in a test version, so no log file is computed (can be long), and version is made up using a timstamp. The delivery entry gives the subdirectory under which the packages will be delivered on the repository, and the defpkgdir entry corresponds to the local subdirectory hosting the package content.
    578578
    579579For example:
    580580
    581  pburl Lintel = file:///home/anderse/projects/Lintel-0.2012.02.28.tar.gz
     581 pbprojurl Lintel = file:///home/anderse/projects/Lintel-0.2012.02.28.tar.gz
    582582 pbrepo Lintel = http://tesla.hpl.hp.com/opensource
    583583 pbwf Lintel = 1
     
    35423542    my ($scheme2,$uri) = pb_cms_init($pbinit);
    35433543
    3544     my ($pbconf,$pburl) = pb_conf_get("pbconfurl","pburl");
     3544    my ($pbconf,$pbprojurl) = pb_conf_get("pbconfurl","pbprojurl");
    35453545    $uri = $pbconf->{$ENV{'PBPROJ'}};
    35463546    my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
    35473547
    35483548    # Checking CMS repositories status
    3549     ($scheme2, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
     3549    ($scheme2, $account, $host, $port, $path) = pb_get_uri($pbprojurl->{$ENV{'PBPROJ'}});
    35503550
    35513551    if ($scheme !~ /^svn/) {
     
    35793579
    35803580    # Duplicate and extract project
    3581     my $newurl2 = "$pburl->{$ENV{'PBPROJ'}}/$newver";
    3582 
    3583     pb_log(2,"Copying $pburl->{$ENV{'PBPROJ'}}/$oldver to $newurl2\n");
    3584     pb_vcs_copy($scheme2,"$pburl->{$ENV{'PBPROJ'}}/$oldver",$newurl2);
     3581    my $newurl2 = "$pbprojurl->{$ENV{'PBPROJ'}}/$newver";
     3582
     3583    pb_log(2,"Copying $pbprojurl->{$ENV{'PBPROJ'}}/$oldver to $newurl2\n");
     3584    pb_vcs_copy($scheme2,"$pbprojurl->{$ENV{'PBPROJ'}}/$oldver",$newurl2);
    35853585
    35863586    my $tmp = $ENV{'PBDIR'};
  • devel/pb/lib/ProjectBuilder/CMS.pm

    r2169 r2284  
    5454=item B<pb_cms_init>
    5555
    56 This function setup the environment for the CMS system related to the URL given by the pburl configuration parameter.
     56This function setup the environment for the CMS system related to the URL given by the pbprojurl configuration parameter.
    5757The potential parameter indicates whether we should inititate the context or not.
    5858It sets up environement variables (PBPROJDIR, PBDIR, PBREVISION, PBCMSLOGFILE)
     
    6565my $param = shift;
    6666
    67 my ($pburl) = pb_conf_get("pburl");
    68 pb_log(2,"DEBUG: Project URL of $ENV{'PBPROJ'}: $pburl->{$ENV{'PBPROJ'}}\n");
    69 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
     67my ($pbprojurl) = pb_conf_get("pbprojurl");
     68pb_log(2,"DEBUG: Project URL of $ENV{'PBPROJ'}: $pbprojurl->{$ENV{'PBPROJ'}}\n");
     69my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbprojurl->{$ENV{'PBPROJ'}});
    7070my $vcscmd = pb_vcs_cmd($scheme);
    7171
     
    9494# Check project cms compliance
    9595#
    96 my $turl = "$pburl->{$ENV{'PBPROJ'}}/$tmp";
    97 $turl = $pburl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)|(git)\b/o);
     96my $turl = "$pbprojurl->{$ENV{'PBPROJ'}}/$tmp";
     97$turl = $pbprojurl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)|(git)\b/o);
    9898# git svn is like svn
    99 $turl = "$pburl->{$ENV{'PBPROJ'}}/$tmp"  if ($scheme =~ /^git\+svn/o);
     99$turl = "$pbprojurl->{$ENV{'PBPROJ'}}/$tmp"  if ($scheme =~ /^git\+svn/o);
    100100pb_vcs_compliant(undef,'PBDIR',"$ENV{'PBPROJDIR'}/$tmp",$turl,$pbinit);
    101101
     
    126126    # svnversion more precise than svn info if sbx
    127127    if ((defined $param) && ($param eq "CMS")) {
    128         $tmp = `(LANGUAGE=C $vcscmd info $pburl->{$ENV{'PBPROJ'}} | grep -E '^Revision:' | cut -d: -f2)`;
     128        $tmp = `(LANGUAGE=C $vcscmd info $pbprojurl->{$ENV{'PBPROJ'}} | grep -E '^Revision:' | cut -d: -f2)`;
    129129        $tmp =~ s/\s+//;
    130130    } else {
  • devel/pbtest/bin/pbtest

    r2252 r2284  
    146146  pbconfdir:
    147147    pb : \$ENV{'HOME'}/pb/pbconf
    148   pburl:
     148  pbprojurl:
    149149    pb : svn://svn.project-builder.org/pb
    150   pburl:
     150  pbprojurl:
    151151    mondorescue : svn://svn.mondorescue.org/mondorescue/branches
    152152  sshhost:
     
    236236sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -p $PBPROJ -r 2.5 newproj afio"
    237237
    238 grep -vE '^defpkgdir|^projver|^projtag|^pburl|^pbrepo|^shh' $PBTEST/pb/afio/pbconf/2.5/afio.yml > /tmp/afio.yml
     238grep -vE '^defpkgdir|^projver|^projtag|^pbprojurl|^pbrepo|^shh' $PBTEST/pb/afio/pbconf/2.5/afio.yml > /tmp/afio.yml
    239239cat >> /tmp/afio.yml << EOF
    240240  defpkgdir:
     
    244244  projtag:
    245245    afio : 1
    246   pburl:
     246  pbprojurl:
    247247    afio : ftp://ftp.project-builder.org/src/afio-2.5.tar.gz
    248248  pbrepo:
     
    401401fi
    402402
    403 sudopbtest "pb -p $PBPROJ getconf pburl"
     403sudopbtest "pb -p $PBPROJ getconf pbprojurl"
    404404# test also with pb
    405 sudopbtest "pb -p pb -r devel getconf pburl"
     405sudopbtest "pb -p pb -r devel getconf pbprojurl"
    406406sudopbtest "pb -p pb -r devel sbx2pkg"
    407407sudopbtest "pb -p pb build2ssh"
Note: See TracChangeset for help on using the changeset viewer.