Changeset 9 in ProjectBuilder for devel/pb/lib

Timestamp:

Jul 30, 2007, 1:22:32 AM (17 years ago)

Author:

Bruno Cornec

Message:

cms2build begins to export

Location:

devel/pb/lib

Files:

• cms.pm (modified) (1 diff)
• common.pm (modified) (4 diffs)

devel/pb/lib/cms.pm

@@ -27 +27 @@
     if ($ret == 0) {
         $ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; svnversion .)`;
+        chomp($ENV{'PBREVISION'});
         $ENV{'PBCMSLOG'}="svn log";
+        $ENV{'PBCMSLOGFILE'}="svn.log";
         $ENV{'PBCMSEXP'}="svn export";
     } else {
         # By default if not SVN take CVS
         $ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; cvs rannotate  -f . 2>&1 | awk '{print \$1}' | grep -E '^[0-9]' | cut -d. -f2 |sort -nu | tail -1)`;
+        chomp($ENV{'PBREVISION'});
         $ENV{'PBCMSLOG'}="cvs log";
+        $ENV{'PBCMSLOGFILE'}="cvs.log";
         $ENV{'PBCMSEXP'}="cvs export"
     }

devel/pb/lib/common.pm

@@ -7 +7 @@
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(set_env);
+@EXPORT = qw(env_init);
 
 use lib qw (lib);
@@ -13 +13 @@
 use strict;
 use File::Basename;
-use ExtUtils::Command;
+use File::Path;
 use File::Temp qw /tempdir/;
 use vars qw (%defpkgdir %extpkgdir %version);
@@ -20 +20 @@
 $ENV{'PBCONF'} = "/etc/pb";
 
-sub set_env {
+sub env_init {
 
 my $proj=shift;
@@ -85 +85 @@
 #
 $ENV{'PBTOPDIR'}="$ENV{'PBROOT'}/../delivery";
-$ENV{'PBDESTDIR'}=$ENV{'PBTOPDIR'}."/".$ENV{'PBVER'}."-".$ENV{'PBTAG'};
-mkpath $ENV{'PBDESTDIR'};
+$ENV{'PBDESTDIR'}="$ENV{'PBTOPDIR'}/$ENV{'PBVER'}-$ENV{'PBTAG'}";
+pbrm_rf($ENV{'PBDESTDIR'}) if (-d "$ENV{'PBDESTDIR'}");
+pbmkdir_p($ENV{'PBDESTDIR'}) || die "Unable to recursively create $ENV{'PBDESTDIR'}";
 
 umask 0022;
 return($proj);
 }
+
+sub pbmkdir_p {
+    my @dir = @_;
+    my $ret = mkpath(@dir, 0, 0755);
+    return($ret);
+}
+
+sub pbrm_rf {
+    my @dir = @_;
+    my $ret = rmtree(@dir, 0, 0);
+    return($ret);
+}
+
 1;