ChangeLogTag: Thu Mar 20 07:23:48 2003 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 8 insertions, 14 deletions

diff --git a/modules/Driver.pm b/modules/Driver.pm
index 14ad94ba..a57858f1 100644
--- a/modules/Driver.pm
+++ b/modules/Driver.pm
@@ -39,7 +39,7 @@ sub new {
 
   $self->{'path'}     = $path;
   $self->{'name'}     = $name;
-  $self->{'version'}  = 1.4;
+  $self->{'version'}  = 1.5;
   $self->{'types'}    = {};
   $self->{'creators'} = \@creators;
   $self->{'default'}  = $creators[0];
@@ -60,9 +60,8 @@ sub usageAndExit {
   print STDERR "$base v$self->{'version'}\n" .
                "Usage: $base [-global <file>] [-include <directory>] [-recurse]\n" .
                $spaces . "[-ti <dll | lib | dll_exe | lib_exe>:<file>]\n" .
-               $spaces . "[-template <file>] " .
-               "[-dynamic_only] [-static_only]\n" .
-               $spaces . "[-relative NAME=VAR] [-noreldefs] [-notoplevel]\n" .
+               $spaces . "[-template <file>] [-relative NAME=VAR]\n" .
+               $spaces . "[-noreldefs] [-notoplevel] [-static]\n" .
                $spaces . "[-value_template <NAME+=VAL | NAME=VAL | NAME-=VAL>]\n" .
                $spaces . "[-value_project <NAME+=VAL | NAME=VAL | NAME-=VAL>]\n" .
                $spaces . "[-type <";
@@ -91,8 +90,8 @@ sub usageAndExit {
 "                       for the specific type as shown above\n" .
 "                       (ex. -ti dll_exe:vc8exe)\n" .
 "       -template       Specifies the template name (with no extension).\n" .
-"       -dynamic_only   Specifies that only dynamic projects will be generated.\n" .
-"       -static_only    Specifies that only static projects will be generated.\n" .
+"       -static         Specifies that static projects will be generated in\n" .
+"                       addition to dynamic projects.\n" .
 "       -recurse        Recurse from the current directory and generate from\n" .
 "                       all found input files.\n" .
 "       -relative       Any \$() variable in an mpc that is matched to NAME\n" .
@@ -125,7 +124,7 @@ sub completion_command {
   my($self) = shift;
   my($str)  = "complete $self->{'name'} " .
               "'c/-/(global include type template relative " .
-              "ti dynamic_only static_only noreldefs notoplevel " .
+              "ti static noreldefs notoplevel " .
               "value_template value_project)/' " .
               "'c/dll:/f/' 'c/dll_exe:/f/' 'c/lib_exe:/f/' 'c/lib:/f/' " .
               "'n/-ti/(dll lib dll_exe lib_exe)/:' 'n/-type/(";
@@ -153,7 +152,7 @@ sub run {
   my($template)   = undef;
   my(%ti)         = ();
   my($dynamic)    = 1;
-  my($static)     = 1;
+  my($static)     = 0;
   my(%relative)   = ();
   my($reldefs)    = 1;
   my($toplevel)   = 1;
@@ -332,13 +331,8 @@ sub run {
         }
       }
     }
-    elsif ($arg eq '-dynamic_only') {
-      $static  = 0;
-      $dynamic = 1;
-    }
-    elsif ($arg eq '-static_only') {
+    elsif ($arg eq '-static') {
       $static  = 1;
-      $dynamic = 0;
     }
     elsif ($arg =~ /^-/) {
       $self->usageAndExit();