diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-05-20 18:00:55 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-05-20 18:00:55 +0000 |
| commit | 7166c69eb429868b20e0d067fce016d6ada04ad8 (patch) | |
| tree | 02d79fe22e7ac6cce49c4a2762ba75bd1f10a6a4 | |
| parent | 04713a06a601cb1e0e3b930827a25de81ea3021e (diff) | |
| download | ATCD-7166c69eb429868b20e0d067fce016d6ada04ad8.tar.gz | |
merge from head
| -rw-r--r-- | modules/ACE/ChangeLog | 19 | ||||
| -rw-r--r-- | modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd | 8 |
2 files changed, 24 insertions, 3 deletions
diff --git a/modules/ACE/ChangeLog b/modules/ACE/ChangeLog index f0b576e6a96..e4dfae4500a 100644 --- a/modules/ACE/ChangeLog +++ b/modules/ACE/ChangeLog @@ -1,3 +1,22 @@ +Wed May 19 22:06:37 UTC 2010 Adam Mitz <mitza@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Apply a "collapse slashes" function to exeout, libout, and dllout. + This will transform paths with consecutive slashes into the same + logical path with just a single slash. The multiple slahses caused + unexepected results with the "test" comparison in rules.local.GNU and + also with bin/add_rel_link.sh. + +Wed May 19 14:57:54 UTC 2010 Adam Mitz <mitza@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + For Define_Custom commands, skip looking in the ARCH directory + if the command already contains a quote character (because the + command may actually be a script/executable followed by initial + arguments). + Wed May 19 11:29:14 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> * ace/Dev_Poll_Reactor.h: diff --git a/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd index ccb14d05cd3..399daf8c837 100644 --- a/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/modules/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -124,7 +124,8 @@ PRJ_TYPE = library <%if(exename)%> <%if(install)%> -INSBIN ?= <%install%> +COLLAPSE_SLASHES = $(if $(findstring //,$(1)),$(call COLLAPSE_SLASHES,$(subst //,/,$(1))),$(1)) +INSBIN ?= $(call COLLAPSE_SLASHES,<%install%>) <%endif%> ifeq ($(INSBIN),.) ifeq ($(CURDIR),) @@ -145,7 +146,8 @@ endif OUTPUT_DIRECTORY = $(if $(ARCH),$(if $(INSBIN),$(INSBIN)/$(ARCH)),$(INSBIN)) <%else%> <%if(dllout || libout)%> -INSLIB ?= <%if(dllout)%><%dllout%><%else%><%libout%><%endif%> +COLLAPSE_SLASHES = $(if $(findstring //,$(1)),$(call COLLAPSE_SLASHES,$(subst //,/,$(1))),$(1)) +INSLIB ?= $(call COLLAPSE_SLASHES,<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>) <%endif%> ifeq ($(INSLIB),.) ifeq ($(CURDIR),) @@ -586,7 +588,7 @@ endif $(MKDIR) <%flag_overrides(custom_type->input_file, gendir)%> <%endif%> <%endif%> - $(call ADD_QUOTE,$(call ADD_ARCH,<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%>)) <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%if(custom_type->output_option)%><%custom_type->input_file%> <%custom_type->output_option%> $@<%else%><%custom_type->input_file%><%endif%> + $(if $(findstring ",<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%>),<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%>,$(call ADD_QUOTE,$(call ADD_ARCH,<%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%>))) <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%if(custom_type->output_option)%><%custom_type->input_file%> <%custom_type->output_option%> $@<%else%><%custom_type->input_file%><%endif%> <%if(flag_overrides(custom_type->input_file, postcommand))%> <%foreach(custom_type->input_file)%> <%flag_overrides(custom_type->input_file, postcommand)%> |