Changeset 13 in ProjectBuilder for devel/pb/lib

Timestamp:

Jul 30, 2007, 1:32:55 PM (17 years ago)

Author:

Bruno Cornec

Message:

Deal with rpm build process

Location:

devel/pb/lib

Files:

• common.pm (modified) (2 diffs)
• distro.pm (modified) (5 diffs)

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;