Changeset 1583 in ProjectBuilder

Timestamp:

May 24, 2012, 12:07:15 AM (12 years ago)

Author:

Bruno Cornec

Message:

• option -h can now be passed multiple times. one provides synopsis, two gives full help.
• Move message indicating end of build earlier, so that packages to install are back at the end.

File:

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

devel/pb/bin/pb

@@ -644 +644 @@
 pb_syntax_init("$appname (aka project-builder.org) Version $projectbuilderver-$projectbuilderrev\n");
 
-GetOptions("help|?|h" => \$opts{'h'}, 
+GetOptions("help|?|h+" => \$opts{'h'}, 
         "man" => \$opts{'man'},
         "verbose|v+" => \$opts{'v'},
@@ -666 +666 @@
 ) || pb_syntax(-1,0);
 
-if (defined $opts{'h'}) {
-    pb_syntax(0,1);
-}
-if (defined $opts{'man'}) {
-    pb_syntax(0,2);
-}
-if (defined $opts{'v'}) {
-    $pbdebug = $opts{'v'};
-}
-if (defined $opts{'f'}) {
-    $pbforce=1;
-}
-if (defined $opts{'q'}) {
-    $pbdebug=-1;
-}
-if (defined $opts{'S'}) {
-    $pbsnap=1;
-}
-if (defined $opts{'k'}) {
-    $pbkeep=1;
-}
 if (defined $opts{'l'}) {
     open(pbLOG,"> $opts{'l'}") || die "Unable to log to $opts{'l'}: $!";
@@ -693 +672 @@
     }
 pb_log_init($pbdebug, $pbLOG);
+
+if (defined $opts{'h'}) {
+    pb_syntax(0,$opts{'h'}-1);
+}
+if (defined $opts{'man'}) {
+    pb_syntax(0,2);
+}
+if (defined $opts{'v'}) {
+    $pbdebug = $opts{'v'};
+}
+if (defined $opts{'f'}) {
+    $pbforce=1;
+}
+if (defined $opts{'q'}) {
+    $pbdebug=-1;
+}
+if (defined $opts{'S'}) {
+    $pbsnap=1;
+}
+if (defined $opts{'k'}) {
+    $pbkeep=1;
+}
 pb_display_init("text","");
 
@@ -1739 +1740 @@
     # Sign packages
     pb_sign_pkgs($pbos,$made);
+    pb_log(0,"INFO: ------ Finished building package ------\n");
 
     # Find the appropriate check cmd/opts
@@ -1780 +1782 @@
     print KEEP "$made\n";
     close(KEEP);
-    pb_log(0,"INFO: ------ Finished building package ------\n");
 }