Changeset 74 in ProjectBuilder for devel/pb/bin

Timestamp:

Sep 1, 2007, 1:56:48 AM (18 years ago)

Author:

Bruno Cornec

Message:

Big renaming to be more perlish
Single module Base contains all routines except when detaching makes sense

File:

• devel/pb/bin/pb (modified) (20 diffs)

devel/pb/bin/pb

@@ -21 +21 @@
 
 # Global variables
-use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles %pbrc $debug $LOG $projectbuilderver $projectbuilderrev);
+use vars qw (%defpkgdir %extpkgdir %filteredfiles %pbrc $debug $LOG);
 
 $debug = 0;                 # Debug level
 $LOG = *STDOUT;             # Where to log
 use lib qw (lib);
-use ProjectBuilder::common qw (env_init);
-use ProjectBuilder::distro qw (distro_init);
-use ProjectBuilder::cms;
-use ProjectBuilder::changelog qw (changelog);
-use ProjectBuilder::Version qw (version_init);
-use ProjectBuilder::pb qw (pb_init);
+use ProjectBuilder::Distribution qw (pb_distro_init);
+use ProjectBuilder::Changelog qw (pb_changelog);
+use ProjectBuilder::Version qw (pb_version_init);
+use ProjectBuilder::Base qw (pb_conf_read pb_cms_init pb_mkdir_p pb_system pb_rm_rf);
 
 my %opts;                   # CLI Options
@@ -46 +44 @@
 getopts('hl:p:qr:tv',\%opts);
 
-version_init();
+my ($projectbuilderver,$projectbuilderrev) = ("0.5","1"); #pb_version_init();
 if (defined $opts{'h'}) {
-    syntax();
+    pb_syntax();
     exit(0);
 }
@@ -71 +69 @@
 # Get Action
 $action = shift @ARGV;
-die syntax() if (not defined $action);
+die pb_syntax() if (not defined $action);
 
 # Handle root of the project if defined
@@ -79 +77 @@
 # Handles project name if any
 if (defined $opts{'p'}) {
-    $ENV{'PBPROJ'} = env_init($opts{'p'});
+    $ENV{'PBPROJ'} = pb_env_init($opts{'p'});
 } else {
-    $ENV{'PBPROJ'} = env_init();
+    $ENV{'PBPROJ'} = pb_env_init();
 }
 
@@ -91 +89 @@
     my $ptr = get_pkg();
     @pkgs = @$ptr;
-    cms_init();
+    pb_cms_init($ENV{'PBPROJ'});
 
     foreach my $pbpkg (@pkgs) {
@@ -117 +115 @@
         # Clean up dest if necessary. The export will recreate it
         my $dest = "$ENV{'PBDESTDIR'}/$pbpkg-$pbver";
-        pbrm_rf($dest) if (-d $dest);
+        pb_rm_rf($dest) if (-d $dest);
 
         # Export CMS tree for the concerned package to dest
@@ -126 +124 @@
         my $dir = $defpkgdir{$pbpkg};
         $dir = $extpkgdir{$pbpkg} if (not defined $dir);
-        pbsystem("$ENV{'PBCMSEXP'} $option $ENV{'PBROOT'}/$dir $dest 1>/dev/null", "Exporting $ENV{'PBROOT'}/$dir");
+        pb_system("$ENV{'PBCMSEXP'} $option $ENV{'PBROOT'}/$dir $dest 1>/dev/null", "Exporting $ENV{'PBROOT'}/$dir");
 
         # Creates a REVISION file
@@ -134 +132 @@
 
         # Extract cms log history and store it
-        pbsystem("$ENV{'PBCMSLOG'} $option $ENV{'PBROOT'}/$dir > $dest/$ENV{'PBCMSLOGFILE'}", "Extracting log info");
+        pb_system("$ENV{'PBCMSLOG'} $option $ENV{'PBROOT'}/$dir > $dest/$ENV{'PBCMSLOGFILE'}", "Extracting log info");
 
         my %build;
@@ -142 +140 @@
             my ($ndir,$ver) = split(/_/,$d);
             chomp($ver);
-            my ($ddir, $dver, $dfam, $dtype, $dsuf) = distro_init($ndir,$ver);
+            my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init($ndir,$ver);
             print $LOG "DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $dsuf)."\n" if ($debug >= 1);
             print $LOG "DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n" if ($debug >= 1);
@@ -251 +249 @@
         # Prepare the dest directory for archive
         if (-x "$ENV{'PBCONF'}/$pbpkg/pbinit") {
-            pbsystem("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit","Executing init script $ENV{'PBCONF'}/$pbpkg/pbinit");
+            pb_system("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit","Executing init script $ENV{'PBCONF'}/$pbpkg/pbinit");
         }
 
@@ -257 +255 @@
         chdir "$ENV{'PBDESTDIR'}" || die "Unable to change dir to $ENV{'PBDESTDIR'}";
         # Possibility to look at PBSRC to guess more the filename
-        pbsystem("tar cfpz $pbpkg-$pbver.tar.gz $pbpkg-$pbver","Creating $pbpkg tar files compressed");
+        pb_system("tar cfpz $pbpkg-$pbver.tar.gz $pbpkg-$pbver","Creating $pbpkg tar files compressed");
         print $LOG "Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n" if ($debug >= 0);
         # Keep track of what is generated for default
@@ -269 +267 @@
     if (not defined $vertag) {
         if (-f $pbrc{$ENV{'PBPROJ'}}) {
-            my $pbroot = pb_init($pbrc{$ENV{'PBPROJ'}},"pbroot");
+            my $pbroot = pb_conf_read($pbrc{$ENV{'PBPROJ'}},"pbroot");
             # There is only one line normaly
-            $vertag = (keys %$pbroot)[0]
-            $ENV{'PBROOT'} = (values %$pbroot)[0]
+            $vertag = (keys %$pbroot)[0];
+            $ENV{'PBROOT'} = (values %$pbroot)[0];
         } else {
             die "Unable to open $pbrc{$ENV{'PBPROJ'}}\nYou may want to precise as parameter version-tag";
@@ -284 +282 @@
 
     # Get the running distro to build on
-    my ($ddir, $dver, $dfam, $dtype, $dsuf) = distro_init();
+    my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init();
     print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n" if ($debug >= 1);
 
@@ -300 +298 @@
             foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
                 if (! -d "$ENV{'PBBUILDDIR'}/$d") {
-                pbmkdir_p("$ENV{'PBBUILDDIR'}/$d") || die "Please ensure that you can write into $ENV{'PBBUILDDIR'} to create $d\nSolution: setup _topdir in your ~/.rpmmacros or\nchown the $ENV{'PBBUILDDIR'} directory to your uid";
+                pb_mkdir_p("$ENV{'PBBUILDDIR'}/$d") || die "Please ensure that you can write into $ENV{'PBBUILDDIR'} to create $d\nSolution: setup _topdir in your ~/.rpmmacros or\nchown the $ENV{'PBBUILDDIR'} directory to your uid";
                 }
             }
@@ -315 +313 @@
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
-                    pbsystem("rpmbuild -ba $f","Building package with $f");
+                    pb_system("rpmbuild -ba $f","Building package with $f");
                     last;
                 }
             }
         } elsif ($dtype eq "tgz") {
-            pbmkdir_p("$ENV{'PBBUILDDIR'}/install") if (! -d "$ENV{'PBBUILDDIR'}/install");
+            pb_mkdir_p("$ENV{'PBBUILDDIR'}/install") if (! -d "$ENV{'PBBUILDDIR'}/install");
         } elsif ($dtype eq "ebuild") {
-            pbmkdir_p("$ENV{'PBBUILDDIR'}/portage") if (! -d "$ENV{'PBBUILDDIR'}/portage");
+            pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage") if (! -d "$ENV{'PBBUILDDIR'}/portage");
         } else {
         }
@@ -328 +326 @@
 } else {
     print $LOG "'$action' is not available\n";
-    syntax();
+    pb_syntax();
 }
 
@@ -343 +341 @@
 
 print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);
-pbmkdir_p(dirname($destfile)) if (! -d dirname($destfile));
+pb_mkdir_p(dirname($destfile)) if (! -d dirname($destfile));
 open(DEST,"> $destfile") || die "Unable to create $destfile";
 open(FILE,"$f") || die "Unable to open $f: $!";
@@ -360 +358 @@
             my $p = $defpkgdir{$pbpkg};
             $p = $extpkgdir{$pbpkg} if (not defined $p);
-            changelog($dtype, $pbpkg, $pbtag, $dsuf, $p, \*DEST);
+            pb_changelog($dtype, $pbpkg, $pbtag, $dsuf, $p, \*DEST);
             $tmp = "";
         }
@@ -400 +398 @@
 my @files;
 
-pbsystem("tar xfpz $src $dir >/dev/null","Extracting build files");
+pb_system("tar xfpz $src $dir >/dev/null","Extracting build files");
 opendir(DIR,"$dir") || die "Unable to open directory $dir";
 foreach my $f (readdir(DIR)) {
@@ -410 +408 @@
 closedir(DIR);
 # Not enough but still a first cleanup
-pbrm_rf("$dir");
+pb_rm_rf("$dir");
 return(@files);
 }
 
-sub syntax {
+sub pb_syntax {
 
     print "pb (aka project-builder) Version $projectbuilderver-$projectbuilderrev\n";