Changeset 314 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Feb 9, 2008, 9:29:56 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Big rewrite still WIP
• lot of interface changes, pbconf relocated and split from project dir.
• URL usage

File:

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

devel/pb/bin/pb

@@ -99 +99 @@
 die pb_syntax() if (not defined $action);
 
-my ($pbrc, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir);
+my ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir);
 my $pbinit = undef;
 $pbinit = 1 if ($action =~ /^newproj$/);
@@ -106 +106 @@
 # And get global params
 if (defined $opts{'p'}) {
-    ($debug,$LOG, $pbrc, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 
+    ($debug,$LOG, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 
     = pb_env_init($opts{'p'},$pbinit);
 } else {
-    ($debug,$LOG, $pbrc, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 
+    ($debug,$LOG, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 
     = pb_env_init(undef,$pbinit);
 }
@@ -309 +309 @@
             }
             print $LOG "Build files generated for ".join(',',@found)."\n";
-            print $LOG "No Build files found for ".join(',',@notfound)."\n";
+            print $LOG "No Build files found for ".join(',',@notfound)."\n" if (@notfound);
         }
         # Get the generic filter (all.pbf) and 
@@ -340 +340 @@
         print $LOG "Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n" if ($debug >= 0);
 
-        # Keep track of what is generated for default
-        open(LAST,"> $pbrc->{$ENV{'PBPROJ'}}") || die "Unable to create $pbrc->{$ENV{'PBPROJ'}}";
-        print LAST "pbroot $pbprojver-$pbprojtag = $ENV{'PBROOT'}\n";
+        # Keep track of what is generated by default
+        open(LAST,"> $ENV{'PBDESTDIR'}/pbrc") || die "Unable to create $ENV{'PBDESTDIR'}/pbrc";
+        #print LAST "pbroot $pbprojver-$pbprojtag = $ENV{'PBROOT'}\n";
+        # Why not use pbproj ?
+        print LAST "pbroot $ENV{'PBPROJ'} = $ENV{'PBROOT'}\n";
         close(LAST);
 
         # Keep track of per package version
-        if (! -f "$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb") {
-            open(PKG,">$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb") || die "Unable to create $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb";
-            print PKG "# Empty\n";
-            close(PKG);
-        }
-        my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
+        my ($pkg) = pb_conf_read_if("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
         $pkg = { } if (not defined $pkg);
         if ((not defined $pkg->{$pbpkg}) || ($pkg->{$pbpkg} ne "$pbver-$pbtag")) {
@@ -660 +657 @@
         # Gather all required files to send them to the VM 
         # and launch the build thourgh pbscript
-        pb_send2ssh("Script","$v",$vmexist,$vmpid,"vmhost","vmlogin","pbrc","vmport","vmtmout");
+        pb_send2ssh("Script","$v",$vmexist,$vmpid,"vmhost","vmlogin","$ENV{'PBDESTDIR'}/pbrc","vmport","vmtmout");
 
     }
@@ -859 +856 @@
         # Gather all required files to send them to the VM 
         # and launch the build thourgh pbscript
-        pb_send2ssh("VMs","$v",$vmexist,$vmpid,"vmhost","vmlogin","pbrc","vmport","vmtmout");
+        pb_send2ssh("VMs","$v",$vmexist,$vmpid,"vmhost","vmlogin","$ENV{'PBDESTDIR'}/pbrc","vmport","vmtmout");
     }
 }
@@ -873 +870 @@
     my $res = pb_cms_isdiff($cms);
     die "You need to have no differences before creating a new version" if ($res != 0);
-    my $cmsurl = pb_cms_getinfo($cms);
+    my $cmsurl = pb_cms_getinfo($cms,$ENV{'PBROOT'});
     my $newurl = dirname($cmsurl)."/$newver";
     pb_cms_copy($cms,$cmsurl,$newurl);