Changeset 318

Timestamp:

02/10/08 16:37:43 (5 years ago)

Author:

bruno

Message:

First success with collectl

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• lib/ProjectBuilder/Base.pm (modified) (21 diffs)

devel/pb/bin/pb

@@ -23 +23 @@
 use ProjectBuilder::Distribution qw (pb_distro_init);
 use ProjectBuilder::Version qw (pb_version_init);
-use ProjectBuilder::Base qw (pb_conf_read pb_conf_get pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_filter_file_inplace pb_cms_export pb_cms_log pb_cms_isdiff pb_cms_copy pb_cms_checkout pb_get_date pb_log pb_log_init pb_get_pkg);
+use ProjectBuilder::Base;
 
 my %opts;                   # CLI Options
@@ -36 +36 @@
 my %pbtag;                  # per package
 my $pbrev;                  # Global REVISION variable
-my @date=pb_get_date();
+my @date = pb_get_date();
 my $pbdate = strftime("%Y-%m-%d", @date);
-my $debug = 0;
 my $pbaccount;              # Login to use to connect to the VM
 my $pbport;                 # Port to use to connect to the VM
 my $newver;                 # New version to create
 my $iso;                    # ISO iage for the VM to create
-my $LOG = \*STDOUT;
 
 getopts('a:hi:l:m:P:p:qr:s:tvV:',\%opts);
@@ -53 +51 @@
 }
 if (defined $opts{'v'}) {
-    $debug++;
+    $debug = 2;
+    #$debug = $opts{'v'};
+    pb_log(0,"Debug value: $debug\n");
 }
 if (defined $opts{'q'}) {

devel/pb/lib/ProjectBuilder/Base.pm

@@ -5 +5 @@
 # $Id$
 #
+
+package ProjectBuilder::Base;
 
 use strict;
@@ -11 +13 @@
 use File::Path;
 use File::Copy;
-use File::Temp qw /tempdir/;
+use File::Temp qw(tempdir);
 use Data::Dumper;
 use POSIX qw(strftime);
+use Time::localtime qw(localtime);
 
 use ProjectBuilder::Changelog qw (pb_changelog);
 
+# Inherit from the "Exporter" module which handles exporting functions.
+ 
+use Exporter;
+ 
+# Export, by default, all the functions into the namespace of
+# any code which uses this module.
+ 
+our $debug = 0;
+our $LOG = \*STDOUT;
+
+our @ISA = qw(Exporter);
+our @EXPORT = qw(pb_env_init pb_conf_read pb_conf_get pb_conf_get_if pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_filter_file_inplace pb_cms_export pb_cms_log pb_cms_isdiff pb_cms_copy pb_cms_checkout pb_get_date pb_log pb_log_init pb_get_pkg $debug $LOG);
+
 $ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
-
-my $debug = 0;
-my $LOG = \*STDOUT;
 
 sub pb_env_init {
@@ -53 +66 @@
     if (defined $proj) {
         pb_log(0,"WARNING: using $proj as default project as none has been specified\n");
-        pb_log(0,"Please create a pbconf reference for project $proj in $ENV{'PBETC'}\nif you want to use another project\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");
     }
 }
@@ -60 +74 @@
 # That's always the environment variable that will be used
 $ENV{'PBPROJ'} = $proj;
+pb_log(2,"PBPROJ: $ENV{'PBPROJ'}\n");
 
 if (not defined ($pbconf{$ENV{'PBPROJ'}})) {
@@ -103 +118 @@
     if ((not defined $pbdir) || (not defined $pbdir{$ENV{'PBPROJ'}})) {
         pb_log(0,"WARNING: no pbdir defined, using /var/cache\n");
-        pb_log(0,"Please create a pbdir reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\nif you want to use another directory\n");
+        pb_log(0,"         Please create a pbdir reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n");
+        pb_log(0,"         if you want to use another directory\n");
         $ENV{'PBDIR'} = "/var/cache";
     } else {
@@ -113 +129 @@
 eval { $ENV{'PBDIR'} =~ s/(\$ENV.+\})/$1/eeg };
 
+pb_log(2,"PBDIR: $ENV{'PBDIR'}\n");
 #
 # Set delivery directory
@@ -118 +135 @@
 $ENV{'PBDESTDIR'}="$ENV{'PBDIR'}/$ENV{'PBPROJ'}/delivery";
 
+pb_log(2,"PBDESTDIR: $ENV{'PBDESTDIR'}\n");
 #
 # Removes all directory existing below the delivery dir 
@@ -146 +164 @@
 }
 
+pb_log(2,"PBBUILDDIR: $ENV{'PBBUILDDIR'}\n");
 #
 # Set temp directory
@@ -153 +172 @@
 }
 $ENV{'PBTMP'} = tempdir( "pb.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => 1 );
+pb_log(2,"PBTMP: $ENV{'PBTMP'}\n");
 
 #
@@ -158 +178 @@
 #
 $ENV{'PBCONF'} = "$ENV{'PBDIR'}/$ENV{'PBPROJ'}/pbconf";
+pb_log(2,"PBCONF: $ENV{'PBCONF'}\n");
 
 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbconf{$ENV{'PBPROJ'}});
 
-if ((not -d "$ENV{'PBCONF'}") || (defined $pbinit)) {
+if ((! -d "$ENV{'PBCONF'}") || (defined $pbinit)) {
     pb_log(1,"Checking out pbconf\n");
     pb_cms_checkout($scheme,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
@@ -167 +188 @@
     pb_log(1,"pbconf found, checking content\n");
     my $cmsurl = pb_cms_getinfo($scheme,$ENV{'PBCONF'},"URL:");
-    if ($cmsurl !~ /^$scheme/) {
-        pb_log(1,"Content irrelevant, cleaning up and checking it out\n");
+    my ($scheme2, $account2, $host2, $port2, $path2) = pb_get_uri($cmsurl);
+    if ($scheme2 ne $scheme) {
+        pb_log(1,"WARNING: Content of $ENV{'PBCONF'} irrelevant, cleaning up and checking it out\n");
         pb_rm_rf("$ENV{'PBCONF'}");
         pb_cms_checkout($scheme,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
@@ -174 +196 @@
         # The local content doesn't correpond to the repository
         pb_log(0,"ERROR: Inconsistency detected:\n");
-        pb_log(0,"* $ENV{'PBCONF'} refers to $cmsurl but\n");
-        pb_log(0,"* $ENV{'PBETC'} refers to $pbconf{$ENV{'PBPROJ'}}\n");
+        pb_log(0,"       * $ENV{'PBCONF'} refers to $cmsurl but\n");
+        pb_log(0,"       * $ENV{'PBETC'} refers to $pbconf{$ENV{'PBPROJ'}}\n");
         die "Project $ENV{'PBPROJ'} is not Project-Builder compliant.";
     } else {
@@ -194 +216 @@
                           = stat($d);
             # Keep the most recent
+            pb_log(2,"Looking at $d: $mtime\n");
             if ($mtime > $maxmtime) {
                 $ENV{'PBROOT'} = "$ENV{'PBCONF'}/$d";
@@ -202 +225 @@
         die "No directory found under $ENV{'PBCONF'}" if (not defined $ENV{'PBROOT'});
         pb_log(0,"WARNING: no pbroot defined, using $ENV{'PBROOT'}\n");
-        pb_log(0,"Please use -r release if you want to use another release\n");
+        pb_log(0,"         Please use -r release if you want to use another release\n");
     } else {
         my ($pbroot) = pb_conf_read_if("$ENV{'PBDESTDIR'}/pbrc","pbroot");
@@ -848 +871 @@
 
 # Everything is returned via ptr1
-my @ptr1 = pb_conf_read_if("$ENV{'PBETC'}", @param);
-my @ptr2 = pb_conf_read_if("$ENV{'PBROOT'}/$ENV{'PBPROJ'}.pb", @param);
+my @ptr1 = ();
+my @ptr2 = ();
+@ptr1 = pb_conf_read_if("$ENV{'PBETC'}", @param) if (defined $ENV{'PBETC'});
+@ptr2 = pb_conf_read_if("$ENV{'PBROOT'}/$ENV{'PBPROJ'}.pb", @param) if ((defined $ENV{'PBROOT'}) and (defined $ENV{'PBPROJ'}));
 
 my $p1;
@@ -938 +963 @@
 my $uri = shift || undef;
 
+pb_log(2,"DEBUG: uri:$uri\n");
 # A URL has the format protocol://[ac@]host[:port][path[?query][#fragment]].
 # Cf man URI
 my ($scheme, $authority, $path, $query, $fragment) =
-         $uri =~ m|(?:([^:/?#]+):)?(?://([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?|;
-my ($account,$host,$port) = $authority =~ m|(?:([^\@]+)\@)?([^:]+)(:(?:[0-9]+))?|;
+         $uri =~ m|(?:([^:/?#]+):)?(?://([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?| if (defined $uri);
+my ($account,$host,$port) = $authority =~ m|(?:([^\@]+)\@)?([^:]+)(:(?:[0-9]+))?| if (defined $authority);
+
+$scheme = "" if (not defined $scheme);
+$authority = "" if (not defined $authority);
+$path = "" if (not defined $path);
+$account = "" if (not defined $account);
+$host = "" if (not defined $host);
+$port = "" if (not defined $port);
+
 pb_log(2,"DEBUG: scheme:$scheme ac:$account host:$host port:$port path:$path\n");
 return($scheme, $account, $host, $port, $path);
@@ -986 +1020 @@
     # Try to make it easy for us
     #pb_log(2,"WARNING: Assuming a local project under $ENV{'PBDIR'}/$ENV{'PBPROJ'}:\n");
-    #pb_log(2,"If not, pleaase setup a pbproj entry in $ENV{'PBROOT'}/$ENV{'PBPROJ'}.pb\n");
+    #pb_log(2,"         If not, pleaase setup a pbproj entry in $ENV{'PBROOT'}/$ENV{'PBPROJ'}.pb\n");
     #return("");
 #}
@@ -1107 +1141 @@
 
 sub pb_cms_getinfo {
+
 my $scheme = shift;
 my $dir = shift;
@@ -1119 +1154 @@
         ($void,$res) = split(/^$info/) if (/^$info/);
     }
+    $res =~ s/^\s*//;
     close(PIPE);
     chomp($res);
@@ -1126 +1162 @@
     die "cms $scheme unknown";
 }
+pb_log(2,"Found CMS info: $res\n");
 return($res);
 }
@@ -1378 +1415 @@
 my $msg = shift;
 
-print $LOG "$msg\n" if ($dlevel <= $debug);
+print $LOG "$msg" if ($dlevel <= $debug);
 }