Changeset 495 in ProjectBuilder

Timestamp:

Jul 10, 2008, 11:36:18 AM (16 years ago)

Author:

Bruno Cornec

Message:

• all global variables are prefixed with pb
• First attempt at using locale and gettext
• use of pb_display and pb_display_init added
• Update presentation following RMLL 2008

Files:

• devel/pb-doc/pb-presentation.odp (modified) ( previous)
• devel/pb-modules/bin/pbdistrocheck (modified) (1 diff)
• devel/pb-modules/lib/ProjectBuilder/Base.pm (modified) (7 diffs)
• devel/pb/bin/pb (modified) (5 diffs)
• projects/buffer/pbconf/1.19/buffer.pb (modified) (1 diff)

devel/pb-modules/bin/pbdistrocheck

@@ -19 +19 @@
 GetOptions("verbose|v+" => \$opts{'v'});
 if (defined $opts{'v'}) {
-    $debug = $opts{'v'};
+    $pbdebug = $opts{'v'};
 }
 if (defined $opts{'l'}) {
-    open(LOG,"> $opts{'l'}") || die "Unable to log to $opts{'l'}: $!";
-    $LOG = \*LOG;
-    $debug = 0  if ($debug == -1);
+    open(pbLOG,"> $opts{'l'}") || die "Unable to log to $opts{'l'}: $!";
+    $pbLOG = \*pbLOG;
+    $pbdebug = 0  if ($pbdebug == -1);
     }
-pb_log_init($debug, $LOG);
+pb_log_init($pbdebug, $pbLOG);
 
 my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -20 +20 @@
 use Pod::Usage;
 use English;
+use locale;
+use Locale::gettext;
+use POSIX qw(setlocale);
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -28 +31 @@
 # any code which uses this module.
  
-our $debug = 0;         # Global debug level
-our $LOG = \*STDOUT;    # File descriptor of the log file
-our $synmsg = "Error";  # Global error message
+our $pbdebug = 0;       # Global debug level
+our $pbLOG = \*STDOUT;  # File descriptor of the log file
+our $pbsynmsg = "Error";    # Global error message
+our $pbdisplaytype = "text";
+                        # default display mode for messages
+our $pblocale = "C";
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_display_file pb_syntax_init pb_syntax pb_temp_init $debug $LOG);
+our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_display pb_display_init pb_get_uri pb_get_content pb_display_file pb_syntax_init pb_syntax pb_temp_init $pbdebug $pbLOG $pbdisplaytype $pblocale);
 
 =pod
@@ -79 +85 @@
   pb_log_init(2,\*STDOUT);
   pb_log(1,"Message to print\n");
+
+  #
+  # Manages prints of the program
+  #
+  pb_display_init("text","fr_FR:UTF-8");
+  pb_display("Message to print\n");
 
   #
@@ -220 +232 @@
 sub pb_log_init {
 
-$debug = shift || 0;
-$LOG = shift || \*STDOUT;
-pb_log(1,"Debug value: $debug\n");
+$pbdebug = shift || 0;
+$pbLOG = shift || \*STDOUT;
+pb_log(1,"Debug value: $pbdebug\n");
 
 } 
@@ -249 +261 @@
 my $msg = shift;
 
-print $LOG "$msg" if ($dlevel <= $debug);
+print $pbLOG "$msg" if ($dlevel <= $pbdebug);
+}
+
+
+=item B<pb_display_init>
+
+This function initializes the environment used by the pb_display function.
+
+The first parameter is the type of display which will be used. Could be "text", "web", "newt",...
+The second parameter is the loacle to be used.
+
+The call to B<pb_display_init> is typically done after getting a parameter on the CLI indicating the locale used or the type of interface to report messages to.
+
+=cut
+
+sub pb_display_init {
+
+$pbdisplaytype = shift || "text";
+$pblocale = shift || "C";
+
+setlocale(LC_ALL, $pblocale);
+pb_log(1,"Using $pbdisplaytype interface with $pblocale locale\n");
+
+if ($pbdisplaytype =~ /text/) {
+} elsif ($pbdisplaytype = /newt/) {
+} else {
+    die "display system $pbdisplaytype unsupported";
+}
+}
+
+=item B<pb_display>
+
+This function prints the messages passed as parameter using the configuration set up with the B<pb_display_init> function.
+
+Here is a usage example:
+
+  pb_display_init("text","fr_FR.UTF-8");
+  pb_display("Hello World\n");
+
+  will print:
+  
+  Bonjour Monde
+
+=cut 
+
+sub pb_display {
+
+my $msg = shift;
+
+if ($pbdisplaytype =~ /text/) {
+    print STDOUT gettext($msg);
+    }
 }
 
@@ -298 +361 @@
 sub pb_syntax_init {
 
-$synmsg = shift || "Error";
+$pbsynmsg = shift || "Error";
 }
 
@@ -320 +383 @@
 $filehandle = \*STDOUT if ($exit_status == 0);
 
-pod2usage( { -message => $synmsg,
+pod2usage( { -message => $pbsynmsg,
              -exitval => $exit_status  ,
              -verbose => $verbose_level,

devel/pb/bin/pb

@@ -339 +339 @@
 }
 if (defined $opts{'v'}) {
-    $debug = $opts{'v'};
+    $pbdebug = $opts{'v'};
 }
 if (defined $opts{'f'}) {
@@ -345 +345 @@
 }
 if (defined $opts{'q'}) {
-    $debug=-1;
+    $pbdebug=-1;
 }
 if (defined $opts{'l'}) {
-    open(LOG,"> $opts{'l'}") || die "Unable to log to $opts{'l'}: $!";
-    $LOG = \*LOG;
-    $debug = 0  if ($debug == -1);
-    }
-pb_log_init($debug, $LOG);
+    open(pbLOG,"> $opts{'l'}") || die "Unable to log to $opts{'l'}: $!";
+    $pbLOG = \*pbLOG;
+    $pbdebug = 0  if ($pbdebug == -1);
+    }
+pb_log_init($pbdebug, $pbLOG);
+pb_display_init("text","");
 
 # Handle root of the project if defined
@@ -1528 +1529 @@
 use File::Copy;
 
-our $debug;
-our $LOG;
-our $synmsg = "pbscript";
-pb_log_init($debug, $LOG);
+our $pbdebug;
+our $pbLOG;
+our $pbsynmsg = "pbscript";
+pb_log_init($pbdebug, $pbLOG);
 pb_temp_init();
 
@@ -1774 +1775 @@
         pb_system("emerge wget sudo ntp DateManip File-MimeInfo","$cmtall");
 } else {
-    print "No pkg to install\n";
+    pb_log(0,"No pkg to install\n");
 }
 EOF
@@ -1839 +1840 @@
     # Get subject line
     my $sl = "Project $ENV{'PBPROJ'} version $ENV{'PBPROJVER'} is now available";
-    print "Please enter the title of your announce\n";
-    print "(By default: $sl)\n";
+    pb_log(0,"Please enter the title of your announce\n");
+    pb_log(0,"(By default: $sl)\n");
     my $sl2 = <STDIN>;
     $sl = $sl2 if ($sl2 !~ /^$/);

projects/buffer/pbconf/1.19/buffer.pb

@@ -24 +24 @@
 # (containing already a directory with the project-version name)
 pbwf buffer = 1
+
+# Patches to apply to buffer not upstream
+pbpatch buffer = svn://svn+ssh/svn.project-builder.org/mondo/svn/projects/buffer/,...
 
 #