Changeset 13

Timestamp:

07/30/07 13:32:55 (6 years ago)

Author:

bruno

Message:

Deal with rpm build process

Location:

devel

Files:

• pb/bin/pb.pl (modified) (3 diffs)
• pb/lib/common.pm (modified) (2 diffs)
• pb/lib/distro.pm (modified) (5 diffs)
• pbconf/pb (added)
• pbconf/pb/rpm (added)

devel/pb/bin/pb.pl

@@ -15 +15 @@
 use Data::Dumper;
 use English;
+use Time::localtime qw(localtime);
+use POSIX qw(strftime);
 
 use lib qw (lib etc);
@@ -127 +129 @@
             print " OK\n";
         }
+        my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
+        my $pbdate = strftime("%Y-%m-%d", @date);
+
         open(D,"$ENV{'PBCONF'}/DISTROS") || die "Unable to find $ENV{'PBCONF'}/DISTROS\n";
         while (<D>) {
@@ -135 +140 @@
             my ($ddir, $dver, $dfam, $dtype, $dsuf) = distro_init($dir,$ver);
             #print Dumper($ddir, $dver, $dfam, $dtype, $dsuf);
+            #print "Filtering DDD => $pbdate, TTT => $tag, RRR => $tag$dsuf, VVV => $v\n";
+
+            # Filter build files from the most precise up to the less
+            # Filter all files found, keeping the name, and generating in dest
+            my @bfiles;
+            print "dir: $ENV{'PBCONF'}/$p/$ddir-$dver\n";
+            if (-d "$ENV{'PBCONF'}/$p/$ddir-$dver") {
+                opendir(BDIR,"$ENV{'PBCONF'}/$p/$ddir-$dver" || die "Unable to open dir $ENV{'PBCONF'}/$p/$ddir-$dver: $!");
+                @bfiles = grep { ! /^\./ && -f "$ENV{'PBCONF'}/$p/$ddir-$dver/$_" } readdir(BDIR);
+                closedir(BDIR);
+            } elsif (-d "$ENV{'PBCONF'}/$p/$ddir") {
+                opendir(BDIR,"$ENV{'PBCONF'}/$p/$ddir" || die "Unable to open dir $ENV{'PBCONF'}/$p/$ddir: $!");
+                @bfiles = grep { ! /^\./ && -f "$ENV{'PBCONF'}/$p/$ddir/$_" } readdir(BDIR);
+                closedir(BDIR);
+            } elsif (-d "$ENV{'PBCONF'}/$p/$dfam") {
+                opendir(BDIR,"$ENV{'PBCONF'}/$p/$dfam" || die "Unable to open dir $ENV{'PBCONF'}/$p/$dfam: $!");
+                @bfiles = grep { ! /^\./ && -f "$ENV{'PBCONF'}/$p/$dfam/$_" } readdir(BDIR);
+                closedir(BDIR);
+            } elsif (-d "$ENV{'PBCONF'}/$p/$dtype") {
+                opendir(BDIR,"$ENV{'PBCONF'}/$p/$dtype" || die "Unable to open dir $ENV{'PBCONF'}/$p/$dtype: $!");
+                @bfiles = grep { ! /^\./ && -f "$ENV{'PBCONF'}/$p/$dtype/$_" } readdir(BDIR);
+                closedir(BDIR);
+            } else {
+                print "No Build Files found for $ddir-$dver\n";
+                next;
+            }
+
         }
         close(D);
+
     }
 } else {

devel/pb/lib/common.pm

@@ -18 +18 @@
 use Data::Dumper;
 
-$ENV{'PBCONF'} = "/etc/pb";
+$ENV{'PBETC'} = "/etc/pb";
 
 sub env_init {
@@ -38 +38 @@
 # Use project configuration file
 #
-pb_init("$ENV{'PBCONF'}/$proj.pb");
+pb_init("$ENV{'PBETC'}/$proj.pb");
 
 #
 # Check content
 #
-die "PBROOT doesn't exist in $ENV{'PBCONF'}/$proj.pb" if (not (defined $ENV{'PBROOT'}));
-die "defpkgdir doesn't exist in $ENV{'PBCONF'}/$proj.pb" if (not (defined %defpkgdir));
+die "PBROOT doesn't exist in $ENV{'PBETC'}/$proj.pb" if (not (defined $ENV{'PBROOT'}));
+die "defpkgdir doesn't exist in $ENV{'PBETC'}/$proj.pb" if (not (defined %defpkgdir));
 
 #

devel/pb/lib/distro.pm

@@ -23 +23 @@
 ($ddir, $dver) = distro_get() if ((not defined $ddir) || (not defined $dver));
 
+# There shold be unicity of names between ddir dfam and dtype
+# In case of duplicate, bad things can happen
 if (($ddir =~ /debian/) ||
     ($ddir =~ /ubuntu/)) {
-    $dfam="debian";
+    $dfam="du";
     $dtype="deb";
     $dsuf=".$ddir$dver";
 } elsif ($ddir =~ /gentoo/) {
-    $dfam="gentoo";
+    $dfam="gen";
     $dtype="ebuild";
     my $dver1 = $dver;
@@ -35 +37 @@
     $dsuf=".$ddir$dver1";
 } elsif ($ddir =~ /slackware/) {
-    $dfam="slackware";
+    $dfam="slack";
     $dtype="tgz";
     $dsuf=".$dfam$dver";
 } elsif (($ddir =~ /suse/) ||
         ($ddir =~ /sles/)) {
-    $dfam="suse";
+    $dfam="novell";
     $dtype="rpm";
     $dsuf=".$ddir$dver";
@@ -47 +49 @@
         ($ddir =~ /fedora/) ||
         ($ddir =~ /centos/)) {
-    $dfam="redhat";
+    $dfam="rh";
     $dtype="rpm";
     my $dver1 = $dver;
@@ -60 +62 @@
 } elsif (($ddir =~ /mandrake/) ||
         ($ddir =~ /mandriva/)) {
-    $dfam="mandriva";
+    $dfam="md";
     $dtype="rpm";
     if ($ddir =~ /mandrake/) {
@@ -70 +72 @@
     }
 } elsif ($ddir =~ /freebsd/) {
-    $dfam="freebsd";
+    $dfam="bsd";
     $dtype="port";
     my $dver1 = $dver;