Changeset 340 in ProjectBuilder

Timestamp:

Mar 29, 2008, 6:24:36 PM (16 years ago)

Author:

Bruno Cornec

Message:

Version allowing build of pb and mondorescue. Target for 0.9.0

File:

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

devel/pb/bin/pb

@@ -48 +48 @@
 my @date = pb_get_date();
 my $pbdate = strftime("%Y-%m-%d", @date);
-
-# ---------------------------------------------------------------------------
 
 =pod
@@ -294 +292 @@
 # Old syntax
 #getopts('a:fhi:l:m:P:p:qr:s:vV:',\%opts);
+getopts('a:fhi:l:m:P:p:qr:s:tvV:',\%opts);
 
 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
@@ -338 +337 @@
 # Handle root of the project if defined
 if (defined $opts{'r'}) {
-    $ENV{'PBROOT'} = $opts{'r'};
+    $ENV{'PBROOTDIR'} = $opts{'r'};
 }
 # Handle virtual machines if any
@@ -439 +438 @@
     my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri->{$ENV{'PBPROJ'}});
 
-    #
-    # Check project cms compliance
-    #
-    pb_cms_compliant("pbdir",'PBDIR',"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}",$uri->{$ENV{'PBPROJ'}},$pbinit);
-
     # Some variable initialization depending on CMS type
-    pb_cms_init($scheme);
+    my ($scheme,$uri)=pb_cms_init($pbinit);
 
     my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
@@ -487 +481 @@
         pb_log(2,"def:".Dumper($defpkgdir)." ext: ".Dumper($extpkgdir)." \n");
 
-        # If it isn't a flat CMS, then we have the choice to export subdir
-        pb_cms_export($uri->{$ENV{'PBPROJ'}},"$ENV{'PBDIR'}/$pbprojver/$dir",$dest);
+        # Exporting from CMS
+        pb_cms_export($uri,"$ENV{'PBDIR'}/$dir",$dest);
 
         # Get project info on authors and log file
-        my $chglog = "$ENV{'PBROOT'}/$pbpkg/pbcl";
-        $chglog = "$ENV{'PBROOT'}/pbcl" if (! -f $chglog);
+        my $chglog = "$ENV{'PBROOTDIR'}/$pbpkg/pbcl";
+        $chglog = "$ENV{'PBROOTDIR'}/pbcl" if (! -f $chglog);
         $chglog = undef if (! -f $chglog);
 
-        my $authors = "$ENV{'PBROOT'}/$pbpkg/pbauthors";
-        $authors = "$ENV{'PBROOT'}/pbauthors" if (! -f $authors);
+        my $authors = "$ENV{'PBROOTDIR'}/$pbpkg/pbauthors";
+        $authors = "$ENV{'PBROOTDIR'}/pbauthors" if (! -f $authors);
         $authors = "/dev/null" if (! -f $authors);
 
@@ -504 +498 @@
             copy($chglog,"$dest/NEWS") || die "Unable to create $dest/NEWS";
         }
-        pb_cms_log($scheme,"$ENV{'PBDIR'}/$pbprojver/$dir",$dest,$chglog,$authors);
+        pb_cms_log($scheme,"$ENV{'PBDIR'}/$dir",$dest,$chglog,$authors);
 
         my %build;
@@ -510 +504 @@
         my @pt;
         @pt = pb_conf_get_if("vmlist","velist");
-        foreach my $d (split(/,/,$pt[0]->{$ENV{'PBPROJ'}}),split(/,/,$pt[1]->{$ENV{'PBPROJ'}})) {
+        my $tmpl = "";
+        if (defined $pt[0]->{$ENV{'PBPROJ'}}) {
+            $tmpl .= $pt[0]->{$ENV{'PBPROJ'}};
+        }
+        if (defined $pt[1]->{$ENV{'PBPROJ'}}) {
+            # the 2 lists needs to be grouped with a ',' separated them
+            if ($tmpl ne "") {
+                $tmpl .= ",";
+            }
+            $tmpl .= $pt[1]->{$ENV{'PBPROJ'}} 
+        }
+        foreach my $d (split(/,/,$tmpl)) {
             my ($name,$ver,$arch) = split(/-/,$d);
             chomp($arch);
@@ -520 +525 @@
             # Filter all files found, keeping the name, and generating in dest
 
-            # Find all build files first relatively to PBROOT
+            # Find all build files first relatively to PBROOTDIR
             # Find also all specific files referenced in the .pb conf file
             my %bfiles = ();
@@ -526 +531 @@
             $build{"$ddir-$dver"} = "yes";
 
-            if (-d "$ENV{'PBROOT'}/$pbpkg/$dtype") {
-                pb_list_bfiles("$ENV{'PBROOT'}/$pbpkg/$dtype",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-            } elsif (-d "$ENV{'PBROOT'}/$pbpkg/$dfam") {
-                pb_list_bfiles("$ENV{'PBROOT'}/$pbpkg/$dfam",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-            } elsif (-d "$ENV{'PBROOT'}/$pbpkg/$ddir") {
-                pb_list_bfiles("$ENV{'PBROOT'}/$pbpkg/$ddir",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
-            } elsif (-d "$ENV{'PBROOT'}/$pbpkg/$ddir-$dver") {
-                pb_list_bfiles("$ENV{'PBROOT'}/$pbpkg/$ddir-$dver",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+            if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$dtype") {
+                pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$dtype",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+            } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$dfam") {
+                pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$dfam",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+            } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$ddir") {
+                pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$ddir",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+            } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$ddir-$dver") {
+                pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$ddir-$dver",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
             } else {
                 $build{"$ddir-$dver"} = "no";
@@ -547 +552 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles,values %pkgfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$pbpackager,$chglog);
+                    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,$pbpackager,$chglog);
                 }
             }
@@ -576 +581 @@
 
         # Prepare the dest directory for archive
-        if (-x "$ENV{'PBROOT'}/$pbpkg/pbinit") {
-            pb_filter_file("$ENV{'PBROOT'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
+        if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
+            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
             chmod 0755,"$ENV{'PBTMP'}/pbinit";
-            pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOT'}/$pbpkg/pbinit");
+            pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit");
         }
 
@@ -590 +595 @@
         # 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";
+        #print LAST "pbroot $pbprojver-$pbprojtag = $ENV{'PBROOTDIR'}\n";
         # Why not use pbproj ?
-        print LAST "pbroot $ENV{'PBPROJ'} = $ENV{'PBROOT'}\n";
+        print LAST "pbroot $ENV{'PBPROJ'} = $ENV{'PBROOTDIR'}\n";
         close(LAST);
 
@@ -828 +833 @@
     }
     if (($cmt eq "vm") || ($cmt eq "ve")) {
-        $src="$src $ENV{'PBDESTDIR'}/pbscript $ENV{'PBROOT'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb $ENV{'PBETC'}";
+        $src="$src $ENV{'PBDESTDIR'}/pbscript $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb $ENV{'PBETC'}";
     } elsif ($cmt eq "Script") {
         $src="$src $ENV{'PBDESTDIR'}/pbscript";
@@ -1161 +1166 @@
 
     die "-V Version parameter needed" if ((not defined $newver) || ($newver eq ""));
-    my $scheme=pb_cms_init($ENV{'PBPROJ'});
-    if ($scheme ne "svn") {
+
+    my ($scheme,$uri)=pb_cms_init($pbinit);
+
+    if ($scheme !~ /^svn/) {
         die "Only SVN is supported at the moment";
     }
     my $res = pb_cms_isdiff($scheme);
     die "You need to have no differences before creating a new version" if ($res != 0);
-    my $cmsurl = pb_cms_get_uri($scheme,$ENV{'PBROOT'});
+    my $cmsurl = pb_cms_getinfo($scheme,$ENV{'PBROOTDIR'},"URL:");
     my $newurl = dirname($cmsurl)."/$newver";
     pb_cms_copy($scheme,$cmsurl,$newurl);
-    pb_cms_checkout($scheme,$newurl,"$ENV{'PBROOT'}/../$newver");
+    pb_cms_checkout($scheme,$newurl,"$ENV{'PBROOTDIR'}/../$newver");
     my $oldver=basename($cmsurl);
-    open(FILE,"$ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb") || die "Unable to open $ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb";
-    open(OUT,"> $ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb.new") || die "Unable to write to $ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb.new";
+    open(FILE,"$ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb") || die "Unable to open $ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb";
+    open(OUT,"> $ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb.new") || die "Unable to write to $ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb.new";
     while(<FILE>) {
         s/projver\s+$ENV{'PBPROJ'}\s*=\s*$oldver/projver $ENV{'PBPROJ'} = $newver/;
@@ -1180 +1187 @@
     close(FILE);
     close(OUT);
-    rename("$ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb.new","$ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb");
-    pb_cms_checkin($scheme,"$ENV{'PBROOT'}/../$newver");
+    rename("$ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb.new","$ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb");
+    pb_cms_checkin($scheme,"$ENV{'PBROOTDIR'}/../$newver");
 }
 
@@ -1395 +1402 @@
     next if ($f =~ /^\./);
     $bfiles->{$f} = "$dir/$f";
-    $bfiles->{$f} =~ s~$ENV{'PBROOT'}~~;
+    $bfiles->{$f} =~ s~$ENV{'PBROOTDIR'}~~;
     if (defined $supfiles->{$pbpkg}) {
         $pkgfiles->{$f} = "$dir/$f" if ($f =~ /$supfiles->{$pbpkg}/);
@@ -1402 +1409 @@
 closedir(BDIR);
 }
-
 
 sub pb_syntax {
@@ -1418 +1424 @@
              -output  => $filehandle } );
 }
-
-