Changeset 319 in ProjectBuilder

Timestamp:

Feb 10, 2008, 7:31:25 PM (16 years ago)

Author:

Bruno Cornec

Message:

pb_cms_export ready to host the real stuff for file.

Location:

devel/pb

Files:

• bin/pb (modified) (2 diffs)
• lib/ProjectBuilder/Base.pm (modified) (10 diffs)

devel/pb/bin/pb

@@ -189 +189 @@
 
         $pbrev = $ENV{'PBREVISION'};
-        pb_log(2,"\n");
-        pb_log(2,"Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n");
+        pb_log(0,"\n");
+        pb_log(0,"Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n");
         die "Unable to get env var PBDESTDIR" if (not defined $ENV{'PBDESTDIR'});
         # Clean up dest if necessary. The export will recreate it
@@ -206 +206 @@
 
         # If it isn't a flat CMS, then we have the choice to export subdir
-        $dir = "$uri/$dir" if ($ENV{'PBREVISION'} ne "flat");
-        pb_cms_export($scheme,"$dir",$dest);
+        #$dir = "$uri/$dir" if ($ENV{'PBREVISION'} ne "flat");
+        pb_cms_export($uri,"$dir",$dest);
 
         # Get project info on authors and log file

devel/pb/lib/ProjectBuilder/Base.pm

@@ -67 +67 @@
         pb_log(0,"WARNING: using $proj as default project as none has been specified\n");
         pb_log(0,"         Please either create a pbconf reference for project $proj in $ENV{'PBETC'}\n");
-        pb_log(0,"         or call pb with the -p project option if you want to use another project\n");
+        pb_log(0,"         or call pb with the -p project option or use the env var PBPROJ\n");
+        pb_log(0,"         if you want to use another project\n");
     }
 }
@@ -93 +94 @@
 #  ---------------------------------------------                ----------
 #  *      *        |       |        |          |                *        *
-# 1.0    dev    pbconf    ...     build     delivery PBCONF    1.0      dev                   PBDEVROOT
-#                  |                           |     PBDESTDIR
-#               ------                        pbrc   PBBUILDDIR
-#               |    |       
-#              1.0  dev                              PBROOT
+# 1.0    dev    pbconf    ...     build     delivery PBCONF    dev      tag                   PBDEVROOT
+#                  |                           |     PBDESTDIR           |
+#               ------                        pbrc   PBBUILDDIR       -------
+#               |    |                                                |     |
+#              dev  tag                              PBROOT          1.0   1.1
 #                    |
+#                 -------
+#                 |     |
+#                1.0   1.1
+#                       |
 #               ----------------------------------
 #               |          |           |         |
@@ -307 +312 @@
 #pbproj $ENV{'PBPROJ'} = ftp://ftp.$ENV{'PBPROJ'}.org/src/$ENV{'PBPROJ'}-devel.tar.gz
 #pbproj $ENV{'PBPROJ'} = file:///src/$ENV{'PBPROJ'}-devel.tar.gz
+#pbproj $ENV{'PBPROJ'} = dir:///src/$ENV{'PBPROJ'}-devel
 
 #
@@ -375 +381 @@
             print CONF << "EOF";
 # Hash of default package/package directory
-#defpkgdir pkg1 = pkg1dir
+#defpkgdir $pp = dir-$pp
 EOF
         }
@@ -381 +387 @@
         print CONF << "EOF";
 # Hash of additional package/package directory
-#extpkgdir minor-pkg = minor-pkg-dir
+#extpkgdir minor-pkg = dir-minor-pkg
 
 # List of files per pkg on which to apply filters
@@ -818 +824 @@
 my $cmt=shift || $cmd;
 
-pb_log(2,"$cmt... ");
+pb_log(0,"$cmt... ");
 #system("$cmd 2>&1 > $ENV{'PBTMP'}/system.log");
 system($cmd);
 if ($? == -1) {
-    pb_log(2,"failed to execute ($cmd) : $!\n");
+    pb_log(0,"failed to execute ($cmd) : $!\n");
     pb_display_file("$ENV{'PBTMP'}/system.log");
 } elsif ($? & 127) {
-    pb_log(2, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n");
+    pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n");
     pb_display_file("$ENV{'PBTMP'}/system.log");
 } elsif ($? == 0) {
-    pb_log(2,"OK\n");
+    pb_log(0,"OK\n");
 } else {
-    pb_log(2, "child ($cmd) exited with value ".($? >> 8)."\n");
+    pb_log(0, "child ($cmd) exited with value ".($? >> 8)."\n");
     pb_display_file("$ENV{'PBTMP'}/system.log");
 }
@@ -1034 +1040 @@
 sub pb_cms_export {
 
-my $scheme = shift;
+my $uri = shift;
 my $source = shift;
 my $destdir = shift;
@@ -1041 +1047 @@
 
 my @date = pb_get_date();
+# If it's not flat, then we have a real uri as source
+my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
 
 if ($scheme eq "svn") {
@@ -1049 +1057 @@
     }
     pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp");
-} elsif ($scheme eq "flat") {
+} elsif ($scheme eq "dir") {
     if (-d $source) {
         $tmp = $destdir;
@@ -1056 +1064 @@
     }
     pb_system("cp -a $source $tmp","Exporting $source from DIR to $tmp");
+} elsif (($scheme eq "http") || ($scheme eq "ftp")) {
+    my $f = basename($path);
+    unlink "$ENV{'PBTMP'}/$f";
+    if (-x "/usr/bin/wget") {
+        pb_system("/usr/bin/wget -nv -O $ENV{'PBTMP'}/$f $uri","Downloading $uri with wget to $ENV{'PBTMP'}/$f\n");
+    } elsif (-x "/usr/bin/curl") {
+        pb_system("/usr/bin/curl $uri -o $ENV{'PBTMP'}/$f","Downloading $uri with curl to $ENV{'PBTMP'}/$f\n");
+    } else {
+        die "Unable to download $uri.\nNo wget/curl available, please install one of those";
+    }
+    pb_cms_export("file://$ENV{'PBTMP'}/$f",$source,$destdir);
+} elsif ($scheme eq "file") {
+    use File::MimeInfo; 
+    my $mm = mimetype($path);
+    pb_log(2,"mimetype: $mm\n");
+
+    if ($mm =~ /\/x-bzip-compressed-tar$/) {
+        # tar+bzip2
+    } elsif ($mm =~ /\/x-lzma-compressed-tar$/) {
+        # tar+lzma
+    } elsif ($mm =~ /\/x-compressed-tar$/) {
+        # tar+gzip
+    } elsif ($mm =~ /\/x-tar$/) {
+        # tar
+    } elsif ($mm =~ /\/zip$/) {
+        # zip
+    }
+    pb_log(0,"scheme file not implemented yet\n");
 } elsif ($scheme eq "cvs") {
     my $dir=dirname($destdir);