Ticket #46: project-builder-cms.pm.patch

ProjectBuilder/CMS.pm

@@ -99 +99 @@
 } elsif (($scheme eq "file") || ($scheme eq "ftp") || ($scheme eq "http")) {
     $ENV{'PBREVISION'}="flat";
     $ENV{'PBCMSLOGFILE'}="flat.log";
-} elsif ($scheme =~ /^svn/) {
+} elsif (($scheme =~ /^svn/) || ($scheme eq "https")) {
     # svnversion more precise than svn info
     $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd"version" .)`;
     chomp($tmp);
@@ -149 +149 @@
 my $vcscmd = pb_cms_cmd($scheme);
 $uri = pb_cms_mod_socks($uri);
 
-if ($scheme =~ /^svn/) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^https/)) {
     if (defined $source) {
         if (-d $source) {
             $tmp = $destdir;
@@ -302 +302 @@
 my $void = "";
 my $vcscmd = pb_cms_cmd($scheme);
 
-if ($scheme =~ /^svn/) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^https/)) {
     open(PIPE,"LANGUAGE=C $vcscmd info $dir |") || return("");
     while (<PIPE>) {
         ($void,$res) = split(/^URL:/) if (/^URL:/);
@@ -383 +383 @@
 $oldurl = pb_cms_mod_socks($oldurl);
 $newurl = pb_cms_mod_socks($newurl);
 
-if ($scheme =~ /^svn/) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^https/)) {
     $oldurl = pb_cms_mod_http($oldurl,"svn");
     $newurl = pb_cms_mod_http($newurl,"svn");
     pb_system("$vcscmd copy -m \"Creation of $newurl from $oldurl\" $oldurl $newurl","Copying $oldurl to $newurl ");
@@ -409 +409 @@
 my $vcscmd = pb_cms_cmd($scheme);
 $url = pb_cms_mod_socks($url);
 
-if ($scheme =~ /^svn/) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^https/)) {
     $url = pb_cms_mod_http($url,"svn");
     pb_system("$vcscmd co $url $destination","Checking out $url to $destination ");
 } elsif ($scheme =~ /^svk/) {
@@ -459 +459 @@
 my $dir = shift;
 my $vcscmd = pb_cms_cmd($scheme);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/) || ($scheme =~ /^https/)) {
     pb_system("$vcscmd up $dir","Updating $dir ");
 } elsif ($scheme eq "flat") {
 } else {
@@ -486 +486 @@
 my $msg = "updated to $ver";
 $msg = "Project $ENV{PBPROJ} creation" if (defined $pbinit);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/) || ($scheme =~ /^https/)) {
     pb_system("cd $dir ; $vcscmd ci -m \"$msg\" .","Checking in $dir ");
 } elsif ($scheme eq "flat") {
 } else {
@@ -508 +508 @@
 my $f = shift;
 my $vcscmd = pb_cms_cmd($scheme);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/) || ($scheme =~ /^https/)) {
     pb_system("$vcscmd add $f","Adding $f to VCS ");
 } elsif ($scheme eq "flat") {
 } else {
@@ -530 +530 @@
 my $dir =shift;
 my $vcscmd = pb_cms_cmd($scheme);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/) || ($scheme =~ /^https/)) {
     open(PIPE,"$vcscmd diff $dir |") || die "Unable to get $vcscmd diff from $dir";
     my $l = 0;
     while (<PIPE>) {
@@ -775 +775 @@
     }
 }
 
-if ($scheme =~ /^svn/) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^https/)){
     if (! -f "$dest/ChangeLog") {
         # In case we have no network, just create an empty one before to allow correct build
         open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
@@ -862 +862 @@
     return($cmd."hg")
 } elsif ($scheme =~ /git/) {
     return($cmd."git")
-} elsif ($scheme =~ /svn/) {
-    return($cmd."svn")
+} elsif (($scheme =~ /svn/) || ($scheme =~ /https/)) {
+        return($cmd."svn")
 } elsif ($scheme =~ /svk/) {
     return($cmd."svk")
 } elsif ($scheme =~ /cvs/) {