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

2 files changed, 18 insertions, 27 deletions

diff --git a/bin/MakeProjectCreator/USAGE b/bin/MakeProjectCreator/USAGE
index 6d031d06bbb..00080336dbb 100644
--- a/bin/MakeProjectCreator/USAGE
+++ b/bin/MakeProjectCreator/USAGE
@@ -11,8 +11,8 @@ projects for each one found.
 
 Usage: mwc.pl [-global <file>] [-include <directory>] [-recurse]
               [-ti <dll | lib | dll_exe | lib_exe>:<file>]
-              [-template <file>] [-dynamic_only] [-static_only]
-              [-relative NAME=VAR] [-noreldefs] [-notoplevel]
+              [-template <file>] [-relative NAME=VAR]
+              [-noreldefs] [-notoplevel] [-static]
               [-value_template <NAME+=VAL | NAME=VAL | NAME-=VAL>]
               [-value_project <NAME+=VAL | NAME=VAL | NAME-=VAL>]
               [-type <borland | em3 | ghs | gnu | make | nmake |
@@ -28,8 +28,8 @@ Usage: mwc.pl [-global <file>] [-include <directory>] [-recurse]
                        for the specific type as shown above
                        (ex. -ti dll_exe:vc8exe)
        -template       Specifies the template name (with no extension).
-       -dynamic_only   Specifies that only dynamic projects will be generated.
-       -static_only    Specifies that only static projects will be generated.
+       -static         Specifies that static projects will be generated in
+                       addition to dynamic projects.
        -recurse        Recurse from the current directory and generate from
                        all found input files.
        -relative       Any $() variable in an mpc that is matched to NAME
@@ -74,11 +74,8 @@ file should have a .mpd extension and sit in one of the include search
 directories.  NOTE: The -template option overrides the template file for all
 types specified.
 
-The -dynamic_only option can be used to avoid generating static project
-files.  This currently only applies to the vc6 type.
-
-The -static_only option can be used to avoid generating dynamic project
-files.  This currently only applies to the vc6 type.
+The -static option can be used to generate static project files in addition
+to dynamic project files.  This currently only applies to the vc6 type.
 
 The -noreldefs option says not to generate default relative definitions for
 ACE_ROOT and TAO_ROOT (which would come from environment variables).
@@ -104,8 +101,8 @@ project in the directory from which the script was started.
 
 Usage: mpc.pl [-global <file>] [-include <directory>] [-recurse]
               [-ti <dll | lib | dll_exe | lib_exe>:<file>]
-              [-template <file>] [-dynamic_only] [-static_only]
-              [-relative NAME=VAR] [-noreldefs] [-notoplevel]
+              [-template <file>] [-relative NAME=VAR]
+              [-noreldefs] [-notoplevel] [-static]
               [-value_template <NAME+=VAL | NAME=VAL | NAME-=VAL>]
               [-value_project <NAME+=VAL | NAME=VAL | NAME-=VAL>]
               [-type <borland | em3 | ghs | gnu | make | nmake |
@@ -121,8 +118,8 @@ Usage: mpc.pl [-global <file>] [-include <directory>] [-recurse]
                        for the specific type as shown above
                        (ex. -ti dll_exe:vc8exe)
        -template       Specifies the template name (with no extension).
-       -dynamic_only   Specifies that only dynamic projects will be generated.
-       -static_only    Specifies that only static projects will be generated.
+       -static         Specifies that static projects will be generated in
+                       addition to dynamic projects.
        -recurse        Recurse from the current directory and generate from
                        all found input files.
        -relative       Any $() variable in an mpc that is matched to NAME
diff --git a/bin/MakeProjectCreator/modules/Driver.pm b/bin/MakeProjectCreator/modules/Driver.pm
index 14ad94bab88..a57858f111d 100644
--- a/bin/MakeProjectCreator/modules/Driver.pm
+++ b/bin/MakeProjectCreator/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();