[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-500-ged1e58e

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  ed1e58e8b35bc971451f4e0a357daa903cd7820d (commit)
      from  c2f2e01357c1b087aa1261fb2cac8687426d5a78 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit ed1e58e8b35bc971451f4e0a357daa903cd7820d
Author: Julien Kerihuel <j.kerihuel at openchange.org>
Date:   Fri Jan 18 18:30:00 2008 +0100

    pidl: Add --version argument.

-----------------------------------------------------------------------

Summary of changes:
 source/pidl/lib/Parse/Pidl.pm |    2 +-
 source/pidl/pidl              |   25 +++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/pidl/lib/Parse/Pidl.pm b/source/pidl/lib/Parse/Pidl.pm
index 0c6e0e5..c2c9463 100644
--- a/source/pidl/lib/Parse/Pidl.pm
+++ b/source/pidl/lib/Parse/Pidl.pm
@@ -9,7 +9,7 @@ package Parse::Pidl;
 
 require Exporter;
 @ISA = qw(Exporter);
- at EXPORT_OK = qw(warning error fatal);
+ at EXPORT_OK = qw(warning error fatal $VERSION);
 
 use strict;
 
diff --git a/source/pidl/pidl b/source/pidl/pidl
index 4dfd57d..220d62c 100755
--- a/source/pidl/pidl
+++ b/source/pidl/pidl
@@ -52,6 +52,10 @@ both marshalling/unmarshalling and debugging purposes).
 =item I<--help>
 
 Show list of available options.
+
+=item I<--version>
+
+Show pidl version
 		
 =item I<--outputdir OUTNAME>
 
@@ -403,7 +407,7 @@ use lib "$RealBin";
 use lib "$RealBin/lib";
 use Getopt::Long;
 use File::Basename;
-use Parse::Pidl;
+use Parse::Pidl qw ( $VERSION );
 use Parse::Pidl::Util;
 
 #####################################################################
@@ -453,6 +457,7 @@ sub FileSave($$)
 
 my(@opt_incdirs) = (); 
 my($opt_help) = 0;
+my($opt_version) = 0;
 my($opt_parse_idl_tree) = 0;
 my($opt_dump_idl_tree);
 my($opt_dump_ndr_tree);
@@ -483,7 +488,9 @@ my($opt_warn_compat) = 0;
 # display help text
 sub ShowHelp()
 {
-print "perl IDL parser and code generator
+print "perl IDL parser and code generator\n";
+ShowVersion();
+print"
 Copyright (C) Andrew Tridgell <tridge\@samba.org>
 Copyright (C) Jelmer Vernooij <jelmer\@samba.org>
 
@@ -491,6 +498,7 @@ Usage: $Script [options] [--] <idlfile> [<idlfile>...]
 
 Generic Options:
  --help                  this help page
+ --version               show pidl version
  --outputdir=OUTDIR      put output in OUTDIR/ [.]
  --warn-compat           warn about incompatibility with other compilers
  --quiet                 be quiet
@@ -528,9 +536,17 @@ Wireshark parsers:
     exit(0);
 }
 
+#########################################
+# Display version
+sub ShowVersion()
+{
+    print "perl IDL version $VERSION\n";
+}
+
 # main program
 my $result = GetOptions (
 	    'help|h|?' => \$opt_help, 
+            'version' => \$opt_version,
 	    'outputdir=s' => \$opt_outputdir,
 	    'dump-idl' => \$opt_dump_idl,
 		'dump-idl-tree:s' => \$opt_dump_idl_tree,
@@ -565,6 +581,11 @@ if ($opt_help) {
     exit(0);
 }
 
+if ($opt_version) {
+    ShowVersion();
+    exit(0);
+}
+
 sub process_file($)
 {
 	my $idl_file = shift;


-- 
Samba Shared Repository