Changeset 2176 in ProjectBuilder for devel/pb-modules

Timestamp:

Feb 14, 2017, 7:17:12 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix package based installation of pb

Location:

devel/pb-modules

Files:

• etc/pb.yml (added)
• lib/ProjectBuilder/Conf.pm (modified) (4 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)
• lib/ProjectBuilder/Env.pm (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Conf.pm

@@ -19 +19 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Version;
+#use YAML;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -123 +124 @@
 my $cf = shift;
 my $lh = shift;
+my $confver = "0.14";
 
 # Read the content of the config file and cache it in the %h hash then available for queries
-open(CONF,$cf) || confess "Unable to open $cf";
-while(<CONF>) {
-    next if (/^#/);
-    if (/^\s*([A-z0-9-_.]+)\s+([[A-z0-9-_.\?\[\]\*\+\\]+)\s*=\s*(.*)$/) {
-        pb_log(3,"DEBUG: 1:$1 2:$2 3:$3\n");
-        $lh->{$1}->{$2}=$3;
+if ($confver < 0.15) {
+    open(CONF,$cf) || confess "Unable to open $cf";
+    # This is the original conf file format for versions up to 0.14
+    while(<CONF>) {
+        next if (/^#/);
+        if (/^\s*([A-z0-9-_.]+)\s+([[A-z0-9-_.\?\[\]\*\+\\]+)\s*=\s*(.*)$/) {
+            pb_log(3,"DEBUG: 1:$1 2:$2 3:$3\n");
+            $lh->{$1}->{$2}=$3;
+        }
     }
-}
-close(CONF);
+    close(CONF);
+} else {
+    $lh = LoadFile($cf);
+}
 return($lh);
 }
@@ -244 +251 @@
 my $conffile = shift;
 my $h = shift;
+my $confver = "0.14";
 
 confess "No configuration file defined to write into !" if (not defined $conffile);
@@ -249 +257 @@
 open(CONF,"> $conffile") || confess "Unable to write into $conffile";
 
-foreach my $p (sort keys %$h) {
-    my $j = $h->{$p};
-    foreach my $k (sort keys %$j) {
-        print CONF "$p $k = $j->{$k}\n";
+if ($confver < 0.15) {
+    # This is the original conf file format for versions up to 0.14
+    foreach my $p (sort keys %$h) {
+        my $j = $h->{$p};
+        foreach my $k (sort keys %$j) {
+            print CONF "$p $k = $j->{$k}\n";
+        }
     }
+} else {
+    # This is the new YAML format
+    print CONF Dump($h);
 }
 close(CONF);

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -549 +549 @@
     pb_system("cat $src","INFO: New...\n");
     pb_log("INFO: Returning...\n");
-    return(0);
-}
-# TRUE
-return(1);
+    return(1);
+}
+return(0);
 }
 
@@ -616 +615 @@
             }
             my $dest = "$dirdest/$bn";
-            next if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
+            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
             confess "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
             pb_system("sudo mv $ENV{'PBTMP'}/$bn $dest","Adding $reponame repository") if (not -f "$dest");
@@ -629 +628 @@
         if ($bn =~ /\.sources.list$/) {
             my $dest = "/etc/apt/sources.list.d/$bn";
-            next if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
+            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest) == 1);
             pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/apt/sources.list.d","Adding apt repository");
             pb_system("sudo apt-get update","Updating apt repository");

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -183 +183 @@
     if ((defined $p) && (defined $p->{$ENV{'PBPROJ'}})) {
         $p->{$ENV{'PBPROJ'}} = pb_path_expand($p->{$ENV{'PBPROJ'}});
+        # TODO: should we add the conf files pointed by project default as well ?
         pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc") if (-f "$p->{$ENV{'PBPROJ'}}/.pbrc");
     }