Changeset 702 in ProjectBuilder for devel/pb/bin

Timestamp:

Feb 19, 2009, 4:42:22 PM (16 years ago)

Author:

Bruno Cornec

Message:

• new function pb_distro_setuprepo (addition of repository on the fly at build time)
• pb_get_dist_param => pb_distro_get_param and placed in Distribution
• removal of last locale issue

File:

• devel/pb/bin/pb (modified) (6 diffs)

devel/pb/bin/pb

@@ -782 +782 @@
     open(LAST,">> $ENV{'PBDESTDIR'}/pbrc") || die "Unable to create $ENV{'PBDESTDIR'}/pbrc";
     print LAST "pbroot $ENV{'PBPROJ'} = $ENV{'PBROOTDIR'}\n";
-    print LAST "pbprojver $ENV{'PBPROJ'} = $ENV{'PBPROJVER'}\n";
-    print LAST "pbprojtag $ENV{'PBPROJ'} = $ENV{'PBPROJTAG'}\n";
+    print LAST "projver $ENV{'PBPROJ'} = $ENV{'PBPROJVER'}\n";
+    print LAST "projtag $ENV{'PBPROJ'} = $ENV{'PBPROJTAG'}\n";
     print LAST "pbpackager $ENV{'PBPROJ'} = $ENV{'PBPACKAGER'}\n";
     close(LAST);
@@ -841 +841 @@
                 $specialdef = "--define \'_target_platform \"\"\'";
             }
+
+            # If needed we may add repository to the build env
+            my $darch = pb_get_arch();
+            pb_distro_setuprepo($ddir,$dver,$darch,$dtype);
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
@@ -1519 +1523 @@
                 if ($dtype eq "rpm") {
 
-                    my $verpmstyle = pb_get_dist_param($ddir,$dver,$darch,$verpmtype);
+                    my $verpmstyle = pb_distro_get_param($ddir,$dver,$darch,$verpmtype);
                     if ($verpmstyle eq "rinse") {
                         # Need to reshape the mirrors generated
                         my $post = "--before-post-install ";
-                        my $postparam = pb_get_dist_param($ddir,$dver,$darch,$veb4pi);
+                        my $postparam = pb_distro_get_param($ddir,$dver,$darch,$veb4pi);
                         if ($postparam eq "") {
                             $post = "";
@@ -1532 +1536 @@
                         # Need to reshape the package list for pb
                         my $addpkgs;
-                        $postparam = pb_get_dist_param($ddir,$dver,$darch,$vepkglist);
+                        $postparam = pb_distro_get_param($ddir,$dver,$darch,$vepkglist);
                         if ($postparam eq "") {
                             $addpkgs = "";
@@ -1887 +1891 @@
             my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver);
     
-            my $postparam = pb_get_dist_param($ddir,$dver,$darch,$vepkglist);
+            my $postparam = pb_distro_get_param($ddir,$dver,$darch,$vepkglist);
             # Change the list of pkg in to a space separated list
             $postparam =~ s/,/ /g;
@@ -2564 +2568 @@
 }
 
-sub pb_get_dist_param {
-
-my $param = "";
-my $ddir = shift;
-my $dver = shift;
-my $darch = shift;
-my $opt = shift;
-
-if (defined $opt->{"$ddir-$dver-$darch"}) {
-    $param = $opt->{"$ddir-$dver-$darch"};
-} elsif (defined $opt->{"$ddir-$dver"}) {
-    $param = $opt->{"$ddir-$dver"};
-} elsif (defined $opt->{"$ddir"}) {
-    $param = $opt->{"$ddir"};
-} elsif (defined $opt->{"default"}) {
-    $param = $opt->{"default"};
-} else {
-    $param = "";
-}
-return($param);
-}
-
 1;