Changeset 397 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Apr 19, 2008, 1:03:02 AM (16 years ago)

Author:

Bruno Cornec

Message:

• pb_syntax is now shared
• creation of 2 new shared functions pb_syntax_init and pb_temp_init

File:

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

devel/pb/bin/pb

@@ -12 +12 @@
 use strict 'vars';
 use Getopt::Long qw(:config auto_abbrev no_ignore_case);
-use Pod::Usage;
 use Data::Dumper;
 use English;
 use File::Basename;
 use File::Copy;
-use File::Path;
 use File::stat;
 use File::Temp qw(tempdir);
 use Date::Manip;
-use Time::localtime qw(localtime);
 use POSIX qw(strftime);
-
-
-# Global variables
 use lib qw (lib);
 use ProjectBuilder::Distribution;
@@ -31 +25 @@
 use ProjectBuilder::Base;
 
+# Global variables
 my %opts;                   # CLI Options
 my $action;                 # action to realize
@@ -304 +299 @@
 
 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
+
+# Initialize the syntax string
+
+pb_syntax_init("pb (aka project-builder.org) Version $projectbuilderver-$projectbuilderrev\n");
 
 GetOptions("help|?|h" => \$opts{'h'}, 
@@ -1637 +1636 @@
 }
 
-sub pb_syntax {
-
-my $exit_status = shift || -1;
-my $verbose_level = shift || 0;
-
-my $filehandle = \*STDERR;
-
-$filehandle = \*STDOUT if ($exit_status == 0);
-
-pod2usage( { -message => "pb (aka project-builder.org) Version $projectbuilderver-$projectbuilderrev\n",
-             -exitval => $exit_status  ,
-             -verbose => $verbose_level,
-             -output  => $filehandle } );
-}
-
 sub pb_env_init {
 
@@ -1789 +1773 @@
 
 pb_log(2,"PBBUILDDIR: $ENV{'PBBUILDDIR'}\n");
-#
-# Set temp directory
-#
-if (not defined $ENV{'TMPDIR'}) {
-    $ENV{'TMPDIR'}="/tmp";
-}
-$ENV{'PBTMP'} = tempdir( "pb.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => 1 );
+
+pb_temp_init();
 pb_log(2,"PBTMP: $ENV{'PBTMP'}\n");
 
@@ -3199 +3178 @@
 # If we don't need to do it, or don't have it fake something
 if (((not defined $chglog) || (! -f $chglog)) && ($doit ne "yes")) {
-    my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
+    my @date = pb_get_date();
     $date = strftime("%Y-%m-%d", @date);
     $ndate = UnixDate($date,"%a", "%b", "%d", "%Y");