diff options
| author | johnc <johnc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-22 15:09:24 +0000 |
|---|---|---|
| committer | johnc <johnc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-22 15:09:24 +0000 |
| commit | e730aeeb8df50fbe3f5ddcdda74d5c0642a36752 (patch) | |
| tree | 0101c5d3dc7ce1c5ae00bf1f1bb52c9b5be7bf81 | |
| parent | 5022afb1e070d0012fca958d00cc57fedf77c67f (diff) | |
| download | ATCD-e730aeeb8df50fbe3f5ddcdda74d5c0642a36752.tar.gz | |
ChangeLogTag: Thu Feb 22 15:07:22 UTC 2007 Ciju John <johnc@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm | 10 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/templates/gnu.mpd | 16 |
3 files changed, 24 insertions, 8 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1f1dda25ddd..d35d718dd55 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 22 15:07:22 UTC 2007 Ciju John <johnc@ociweb.com> + + * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm: + * bin/MakeProjectCreator/templates/gnu.mpd: + Additions to support DDS specific build rules and versioning. + Thu Feb 22 13:56:42 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Makefile.am: diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm index 9d0ae9eb366..47ef47cb3d2 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm @@ -59,11 +59,17 @@ sub fill_value { (defined $libs && $libs =~ /tao/i)); } elsif ($name eq 'ciao') { - my($incs) = $self->get_assignment('includes'); - my($libs) = $self->get_assignment('libpaths'); + 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 'dds') { + my($incs) = $self->get_assignment('includes'); + my($libs) = $self->get_assignment('libpaths'); + return ((defined $incs && $incs =~ /dds/i) || + (defined $libs && $libs =~ /dds/i)); + } return undef; } diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 0600efcd80b..d3816133984 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -157,6 +157,16 @@ VSHDIR = <%targetoutdir%>.shobj/ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU ## We don't need the ACELIB setting from wrapper_macros.GNU ACELIB = +<%if(!dds && version)%> + +ifeq ($(versioned_so),1) + SOVERSION = .<%version%> +endif # versioned_so + +<%endif%> +<%if(dds)%> +include $(DDS_ROOT)/rules.dds.GNU +<%endif%> <%if(ciao)%> include $(CIAO_ROOT)/rules.ciao.GNU <%endif%> @@ -164,12 +174,6 @@ include $(CIAO_ROOT)/rules.ciao.GNU tao_dont_use_idl_make_rule = 1 include $(TAO_ROOT)/rules.tao.GNU <%endif%> -<%if(version)%> - -ifeq ($(versioned_so),1) -SOVERSION = .<%version%> -endif -<%endif%> <%if(resource_files)%> ifneq (,$(RC)) |