Changeset 5 in ProjectBuilder for devel/pb/lib

Timestamp:

Jul 29, 2007, 12:50:34 AM (17 years ago)

Author:

Bruno Cornec

Message:

Lots of modifs to find the right way. Probably still not good

Location:

devel/pb/lib

Files:

• cms.pm (modified) (1 diff)
• common.pm (modified) (1 diff)
• pb.pm (deleted)
• toolhome.pm (modified) (2 diffs)

devel/pb/lib/cms.pm

@@ -24 +24 @@
     $ret =  $? >> 8;
     if ($ret == 0) {
-        $ENV{'REVISION'}=`(cd $TOOLHOME/.. ; svnversion .)`;
+        $ENV{'REVISION'}=`(cd $PBROOT/.. ; svnversion .)`;
         $ENV{'CMSLOG'}="svn log";
         $ENV{'CMSEXP'}="svn export";
     } else {
         # By default if not SVN take CVS
-        $ENV{'REVISION'}=`(cd $TOOLHOME/.. ; cvs  rannotate  -f . 2>&1 | awk '{print $1}' | grep -E '^[0-9]' | cut -d. -f2 |sort -nu | tail -1)`;
+        $ENV{'REVISION'}=`(cd $PBROOT/.. ; cvs  rannotate  -f . 2>&1 | awk '{print $1}' | grep -E '^[0-9]' | cut -d. -f2 |sort -nu | tail -1)`;
         $ENV{'CMSLOG'}="cvs log";
         $ENV{'CMSEXP'}="cvs export"

devel/pb/lib/common.pm

@@ -9 +9 @@
 @EXPORT = qw(set_env);
 
+use lib qw (lib);
 use strict;
 use File::Basename;
 use ExtUtils::Command;
 use File::Temp qw /tempdir/;
+use vars qw (%defpkgdir %extpkgdir %version &pb_init);
+
+$ENV{'PBCONF'} = "/etc/pb";
 
 sub set_env {
 
-my $tmp = dirname($PROGRAM_NAME);
-#print "$tmp\n";
-if ($tmp =~ /^\//) {
-        $ENV{'TOOLHOME'} = $tmp;
-        }
-else {
-        $ENV{'TOOLHOME'} = "$ENV{PWD}/$tmp";
-        }
+my $proj=shift;
+my $ver;
+my $tag;
 
-die "TOOLHOME doesn't exist" if (not (defined $ENV{'TOOLHOME'}));
+# Check project name
+if ((defined $ENV{'PBPROJ'}) &&
+    (not (defined $proj))) {
+    $proj = $ENV{'PBPROJ'};
+}
+die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
 
-# Adapt to your needs
-$ENV{'TOPDIR'}=$ENV{'TOOLHOME'}."/../delivery";
-mkpath $ENV{'TOPDIR'};
+# Use project configuration file
+require "$ENV{'PBCONF'}/$proj.pb";
+pb_init();
 
+# Check content
+die "PBROOT doesn't exist in $ENV{'PBCONF'}/$proj.pb" if (not (defined $ENV{'PBROOT'}));
+die "defpkgdir doesn't exist in $ENV{'PBCONF'}/$proj.pb" if (not (defined %defpkgdir));
+
+# Set temp directory
 if (undef $ENV{'TMPDIR'}) {
     $ENV{'TMPDIR'}="/tmp";
 }
-$ENV{'PROJTMP'} = tempdir( "projbuild.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => 1 );
+$ENV{'PBTMP'} = tempdir( "pb.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => 1 );
+
+# Get global VERSION
+open(VER, "$ENV{'PBROOT'}/VERSION") || die "Unable to open $ENV{'PBROOT'}/VERSION: $?";
+$ver = <VER>;
+chomp($ver);
+die "Invalid version name $ver in $ENV{'PBROOT'}/VERSION" if ($ver !~ /[0-9.]+/) || (defined $version{$ver});
+$ENV{'PBVER'}=$ver;
+close(VER);
+
+#Get global TAG
+open(TAG, "$ENV{'PBROOT'}/TAG") || die "Unable to open $ENV{'PBROOT'}/TAG: $?";
+$tag = <TAG>;
+chomp($tag);
+die "Invalid version tag $tag in $ENV{'PBROOT'}/TAG" if ($tag !~ /[0-9]+/);
+$ENV{'PBTAG'}=$tag;
+close(TAG);
+
+# Adapt to your needs
+# Set delivery directory
+$ENV{'PBTOPDIR'}="$ENV{'PBROOT'}/../delivery";
+$ENV{'PBDESTDIR'}=$ENV{'TOPDIR'}."/".$ENV{'PBVER'}."-".$ENV{'PBTAG'};
+mkpath $ENV{'PBDESTDIR'};
 
 umask 0022

devel/pb/lib/toolhome.pm

@@ -1 +1 @@
 #!/usr/bin/perl -w
 #
-# Module to compute TOOLHOME and put in the environment
+# Module to compute PBROOT and put in the environment
 #
 # $Id$
@@ -17 +17 @@
 #print "$tmp\n";
 if ($tmp =~ /^\//) {
-        $ENV{'TOOLHOME'} = $tmp;
+        $ENV{'PBROOT'} = $tmp;
         }
 else {
-        $ENV{'TOOLHOME'} = "$ENV{PWD}/$tmp";
+        $ENV{'PBROOT'} = "$ENV{PWD}/$tmp";
         }
 
-die "TOOLHOME doesn't exist" if (not (defined $ENV{'TOOLHOME'}));
+die "PBROOT doesn't exist" if (not (defined $ENV{'PBROOT'}));
 }
 1;