Changeset 2169 in ProjectBuilder

Timestamp:

Jan 5, 2017, 2:52:50 AM (8 years ago)

Author:

Bruno Cornec

Message:

Fix #152 by adding support for https scheme in URLs !!

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (8 diffs)
• pb/lib/ProjectBuilder/CMS.pm (modified) (3 diffs)

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

@@ -584 +584 @@
 
     # The repo file can be local or remote. download or copy at the right place
-    if (($scheme eq "ftp") || ($scheme eq "http")) {
+    if (($scheme eq "ftp") || ($scheme =~ /http/)) {
         pb_system("wget -O $ENV{'PBTMP'}/$bn $i","Downloading additional repository file $i");
     } else {

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

@@ -117 +117 @@
 } elsif ($scheme eq "dir") {
     pb_system("cp -r $path $destdir","Copying $uri from DIR to $destdir ");
-} elsif (($scheme eq "http") || ($scheme eq "ftp")) {
+} elsif (($scheme =~ /http/) || ($scheme eq "ftp")) {
     my $f = basename($path);
     unlink "$ENV{'PBTMP'}/$f";
@@ -377 +377 @@
     $newurl = pb_vcs_mod_htftp($newurl,"svn");
     pb_system("$vcscmd copy -m \"Creation of $newurl from $oldurl\" $oldurl $newurl","Copying $oldurl to $newurl ");
-} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
+} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
     # Nothing to do.
 } else {
@@ -412 +412 @@
     $url = pb_vcs_mod_htftp($url,"git");
     pb_system("$vcscmd clone $url $destination","Checking out $url to $destination ");
-} elsif (($scheme eq "ftp") || ($scheme eq "http")) {
+} elsif (($scheme eq "ftp") || ($scheme =~ /http/)) {
     return;
 } elsif ($scheme =~ /^cvs/) {
@@ -456 +456 @@
         pb_system("(cd $d && $vcscmd fetch)", "Updating $d ");
     }
-} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
+} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
     # Nothing to do.
 } else {
@@ -482 +482 @@
 } elsif ($scheme =~ /^git/) {
     pb_system("cd $dir && $vcscmd commit -a -m \"$msg\"", "Checking in $dir ");
-} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
+} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
     # Nothing to do.
 } else {
@@ -508 +508 @@
         pb_vcs_add($scheme,$f) if ($uri !~ /^$scheme/);
     }
-} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
+} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
     # Nothing to do.
 } else {
@@ -530 +530 @@
 if ($scheme =~ /^((hg)|(git)|(svn)|(svk)|(cvs))/o) {
     pb_system("$vcscmd add ".join(' ',@f),"Adding ".join(' ',@f)." to VCS ");
-} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
+} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
     # Nothing to do.
 } else {
@@ -560 +560 @@
         $l++;
     }
-} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
+} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
     $l = 0;
 } else {

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -95 +95 @@
 #
 my $turl = "$pburl->{$ENV{'PBPROJ'}}/$tmp";
-$turl = $pburl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(file)|(git)\b/o);
+$turl = $pburl->{$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);
@@ -120 +120 @@
     $ENV{'PBREVISION'}=$tmp;
     $ENV{'PBCMSLOGFILE'}="git.log";
-} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
+} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
     $ENV{'PBREVISION'}="flat";
     $ENV{'PBCMSLOGFILE'}="flat.log";
@@ -337 +337 @@
         close(CL);
         pb_system("$vcscmd log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from GIT");
-    } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)|(dir)\b/o) {
+    } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)|(dir)\b/o) {
         pb_system("echo ChangeLog for $pkgdir > $dest/ChangeLog","Empty ChangeLog file created");
     } elsif ($scheme =~ /^cvs/) {