Changeset 409 in ProjectBuilder for devel/pb/bin

Timestamp:

Apr 25, 2008, 3:13:55 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Document all reusable functions in pb
• remove the useless pbproj parameter from pb_filter functions
• Addition and use of pb_conf_init and pb_conf_add in pb
• Addition and use of pb_conf_fromfile_if in Conf.pm
• preparation for 0.9.1
• Update of pbinit files for mondo to support the new interface of pb_filter functions

File:

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

devel/pb/bin/pb

@@ -551 +551 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles,values %pkgfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$ENV{'PBPACKAGER'},$chglog);
+                    pb_filter_file_pb("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$ENV{'PBPACKAGER'},$chglog);
                 }
             }
@@ -573 +573 @@
         if (defined $filteredfiles->{$pbpkg}) {
             foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
-                pb_filter_file_inplace($ptr,"$dest/$f",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
+                pb_filter_file_inplace($ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
                 $liste = "$f $liste";
             }
@@ -581 +581 @@
         # Prepare the dest directory for archive
         if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
-            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
+            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
             chmod 0755,"$ENV{'PBTMP'}/pbinit";
             pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit");
@@ -1650 +1650 @@
 $ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
 
+# We only have one configuration file for now.
+pb_conf_init("$ENV{'PBETC'}");
+
 #
 # Check project name
@@ -1830 +1833 @@
     }
 
-    return  if ($action =~ /^newver$/);
+    # Adds that conf file to the list to consider
+    pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
+
+    return if ($action =~ /^newver$/);
 
     my %version = ();
@@ -1839 +1845 @@
     
     if ((-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") and (not defined $pbinit)) {
+
         # List of pkg to build by default (mandatory)
         my ($defpkgdir,$pbpackager, $pkgv, $pkgt) = pb_conf_get("defpkgdir","pbpackager","projver","projtag");