Changeset 8

Timestamp:

07/29/07 02:30:56 (6 years ago)

Author:

bruno

Message:

Basic function works (conf file read and interpret)

Location:

devel/pb

Files:

• bin/pb.pl (modified) (2 diffs)
• etc/pb.pb (modified) (1 diff)
• lib/cms.pm (modified) (2 diffs)
• lib/common.pm (modified) (4 diffs)
• lib/pb.pm (modified) (3 diffs)

devel/pb/bin/pb.pl

@@ -13 +13 @@
 
 use lib qw (lib etc);
-use vars qw (%defpkgdir %extpkgdir @version);
+use vars qw (%defpkgdir %extpkgdir %version);
 use common qw (set_env);
 use pb qw (defpkgdir extpkgdir version pb_init);
@@ -24 +24 @@
 # Handles project name if any
 if (defined $opts{'p'}) {
-    set_env($opts{'p'});
+    $ENV{'PBPROJ'} = set_env($opts{'p'});
 } else {
-    set_env();
+    $ENV{'PBPROJ'} = set_env();
 }
 

devel/pb/etc/pb.pb

@@ -20 +20 @@
 extpkgdir "" = ""
 
-# List of valid version names
+# Hash of valid version names
 version devel
 version stable

devel/pb/lib/cms.pm

@@ -18 +18 @@
 my $ret;
 
-chdir "$ENV{'PBROOT'}";
-system("svn info 2>&1 /dev/null") == 0 or die "system svn info failed: $?";
+system("cd $ENV{'PBROOT'} ; svn info . 2>&1 > /dev/null");
 if ($? == -1) {
     print "failed to execute: $!\n";
@@ -27 +26 @@
     $ret =  $? >> 8;
     if ($ret == 0) {
-        $ENV{'REVISION'}=`(cd "$ENV{'PBROOT'}/.." ; svnversion .)`;
-        $ENV{'CMSLOG'}="svn log";
-        $ENV{'CMSEXP'}="svn export";
+        $ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; svnversion .)`;
+        $ENV{'PBCMSLOG'}="svn log";
+        $ENV{'PBCMSEXP'}="svn export";
     } else {
         # By default if not SVN take CVS
-        $ENV{'REVISION'}=`(cd "$ENV{'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"
+        $ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; cvs rannotate  -f . 2>&1 | awk '{print \$1}' | grep -E '^[0-9]' | cut -d. -f2 |sort -nu | tail -1)`;
+        $ENV{'PBCMSLOG'}="cvs log";
+        $ENV{'PBCMSEXP'}="cvs export"
     }
 }

devel/pb/lib/common.pm

@@ -16 +16 @@
 use File::Temp qw /tempdir/;
 use vars qw (%defpkgdir %extpkgdir %version);
+use Data::Dumper;
 
 $ENV{'PBCONF'} = "/etc/pb";
@@ -25 +26 @@
 my $tag;
 
+#
 # Check project name
+#
 if ((defined $ENV{'PBPROJ'}) &&
     (not (defined $proj))) {
@@ -32 +35 @@
 die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
 
+#
 # Use project configuration file
+#
 pb_init("$ENV{'PBCONF'}/$proj.pb");
 
+#
 # 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 (not defined $ENV{'TMPDIR'}) {
     $ENV{'TMPDIR'}="/tmp";
@@ -45 +54 @@
 $ENV{'PBTMP'} = tempdir( "pb.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => 1 );
 
+#
+# Check pb conf compliance
+#
+die "Project $ENV{'PBPROJ'} not ProjectBuild compliant. Please populate $ENV{'PBROOT'}/pbconf" if ( not -d "$ENV{'PBROOT'}/pbconf");
+
+#
 # Get global VERSION
-open(VER, "$ENV{'PBROOT'}/VERSION") || die "Unable to open $ENV{'PBROOT'}/VERSION: $?";
+#
+open(VER, "$ENV{'PBROOT'}/pbconf/VERSION") || die "Unable to open $ENV{'PBROOT'}/pbconf/VERSION: $?";
 $ver = <VER>;
 chomp($ver);
-die "Invalid version name $ver in $ENV{'PBROOT'}/VERSION" if ($ver !~ /[0-9.]+/) || (defined $version{$ver});
+#print Dumper(%version);
+die "Invalid version name $ver in $ENV{'PBROOT'}/VERSION" if ($ver !~ /[0-9.]+/) && (not exists $version{$ver});
 $ENV{'PBVER'}=$ver;
 close(VER);
 
+#
 #Get global TAG
-open(TAG, "$ENV{'PBROOT'}/TAG") || die "Unable to open $ENV{'PBROOT'}/TAG: $?";
+#
+open(TAG, "$ENV{'PBROOT'}/pbconf/TAG") || die "Unable to open $ENV{'PBROOT'}/pbconf/TAG: $?";
 $tag = <TAG>;
 chomp($tag);
-die "Invalid version tag $tag in $ENV{'PBROOT'}/TAG" if ($tag !~ /[0-9]+/);
+die "Invalid tag name $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'};
+$ENV{'PBDESTDIR'}=$ENV{'PBTOPDIR'}."/".$ENV{'PBVER'}."-".$ENV{'PBTAG'};
 mkpath $ENV{'PBDESTDIR'};
 
-umask 0022
+umask 0022;
+return($proj);
 }
 1;

devel/pb/lib/pb.pm

@@ -11 +11 @@
 @ISA = qw(Exporter);
 # global vars are here
-@EXPORT_OK = qw(%defpkgdir %extpkgdir @version &pb_init);
+@EXPORT_OK = qw(%defpkgdir %extpkgdir %version &pb_init);
 use vars @EXPORT_OK;
 use AppConfig qw(ARGCOUNT_ONE ARGCOUNT_HASH ARGCOUNT_LIST EXPAND_ALL);
@@ -29 +29 @@
 $config->define("defpkgdir" => { ARGCOUNT => ARGCOUNT_HASH });
 $config->define("extpkgdir" => { ARGCOUNT => ARGCOUNT_HASH });
-$config->define("version" => { ARGCOUNT => ARGCOUNT_LIST });
+$config->define("version" => { ARGCOUNT => ARGCOUNT_HASH });
 
 $config->file($conffile);
@@ -51 +51 @@
 # Valid version names
 $ptr = $config->get("version");
-@version = @$ptr;
+%version = %$ptr;
 
 }