Changeset 2284 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Sep 4, 2017, 1:21:15 PM (7 years ago)

Author:

Bruno Cornec

Message:

Now uses pbprojurl instead of pburl to be consistent with pbconfurl

File:

• devel/pb/bin/pb (modified) (5 diffs)

devel/pb/bin/pb

@@ -503 +503 @@
  # Url of the project
  #
-  pburl:
+  pbprojurl:
     linuxcoe : cvs+ssh://:ext:bcornec@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe
  
@@ -538 +538 @@
     mondorescue: $ENV{'HOME'}/mondo/svn/pbconf
  
- # pbdir points to the directory where the CMS content of the pburl is checked out
+ # pbdir points to the directory where the CMS content of the pbprojurl is checked out
  # If not defined, pbdir is under pbdefdir/pbproj
  # Only defined if we have access to the dev of the project
@@ -575 +575 @@
 =item Update your $project.yml configuration file.
 
-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.
+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.
 
 For example:
 
- pburl Lintel = file:///home/anderse/projects/Lintel-0.2012.02.28.tar.gz
+ pbprojurl Lintel = file:///home/anderse/projects/Lintel-0.2012.02.28.tar.gz
  pbrepo Lintel = http://tesla.hpl.hp.com/opensource
  pbwf Lintel = 1
@@ -3542 +3542 @@
     my ($scheme2,$uri) = pb_cms_init($pbinit);
 
-    my ($pbconf,$pburl) = pb_conf_get("pbconfurl","pburl");
+    my ($pbconf,$pbprojurl) = pb_conf_get("pbconfurl","pbprojurl");
     $uri = $pbconf->{$ENV{'PBPROJ'}};
     my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
 
     # Checking CMS repositories status
-    ($scheme2, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
+    ($scheme2, $account, $host, $port, $path) = pb_get_uri($pbprojurl->{$ENV{'PBPROJ'}});
 
     if ($scheme !~ /^svn/) {
@@ -3579 +3579 @@
 
     # Duplicate and extract project
-    my $newurl2 = "$pburl->{$ENV{'PBPROJ'}}/$newver";
-
-    pb_log(2,"Copying $pburl->{$ENV{'PBPROJ'}}/$oldver to $newurl2\n");
-    pb_vcs_copy($scheme2,"$pburl->{$ENV{'PBPROJ'}}/$oldver",$newurl2);
+    my $newurl2 = "$pbprojurl->{$ENV{'PBPROJ'}}/$newver";
+
+    pb_log(2,"Copying $pbprojurl->{$ENV{'PBPROJ'}}/$oldver to $newurl2\n");
+    pb_vcs_copy($scheme2,"$pbprojurl->{$ENV{'PBPROJ'}}/$oldver",$newurl2);
 
     my $tmp = $ENV{'PBDIR'};