diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-01-07 19:05:08 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-01-07 19:05:08 +0000 |
| commit | 1e3c85e93121b49a5fe2a297a77c0f156a4db86e (patch) | |
| tree | dd964a41074a6879919fde9af7ef9fa0025e717e | |
| parent | be83907b89d39ebd81988cefe65b3f8598b21138 (diff) | |
| download | ATCD-1e3c85e93121b49a5fe2a297a77c0f156a4db86e.tar.gz | |
ChangeLogTag: Wed Jan 7 13:03:06 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/ProjectCreator.pm | 12 |
2 files changed, 23 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index fce5e48b2ea..dc3e69c2c3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,17 @@ +Wed Jan 7 13:03:06 2004 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/ProjectCreator.pm: + + Added an informational message when a project will be skipped when + a required feature is disabled or an avoided feature is enabled. + Wed Jan 7 18:37:13 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/Makefile.bor: - Added special rule to install the os_include directory and its - subdirectories. Thanks to Chris Kohlhoff for coming up with the - solution and to Cyrille Chépélov <cyrille@softek.fr> for reporting - this. This fixes [BUGID 1669]. + * ace/Makefile.bor: + Added special rule to install the os_include directory and its + subdirectories. Thanks to Chris Kohlhoff for coming up with the + solution and to Cyrille Chépélov <cyrille@softek.fr> for reporting + this. This fixes [BUGID 1669]. Wed Jan 7 12:13:12 2004 Chad Elliott <elliott_c@ociweb.com> diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm index 93691707805..145bd98a6f3 100644 --- a/bin/MakeProjectCreator/modules/ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm @@ -1958,7 +1958,9 @@ sub check_features { my($self) = shift; my($requires) = shift; my($avoids) = shift; + my($info) = shift; my($status) = 1; + my($why) = undef; if (defined $requires) { foreach my $require (split(/\s+/, $requires)) { @@ -1966,6 +1968,7 @@ sub check_features { ## By default, if the feature is not listed, then it is enabled. if (defined $fval && !$fval) { + $why = "requires $require"; $status = 0; last; } @@ -1980,6 +1983,7 @@ sub check_features { ## By default, if the feature is not listed, then it is enabled. if (!defined $fval || $fval) { + $why = "avoids $avoid"; $status = 0; last; } @@ -1987,6 +1991,11 @@ sub check_features { } } + if ($info && !$status) { + print "Skipping " . $self->get_assignment('project_name') . + " (" . $self->get_current_input() . "), it $why.\n"; + } + return $status; } @@ -2137,7 +2146,8 @@ sub write_project { } if ($self->check_features($self->get_assignment('requires'), - $self->get_assignment('avoids'))) { + $self->get_assignment('avoids'), + 1)) { if ($self->need_to_write_project()) { ($status, $error) = $self->write_output_file($file_name); } |