Changeset 2284 in ProjectBuilder for devel/pb/lib/ProjectBuilder/CMS.pm

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/lib/ProjectBuilder/CMS.pm (modified) (4 diffs)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -54 +54 @@
 =item B<pb_cms_init>
 
-This function setup the environment for the CMS system related to the URL given by the pburl configuration parameter.
+This function setup the environment for the CMS system related to the URL given by the pbprojurl configuration parameter.
 The potential parameter indicates whether we should inititate the context or not.
 It sets up environement variables (PBPROJDIR, PBDIR, PBREVISION, PBCMSLOGFILE) 
@@ -65 +65 @@
 my $param = shift;
 
-my ($pburl) = pb_conf_get("pburl");
-pb_log(2,"DEBUG: Project URL of $ENV{'PBPROJ'}: $pburl->{$ENV{'PBPROJ'}}\n");
-my ($scheme, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
+my ($pbprojurl) = pb_conf_get("pbprojurl");
+pb_log(2,"DEBUG: Project URL of $ENV{'PBPROJ'}: $pbprojurl->{$ENV{'PBPROJ'}}\n");
+my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbprojurl->{$ENV{'PBPROJ'}});
 my $vcscmd = pb_vcs_cmd($scheme);
 
@@ -94 +94 @@
 # Check project cms compliance
 #
-my $turl = "$pburl->{$ENV{'PBPROJ'}}/$tmp";
-$turl = $pburl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)|(git)\b/o);
+my $turl = "$pbprojurl->{$ENV{'PBPROJ'}}/$tmp";
+$turl = $pbprojurl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)|(git)\b/o);
 # git svn is like svn
-$turl = "$pburl->{$ENV{'PBPROJ'}}/$tmp"  if ($scheme =~ /^git\+svn/o);
+$turl = "$pbprojurl->{$ENV{'PBPROJ'}}/$tmp"  if ($scheme =~ /^git\+svn/o);
 pb_vcs_compliant(undef,'PBDIR',"$ENV{'PBPROJDIR'}/$tmp",$turl,$pbinit);
 
@@ -126 +126 @@
     # svnversion more precise than svn info if sbx
     if ((defined $param) && ($param eq "CMS")) {
-        $tmp = `(LANGUAGE=C $vcscmd info $pburl->{$ENV{'PBPROJ'}} | grep -E '^Revision:' | cut -d: -f2)`;
+        $tmp = `(LANGUAGE=C $vcscmd info $pbprojurl->{$ENV{'PBPROJ'}} | grep -E '^Revision:' | cut -d: -f2)`;
         $tmp =~ s/\s+//;
     } else {