Changeset 6 in ProjectBuilder

Timestamp:

Jul 29, 2007, 1:21:40 AM (18 years ago)

Author:

Bruno Cornec

Message:

Ok seems better interm of organization with AppConfig usage

Location:

devel/pb

Files:

• bin/pb.pl (modified) (2 diffs)
• etc/pb.pb (deleted)
• lib/cms.pm (modified) (2 diffs)
• lib/common.pm (modified) (2 diffs)
• lib/pb.pm (added)

devel/pb/bin/pb.pl

@@ -12 +12 @@
 use Getopt::Std;
 
-use lib qw (lib /etc/pb);
-use vars qw (%defpkgdir %extpkgdir %version);
+use lib qw (lib etc);
+use vars qw (%defpkgdir %extpkgdir @version);
 use common qw (set_env);
 use pb qw (defpkgdir extpkgdir version pb_init);
@@ -30 +30 @@
 
 print "PBPROJ: $ENV{'PBPROJ'}\n";
+
+cms_init();

devel/pb/lib/cms.pm

@@ -14 +14 @@
 # Expects we are in the right directory to launch CMS commands
 
-my @args = ("svn", "info", "2>&1", "/dev/null");
+sub cms_init {
+
 my $ret;
-system(@args) == 0 or die "system @args failed: $?";
+
+chdir "$ENV{'PBROOT'}";
+system("svn info 2>&1 /dev/null") == 0 or die "system svn info failed: $?";
 if ($? == -1) {
     print "failed to execute: $!\n";
@@ -24 +27 @@
     $ret =  $? >> 8;
     if ($ret == 0) {
-        $ENV{'REVISION'}=`(cd $PBROOT/.. ; svnversion .)`;
+        $ENV{'REVISION'}=`(cd "$ENV{'PBROOT'}/.." ; svnversion .)`;
         $ENV{'CMSLOG'}="svn log";
         $ENV{'CMSEXP'}="svn export";
     } else {
         # By default if not SVN take CVS
-        $ENV{'REVISION'}=`(cd $PBROOT/.. ; cvs  rannotate  -f . 2>&1 | awk '{print $1}' | grep -E '^[0-9]' | cut -d. -f2 |sort -nu | tail -1)`;
+        $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{'CVSROOT'}=$ENV{'CVSVAR'};
     }
 }
+}
 1;

devel/pb/lib/common.pm

@@ -10 +10 @@
 
 use lib qw (lib);
+use pb qw (pb_init);
 use strict;
 use File::Basename;
 use ExtUtils::Command;
 use File::Temp qw /tempdir/;
-use vars qw (%defpkgdir %extpkgdir %version &pb_init);
+use vars qw (%defpkgdir %extpkgdir %version);
 
 $ENV{'PBCONF'} = "/etc/pb";
@@ -32 +33 @@
 
 # Use project configuration file
-require "$ENV{'PBCONF'}/$proj.pb";
-pb_init();
+pb_init("$ENV{'PBCONF'}/$proj.pb");
 
 # Check content