diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-11 11:41:31 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-11 11:41:31 +0000 |
| commit | 535970152f9f94cff707718d51f264832099dcc7 (patch) | |
| tree | 3844e5b6ab91150df942cf2fe6aa902be8d7c66b | |
| parent | 4f77c6380beb00e015a33edcfd7146a11b87bb97 (diff) | |
| download | ATCD-535970152f9f94cff707718d51f264832099dcc7.tar.gz | |
ChangeLogTag: Thu Sep 11 06:39:23 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/WorkspaceCreator.pm | 4 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 7 |
3 files changed, 22 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index a721a287d2c..40151dca628 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Thu Sep 11 06:39:23 2003 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: + + Fixed a bug with the automatic project dependencies that was + related to directories and the location that mwc.pl was run. + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Added support for poor AIX compilers that don't deal with + templates correctly. This was basically a cut and paste into the + template from the original ACE_wrappers/tests/Makefile. + Wed Sep 10 13:26:14 MST 2003 Trevor Fields <fields_t@ociweb.com> * bin/performance_stats.sh: diff --git a/bin/MakeProjectCreator/modules/WorkspaceCreator.pm b/bin/MakeProjectCreator/modules/WorkspaceCreator.pm index 57ef2cb0726..afbe15780e8 100644 --- a/bin/MakeProjectCreator/modules/WorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/WorkspaceCreator.pm @@ -884,7 +884,7 @@ sub add_implicit_project_dependencies { my(%bidir) = (); ## Take the current working directory and regular expression'ize it. - $cwd = $self->escape_regex_special($cwd) . '/'; + $cwd = $self->escape_regex_special($cwd); ## Look at each projects file list and check it against all of the ## others. If any of the other projects file lists contains anothers @@ -917,7 +917,7 @@ sub add_implicit_project_dependencies { ## Remove our starting directory from the projects directory ## to get the right part of the directory to prepend. - $dir =~ s/^$cwd//; + $dir =~ s/^$cwd[\/\\]*//; if ($dir ne '') { $file = "$dir/$file"; } diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 3f86aba99c5..9a9823ff29d 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -324,6 +324,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk <%endif%> +# To build multiple executables in the same directory on AIX, it works +# best to wipe out any previously-created $(TEMPINCDIR) directory. +# The compiler/linker isn't too smart about instantiating templates... +ifdef TEMPINCDIR + COMPILE.cc := $(RM) -r $(TEMPINCDIR); $(COMPILE.cc) +endif + <%if(includes)%> CPPFLAGS +=<%foreach(includes)%> -I<%include%><%endfor%> <%endif%> |