- Timestamp:
- Sep 4, 2017, 1:21:15 PM (7 years ago)
- Location:
- devel
- Files:
-
- 4 deleted
- 6 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-doc/pb-demo
r2252 r2284 216 216 projtag: 217 217 afio : 1 218 pb url:218 pbprojurl: 219 219 afio : ftp://localhost/src/afio-2.5.tar.gz 220 220 pbrepo: -
devel/pb-modules/etc/pb.yml.pod
r2283 r2284 633 633 634 634 635 =item B<pb url>636 637 Nature: Optional 638 Key: project (as defined in the -p option or PBPROJ environment variable) 639 Value: B<pb url> 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 DVCS635 =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 640 640 Conffile: home|project 641 Example: pb url linuxcoe = cvs+ssh://:ext:user@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe, pburl pb = svk:////local/pb641 Example: pbprojurl linuxcoe = cvs+ssh://:ext:user@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe, pbprojurl pb = svk:////local/pb 642 642 643 643 =item B<pbusesshagent> -
devel/pb-modules/lib/ProjectBuilder/Env.pm
r2267 r2284 109 109 # 110 110 # We have commit acces to these 111 # pb url:111 # pbprojurl: 112 112 # example: cvs+ssh://user\@example.cvs.sourceforge.net:/cvsroot/example 113 # pb url:113 # pbprojurl: 114 114 # pb: svn+ssh://svn.project-builder.org/mondo/svn/pb 115 115 # … … 212 212 pb_vcs_conf_update_v0("$p->{$ENV{'PBPROJ'}}/.pbrc","$p->{$ENV{'PBPROJ'}}/.pbrc.yml"); 213 213 pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml"); 214 my ($pb url) = pb_conf_get("pburl");215 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pb url->{$ENV{'PBPROJ'}});214 my ($pbprojurl) = pb_conf_get("pbprojurl"); 215 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbprojurl->{$ENV{'PBPROJ'}}); 216 216 #pb_vcs_add_if_not_in($scheme,"$p->{$ENV{'PBPROJ'}}/.pbrc.yml"); 217 217 } … … 465 465 # What is the project URL 466 466 # 467 # pb url:467 # pbprojurl: 468 468 # $ENV{'PBPROJ'}: svn://svn.$ENV{'PBPROJ'}.org/$ENV{'PBPROJ'}/devel 469 469 # $ENV{'PBPROJ'}: svn+ssh://user\@svn.$ENV{'PBPROJ'}.org/$ENV{'PBPROJ'}/devel -
devel/pb-modules/lib/ProjectBuilder/VCS.pm
r2268 r2284 757 757 pb_conf_update_v0($orig,$dest); 758 758 # Adding this new file to VCS (not removing the previous one) 759 my ($pb url) = pb_conf_get("pburl");760 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pb url->{$ENV{'PBPROJ'}});759 my ($pbprojurl) = pb_conf_get("pbprojurl"); 760 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbprojurl->{$ENV{'PBPROJ'}}); 761 761 pb_vcs_add_if_not_in($scheme,$dest); 762 762 } -
devel/pb/bin/pb
r2279 r2284 503 503 # Url of the project 504 504 # 505 pb url:505 pbprojurl: 506 506 linuxcoe : cvs+ssh://:ext:bcornec@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe 507 507 … … 538 538 mondorescue: $ENV{'HOME'}/mondo/svn/pbconf 539 539 540 # pbdir points to the directory where the CMS content of the pb url is checked out540 # pbdir points to the directory where the CMS content of the pbprojurl is checked out 541 541 # If not defined, pbdir is under pbdefdir/pbproj 542 542 # Only defined if we have access to the dev of the project … … 575 575 =item Update your $project.yml configuration file. 576 576 577 You need to set the pb url, 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.577 You 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. 578 578 579 579 For example: 580 580 581 pb url Lintel = file:///home/anderse/projects/Lintel-0.2012.02.28.tar.gz581 pbprojurl Lintel = file:///home/anderse/projects/Lintel-0.2012.02.28.tar.gz 582 582 pbrepo Lintel = http://tesla.hpl.hp.com/opensource 583 583 pbwf Lintel = 1 … … 3542 3542 my ($scheme2,$uri) = pb_cms_init($pbinit); 3543 3543 3544 my ($pbconf,$pb url) = pb_conf_get("pbconfurl","pburl");3544 my ($pbconf,$pbprojurl) = pb_conf_get("pbconfurl","pbprojurl"); 3545 3545 $uri = $pbconf->{$ENV{'PBPROJ'}}; 3546 3546 my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri); 3547 3547 3548 3548 # Checking CMS repositories status 3549 ($scheme2, $account, $host, $port, $path) = pb_get_uri($pb url->{$ENV{'PBPROJ'}});3549 ($scheme2, $account, $host, $port, $path) = pb_get_uri($pbprojurl->{$ENV{'PBPROJ'}}); 3550 3550 3551 3551 if ($scheme !~ /^svn/) { … … 3579 3579 3580 3580 # Duplicate and extract project 3581 my $newurl2 = "$pb url->{$ENV{'PBPROJ'}}/$newver";3582 3583 pb_log(2,"Copying $pb url->{$ENV{'PBPROJ'}}/$oldver to $newurl2\n");3584 pb_vcs_copy($scheme2,"$pb url->{$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); 3585 3585 3586 3586 my $tmp = $ENV{'PBDIR'}; -
devel/pb/lib/ProjectBuilder/CMS.pm
r2169 r2284 54 54 =item B<pb_cms_init> 55 55 56 This function setup the environment for the CMS system related to the URL given by the pb url configuration parameter.56 This function setup the environment for the CMS system related to the URL given by the pbprojurl configuration parameter. 57 57 The potential parameter indicates whether we should inititate the context or not. 58 58 It sets up environement variables (PBPROJDIR, PBDIR, PBREVISION, PBCMSLOGFILE) … … 65 65 my $param = shift; 66 66 67 my ($pb url) = pb_conf_get("pburl");68 pb_log(2,"DEBUG: Project URL of $ENV{'PBPROJ'}: $pb url->{$ENV{'PBPROJ'}}\n");69 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pb url->{$ENV{'PBPROJ'}});67 my ($pbprojurl) = pb_conf_get("pbprojurl"); 68 pb_log(2,"DEBUG: Project URL of $ENV{'PBPROJ'}: $pbprojurl->{$ENV{'PBPROJ'}}\n"); 69 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbprojurl->{$ENV{'PBPROJ'}}); 70 70 my $vcscmd = pb_vcs_cmd($scheme); 71 71 … … 94 94 # Check project cms compliance 95 95 # 96 my $turl = "$pb url->{$ENV{'PBPROJ'}}/$tmp";97 $turl = $pb url->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)|(git)\b/o);96 my $turl = "$pbprojurl->{$ENV{'PBPROJ'}}/$tmp"; 97 $turl = $pbprojurl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)|(git)\b/o); 98 98 # git svn is like svn 99 $turl = "$pb url->{$ENV{'PBPROJ'}}/$tmp" if ($scheme =~ /^git\+svn/o);99 $turl = "$pbprojurl->{$ENV{'PBPROJ'}}/$tmp" if ($scheme =~ /^git\+svn/o); 100 100 pb_vcs_compliant(undef,'PBDIR',"$ENV{'PBPROJDIR'}/$tmp",$turl,$pbinit); 101 101 … … 126 126 # svnversion more precise than svn info if sbx 127 127 if ((defined $param) && ($param eq "CMS")) { 128 $tmp = `(LANGUAGE=C $vcscmd info $pb url->{$ENV{'PBPROJ'}} | grep -E '^Revision:' | cut -d: -f2)`;128 $tmp = `(LANGUAGE=C $vcscmd info $pbprojurl->{$ENV{'PBPROJ'}} | grep -E '^Revision:' | cut -d: -f2)`; 129 129 $tmp =~ s/\s+//; 130 130 } else { -
devel/pbtest/bin/pbtest
r2252 r2284 146 146 pbconfdir: 147 147 pb : \$ENV{'HOME'}/pb/pbconf 148 pb url:148 pbprojurl: 149 149 pb : svn://svn.project-builder.org/pb 150 pb url:150 pbprojurl: 151 151 mondorescue : svn://svn.mondorescue.org/mondorescue/branches 152 152 sshhost: … … 236 236 sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -p $PBPROJ -r 2.5 newproj afio" 237 237 238 grep -vE '^defpkgdir|^projver|^projtag|^pb url|^pbrepo|^shh' $PBTEST/pb/afio/pbconf/2.5/afio.yml > /tmp/afio.yml238 grep -vE '^defpkgdir|^projver|^projtag|^pbprojurl|^pbrepo|^shh' $PBTEST/pb/afio/pbconf/2.5/afio.yml > /tmp/afio.yml 239 239 cat >> /tmp/afio.yml << EOF 240 240 defpkgdir: … … 244 244 projtag: 245 245 afio : 1 246 pb url:246 pbprojurl: 247 247 afio : ftp://ftp.project-builder.org/src/afio-2.5.tar.gz 248 248 pbrepo: … … 401 401 fi 402 402 403 sudopbtest "pb -p $PBPROJ getconf pb url"403 sudopbtest "pb -p $PBPROJ getconf pbprojurl" 404 404 # test also with pb 405 sudopbtest "pb -p pb -r devel getconf pb url"405 sudopbtest "pb -p pb -r devel getconf pbprojurl" 406 406 sudopbtest "pb -p pb -r devel sbx2pkg" 407 407 sudopbtest "pb -p pb build2ssh"
Note:
See TracChangeset
for help on using the changeset viewer.