From 66dbbf906709097d91b237aff92c8be26d2b35d6 Mon Sep 17 00:00:00 2001 From: wilson_d Date: Mon, 22 Sep 2003 16:18:21 +0000 Subject: ChangeLogTag: Mon Sep 16 13:33:50 2003 Dale Wilson --- modules/Driver.pm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/modules/Driver.pm b/modules/Driver.pm index a8eb65d9..d91e8ba9 100644 --- a/modules/Driver.pm +++ b/modules/Driver.pm @@ -40,7 +40,7 @@ sub new { $self->{'path'} = $path; $self->{'name'} = $name; - $self->{'version'} = 1.9; + $self->{'version'} = "2.1"; $self->{'types'} = {}; $self->{'creators'} = \@creators; $self->{'default'} = $creators[0]; @@ -91,17 +91,18 @@ sub optionError { my($base) = $self->{'name'}; if (defined $line) { - print STDERR "$line\n"; + print STDERR "ERROR: $line\n"; } my($spaces) = (' ' x (length($base) + 8)); print STDERR "$base v$self->{'version'}\n" . - "Usage: $base [-global ] [-include ] [-recurse]\n" . - $spaces . "[-ti :]\n" . + "Usage: $base [-global ] [-include ] [-recurse]]\n" . + $spaces . "[-ti :] [-hierarchy]\n" . $spaces . "[-template ] [-relative NAME=VAR] [-base ]\n" . $spaces . "[-noreldefs] [-notoplevel] [-static] [-static_only]\n" . $spaces . "[-value_template ]\n" . $spaces . "[-value_project ]\n" . - $spaces . "[-feature_file ]\n" . + $spaces . "[-feature_file ] [-make_coexistence]\n" . + $spaces . "[-exclude ]\n" . $spaces . "[-type <"; my(@keys) = sort keys %{$self->{'types'}}; @@ -121,11 +122,14 @@ sub optionError { print STDERR " -base Add as a base project to each generated\n" . " project file.\n" . +" -exclude Use this option to exclude directories when searching\n" . +" for input files.\n" . " -feature_file Specifies the feature file to read before processing.\n" . " The default feature file is default.features under the\n" . " config directory.\n" . " -global Specifies the global input file. Values stored\n" . " within this file are applied to all projects.\n" . +" -hierarchy Generate a workspace in a hierarchical fashion.\n" . " -include Specifies a directory to search when looking for base\n" . " projects, template input files and templates. This\n" . " option can be used multiple times to add directories.\n" . @@ -141,6 +145,8 @@ sub optionError { " -relative Any \$() variable in an mpc that is matched to NAME\n" . " is replaced by VAR only if VAR can be made into a\n" . " relative path based on the current working directory.\n" . +" -make_coexistence If multiple 'make' based project types are\n" . +" generated, they will be named such that they can coexist.\n" . " -noreldefs Do not try to generate default relative definitions.\n" . " -notoplevel Do not generate the top level target file. Files\n" . " are still process, but no top level file is created.\n" . @@ -325,7 +331,10 @@ sub run { $options->{'toplevel'}, $options->{'baseprojs'}, $global_feature_file, - $options->{'feature_file'}); + $options->{'feature_file'}, + $options->{'hierarchy'}, + $options->{'exclude'}, + $options->{'coexistence'}); if ($base ne $file) { my($dir) = ($base eq '' ? $file : dirname($file)); if (!$generator->cd($dir)) { -- cgit v1.2.1