diff options
| author | Martin Corino <mcorino@remedy.nl> | 2020-11-11 14:26:55 +0100 |
|---|---|---|
| committer | Martin Corino <mcorino@remedy.nl> | 2020-11-11 14:26:55 +0100 |
| commit | 24404e88a3eeb4fcd04c0bee215fba6e6978322c (patch) | |
| tree | b336acb1c20fa475a35d8f7efc211ac8049c0ae1 /ACE/bin | |
| parent | 3360bca8579dde1f2c93b5d73ba56e1791db7d12 (diff) | |
| download | ATCD-24404e88a3eeb4fcd04c0bee215fba6e6978322c.tar.gz | |
Add precious files support and template cleanup
* TAO/MPC/config/tao_rules.mpb:
Added.
* ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm:
* ACE/bin/MakeProjectCreator/templates/gnu.mpd:
* TAO/MPC/config/taodefaults.mpb:
* TAO/TAO_IDL/tao_idl.mpc:
* TAO/TAO_IDL/tao_idl_be.mpc:
* TAO/TAO_IDL/tao_idl_fe.mpc:
Diffstat (limited to 'ACE/bin')
| -rw-r--r-- | ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm | 18 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/templates/gnu.mpd | 14 |
2 files changed, 4 insertions, 28 deletions
diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm index 635cd48bb7d..66faed32dd0 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm @@ -52,24 +52,6 @@ sub fill_value { return 'VPATH = .:' . $str . $self->crlf(); } } - elsif ($name eq 'tao') { - my($incs) = $self->get_assignment('includes'); - my($libs) = $self->get_assignment('libpaths'); - return ((defined $incs && $incs =~ /tao/i) || - (defined $libs && $libs =~ /tao/i)); - } - elsif ($name eq 'ciao') { - my($incs) = $self->get_assignment('includes'); - my($libs) = $self->get_assignment('libpaths'); - return ((defined $incs && $incs =~ /ciao/i) || - (defined $libs && $libs =~ /ciao/i)); - } - elsif ($name eq 'dance') { - my($incs) = $self->get_assignment('includes'); - my($libs) = $self->get_assignment('libpaths'); - return ((defined $incs && $incs =~ /DAnCE/i) || - (defined $libs && $libs =~ /DAnCE/i)); - } elsif ($name eq 'genins') { my $ins = ''; $self->get_install_info(sub { $ins .= '#' . $_[0] }); diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 57b40e9105a..5dab8638c87 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -209,15 +209,6 @@ VSHDIR = <%targetoutdir%>.shobj/ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU <%marker(extension)%> -<%if(ciao)%> -include $(CIAO_ROOT)/rules.ciao.GNU -<%endif%> -<%if(dance)%> -include $(DANCE_ROOT)/rules.dance.GNU -<%endif%> -<%if(tao)%> -include $(TAO_ROOT)/rules.tao.GNU -<%endif%> <%if(version)%> GNUACE_PROJECT_VERSION = <%version%> @@ -579,6 +570,9 @@ export PATH := $(PATH):<%custom_type->libpath%>$(if $(ARCH),:<%cust <%foreach(custom_type->input_files)%> <%if(custom_type->input_file->output_files)%> GENERATED_DIRTY +=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%> +<%if(precious_files)%> +PRECIOUS_FILES +=<%foreach(precious_files)%><%foreach(custom_type->input_file->output_files)%><%if(contains(custom_type->input_file->output_file, precious_file))%> <%custom_type->input_file->output_file%><%endif%><%endfor%><%endfor%> +<%endif%> <%if(custom_type->input_file->non_source_output_files)%> OBJS_DEPEND_ON_GENERATED = 1 <%endif%> @@ -744,7 +738,7 @@ incremental_depend_idl:: realclean: clean ifneq ($(GENERATED_DIRTY),) - -$(RM) -r $(GENERATED_DIRTY) + -$(RM) -r $(filter-out $(PRECIOUS_FILES),$(GENERATED_DIRTY)) endif <%if(postclean)%> -<%eval(postclean)%> |