Changeset 226 in ProjectBuilder for devel/pb/lib

Timestamp:

Oct 17, 2007, 6:38:20 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Improve pbsetupqemu for fc4, sudoers management
• Adds updateqemu script
• Adds support for "flat" type of CMS
• gentoo is nover now
• halt replaces poweroff
• try to fix date issue on the VM
• improve destdir management on spec file

Location:

devel/pb/lib/ProjectBuilder

Files:

• Base.pm (modified) (8 diffs)
• Distribution.pm (modified) (1 diff)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -288 +288 @@
     $ENV{'PBCMSLOG'}="svn log";
     $ENV{'PBCMSLOGFILE'}="svn.log";
+} elsif ($cms->{$proj} eq "flat") {
+    $ENV{'PBREVISION'}="flat";
+    $ENV{'PBCMSLOG'}="/bin/true";
+    $ENV{'PBCMSLOGFILE'}="/dev/null";
 } elsif ($cms->{$proj} eq "cvs") {
     # Way too slow
@@ -321 +325 @@
     }
     pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
+    if (-d $source) {
+        $tmp = $destdir;
+    } else {
+        $tmp = $destdir."/".basename($source);
+    }
+    pb_system("cp -a $source $tmp","Exporting $source from DIR to $tmp");
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
     my $dir=dirname($destdir);
@@ -346 +357 @@
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
     pb_system("svn log -v $pkgdir > $destfile","Extracting log info from SVN");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
+    # Nothing to do
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
     my $tmp=basename($pkgdir);
@@ -367 +380 @@
     close(PIPE);
     chomp($url);
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {
@@ -381 +395 @@
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
     pb_system("svn copy -m \"Creation of $newurl from $oldurl\" $oldurl $newurl","Copying $oldurl to $newurl ");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {
@@ -394 +409 @@
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
     pb_system("svn co $url $destination","Checking $url to $destination ");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {
@@ -408 +424 @@
     pb_system("svn ci -m \"Updated to $ver\" $dir","Checking in $dir");
     pb_system("svn up $dir","Updating $dir");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {
@@ -424 +441 @@
     }
     return($l);
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {

devel/pb/lib/ProjectBuilder/Distribution.pm

@@ -29 +29 @@
     $dfam="gen";
     $dtype="ebuild";
-    my $dver1 = $dver;
-    $dver1 =~ s/\.//;
-    $dsuf=".$ddir$dver1";
+    $dver="nover";
+    $dsuf=".$ddir";
 } elsif ($ddir =~ /slackware/) {
     $dfam="slack";