summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2004-09-16 14:33:46 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2004-09-16 14:33:46 +0000
commit25cf48dd78a34c54817c39c62ffec7ae591ce4db (patch)
tree8e258b7f8a5eef9a286d30fd3aba1406d1decdf2
parentfb65c2da2244c15ed5f6168aa270737d317a834d (diff)
downloadMPC-25cf48dd78a34c54817c39c62ffec7ae591ce4db.tar.gz
ChangeLogTag: Thu Sep 16 09:32:09 2004 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog10
-rw-r--r--README4
-rw-r--r--modules/ProjectCreator.pm17
3 files changed, 28 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dfc9ebb..b9c8ddc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Sep 16 09:32:09 2004 Chad Elliott <elliott_c@ociweb.com>
+
+ * README:
+ * modules/ProjectCreator.pm:
+
+ If an asterisk is used in the exename, sharedname or staticname
+ setting, then it (the asterisk) will be replaced with the project
+ name. Thanks to Martin Corino <mcorino@remedy.nl> for suggesting
+ this.
+
Thu Sep 16 07:45:11 2004 Chad Elliott <elliott_c@ociweb.com>
* modules/BMakeWorkspaceCreator.pm:
diff --git a/README b/README
index de3e3488..7c6ae7f2 100644
--- a/README
+++ b/README
@@ -107,6 +107,10 @@ project (workspace) name contains a capital letter then each word will be
capitalized. For instance, if the above mpc file example was named
Example.mpc, then the modified project name would be Example_Client.
+If the value set for exename contains an asterisk then the asterisk portion
+of the name will be replaced with the current project name. The same logic
+applies to sharedname and staticname.
+
If multiple projects are going to be contained within a single workspace
(using mwc.pl), there can be no duplication of project names. This is
disallowed due to limitations of some workspace tools.
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 719db217..ff4ebd48 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -1757,9 +1757,10 @@ sub generate_default_target_names {
## If we still don't have a project type, then we will
## default to a library if there are source files
if (!$self->exe_target() && $#sources >= 0) {
- my($base) = $self->{'unmodified_project_name'};
- $self->process_assignment('sharedname', $base);
- $self->process_assignment('staticname', $base);
+ $self->process_assignment('sharedname',
+ $self->{'unmodified_project_name'});
+ $self->process_assignment('staticname',
+ $self->{'unmodified_project_name'});
}
}
}
@@ -1773,6 +1774,16 @@ sub generate_default_target_names {
$self->process_assignment('sharedname', undef);
}
}
+
+ ## Check for the use of an asterisk in the name
+ foreach my $key ('exename', 'sharedname', 'staticname') {
+ my($value) = $self->get_assignment($key);
+ if (defined $value && $value =~ /\*/) {
+ $value = $self->fill_type_name($value,
+ $self->{'unmodified_project_name'});
+ $self->process_assignment($key, $value);
+ }
+ }
}