diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2011-11-23 14:40:43 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2011-11-23 14:40:43 +0000 |
| commit | addf88d7c0e46d5ec2daaffe29f36193339be9ba (patch) | |
| tree | 3a0458b9e8d84cf948cd2f5db695d702c0d497da | |
| parent | 4cfe657d0c028b6a6283a459c81d225f743c5dc6 (diff) | |
| download | ATCD-addf88d7c0e46d5ec2daaffe29f36193339be9ba.tar.gz | |
Wed Nov 23 14:37:02 UTC 2011 Martin Corino <mcorino@remedy.nl>
* MPC/config/taobaseidldefaults.mpb:
* MPC/modules/IDLHelper.pm:
Moved addition of generated executor files (-Gex) from
taobaseidldefaults.mpb to IDLHelper.pm to be able to
correctly and transparently handle -oE and -oN switches.
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/MPC/config/taobaseidldefaults.mpb | 8 | ||||
| -rw-r--r-- | TAO/MPC/modules/IDLHelper.pm | 13 |
3 files changed, 22 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e8208576796..0467603b570 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Wed Nov 23 14:37:02 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * MPC/config/taobaseidldefaults.mpb: + * MPC/modules/IDLHelper.pm: + + Moved addition of generated executor files (-Gex) from + taobaseidldefaults.mpb to IDLHelper.pm to be able to + correctly and transparently handle -oE and -oN switches. + Tue Nov 22 12:46:00 UTC 2011 Martin Corino <mcorino@remedy.nl> * tests/Bug_3531b_Regression/server.cpp: diff --git a/TAO/MPC/config/taobaseidldefaults.mpb b/TAO/MPC/config/taobaseidldefaults.mpb index 510dcce15a0..0337b206e3b 100644 --- a/TAO/MPC/config/taobaseidldefaults.mpb +++ b/TAO/MPC/config/taobaseidldefaults.mpb @@ -74,14 +74,6 @@ project: build_files { commandflags(-Gcn) += _conn } - optional(source_pre_extension) { - commandflags(-Gex) += _exec - } - - optional(header_pre_extension) { - commandflags(-Gex) += _exec - } - optional(generic_outputext) { commandflags(-Glem || -GM) += .idl } diff --git a/TAO/MPC/modules/IDLHelper.pm b/TAO/MPC/modules/IDLHelper.pm index 553d93207de..cc33ad2ddf9 100644 --- a/TAO/MPC/modules/IDLHelper.pm +++ b/TAO/MPC/modules/IDLHelper.pm @@ -10,6 +10,19 @@ sub get_output { my($self, $file, $flags) = @_; my @out; + # handle generated executor files (if any) + if ($flags =~ /-Gex/ && !($flags =~ /-oN/)) { + my $gendir = ''; + if ($flags =~ /-oE\s*(\S+)/) { + $gendir = $1; + if (!($gendir =~ /(\\|\/)$/)) { + $gendir .= '/'; + } + } + $file =~ /^(.*)(\.p?idl)$/; + push(@out, $gendir.$1."_exec.h"); + push(@out, $gendir.$1."_exec.cpp"); + } if ($flags =~ /-Gxhex/ && $flags =~ /-Wb,exec_export_include=(\S*)/) { push(@out, $1); } |