Changeset 2312 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

Timestamp:

Sep 6, 2017, 9:08:46 PM (7 years ago)

Author:

Bruno Cornec

Message:

pb_cms_init becomes pb_vcs_init to be used in env_init

File:

• devel/pb-modules/lib/ProjectBuilder/VCS.pm (modified) (3 diffs)

devel/pb-modules/lib/ProjectBuilder/VCS.pm

@@ -36 +36 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_vcs_export pb_vcs_get_uri pb_vcs_copy pb_vcs_checkout pb_vcs_up pb_vcs_checkin pb_vcs_isdiff pb_vcs_add pb_vcs_add_if_not_in pb_vcs_cmd pb_vcs_compliant pb_vcs_conf_update_v0);
+our @EXPORT = qw(pb_vcs_init pb_vcs_export pb_vcs_get_uri pb_vcs_copy pb_vcs_checkout pb_vcs_up pb_vcs_checkin pb_vcs_isdiff pb_vcs_add pb_vcs_add_if_not_in pb_vcs_cmd pb_vcs_compliant pb_vcs_conf_update_v0);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -52 +52 @@
 
 =over 4
+
+
+=item B<pb_vcs_init>
+
+This function setup the environment for the VCS 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) 
+
+=cut
+
+sub pb_vcs_init {
+
+my $pbinit = shift;
+my $param = shift;
+
+my ($pbprojurl) = pb_conf_get("pbprojurl");
+confess "Undefined pbprojurl for $ENV{'PBPROJ'}\n" if ((not defined $pbprojurl) or (not defined $pbprojurl->{$ENV{'PBPROJ'}}));
+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);
+
+my ($pbprojdir) = pb_conf_get_if("pbprojdir");
+
+if ((defined $pbprojdir) && (defined $pbprojdir->{$ENV{'PBPROJ'}})) {
+    $ENV{'PBPROJDIR'} = $pbprojdir->{$ENV{'PBPROJ'}};
+} else {
+    $ENV{'PBPROJDIR'} = "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";
+}
+# Expand potential env variable in it to allow string replacement
+eval { $ENV{'PBPROJDIR'} =~ s/(\$ENV.+\})/$1/eeg };
+
+
+# Computing the default dir for PBDIR.
+# what we have is PBPROJDIR so work from that.
+# Tree identical between PBCONFDIR and PBROOTDIR on one side and
+# PBPROJDIR and PBDIR on the other side.
+
+my $tmp = $ENV{'PBROOTDIR'};
+$tmp =~ s|^$ENV{'PBCONFDIR'}/||;
+# If no subdir, then replace again
+$tmp =~ s|^$ENV{'PBCONFDIR'}||;
+
+#
+# Check project cms compliance
+#
+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 = "$pbprojurl->{$ENV{'PBPROJ'}}/$tmp"  if ($scheme =~ /^git\+svn/o);
+pb_vcs_compliant(undef,'PBDIR',"$ENV{'PBPROJDIR'}/$tmp",$turl,$pbinit);
+
+
+if ($scheme =~ /^hg/) {
+    $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd identify )`;
+    chomp($tmp);
+    $tmp =~ s/^.* //;
+    $ENV{'PBREVISION'}=$tmp;
+    $ENV{'PBCMSLOGFILE'}="hg.log";
+} elsif ($scheme =~ /^git/) {
+    if ($scheme =~ /svn/) {
+        $tmp = `(cd "$ENV{'PBDIR'}" ; LANGUAGE=C $vcscmd info | grep -E '^Revision:' | cut -d: -f2)`;
+        $tmp =~ s/\s+//;
+    } else {
+        $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd log | head -1 | cut -f2)`;
+        $tmp =~ s/^.* //;
+        # Reduce length of commit id to 8 digit
+        $tmp = substr($tmp,1,8);
+    }
+    chomp($tmp);
+    $ENV{'PBREVISION'}=$tmp;
+    $ENV{'PBCMSLOGFILE'}="git.log";
+} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
+    $ENV{'PBREVISION'}="flat";
+    $ENV{'PBCMSLOGFILE'}="flat.log";
+} elsif ($scheme =~ /^svn/) {
+    # svnversion more precise than svn info if sbx
+    if ((defined $param) && ($param eq "CMS")) {
+        $tmp = `(LANGUAGE=C $vcscmd info $pbprojurl->{$ENV{'PBPROJ'}} | grep -E '^Revision:' | cut -d: -f2)`;
+        $tmp =~ s/\s+//;
+    } else {
+        $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd"version" .)`;
+    }
+    chomp($tmp);
+    $ENV{'PBREVISION'}=$tmp;
+    $ENV{'PBCMSLOGFILE'}="svn.log";
+} elsif ($scheme =~ /^svk/) {
+    $tmp = `(cd "$ENV{'PBDIR'}" ; LANGUAGE=C $vcscmd info . | grep -E '^Revision:' | cut -d: -f2)`;
+    $tmp =~ s/\s+//;
+    chomp($tmp);
+    $ENV{'PBREVISION'}=$tmp;
+    $ENV{'PBCMSLOGFILE'}="svk.log";
+} elsif ($scheme =~ /^cvs/) {
+    # Way too slow
+    #$ENV{'PBREVISION'}=`(cd "$ENV{'PBROOTDIR'}" ; cvs rannotate  -f . 2>&1 | awk '{print \$1}' | grep -E '^[0-9]' | cut -d. -f2 |sort -nu | tail -1)`;
+    #chomp($ENV{'PBREVISION'});
+    $ENV{'PBREVISION'}="cvs";
+    $ENV{'PBCMSLOGFILE'}="cvs.log";
+    $ENV{'CVS_RSH'} = "ssh" if ($scheme =~ /ssh/);
+} else {
+    die "cms $scheme unknown";
+}
+
+pb_log(1,"pb_vcs_init returns $scheme,$pbprojurl->{$ENV{'PBPROJ'}}\n");
+return($scheme,$pbprojurl->{$ENV{'PBPROJ'}});
+}
+
 
 =item B<pb_vcs_export>
@@ -660 +766 @@
 The second parameter is the environment variable this key will populate.
 The third parameter is the location of the pbconf dir.
-The fourth parameter is the URI of the CMS content related to the pbconf dir.
+The fourth parameter is the URI of the VCS content related to the pbconf dir.
 The fifth parameter indicates whether we should inititate the context or not.