diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-07 17:29:26 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-07 17:29:26 +0000 |
| commit | 57614a21885e304ab6afed3c81b9bf5764ef667b (patch) | |
| tree | d28eaf49d3cdbae6df8b491c4f76e4a03491d1cb /TAO/MPC | |
| parent | eaf95c025dc9410705104424abcb02b3220ffa6d (diff) | |
| download | ATCD-57614a21885e304ab6afed3c81b9bf5764ef667b.tar.gz | |
Wed Sep 7 17:27:01 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/modules/IDLHelper.pm:
* TAO_IDL/be/be_codegen.cpp:
* TAO_IDL/be/be_global.cpp:
* TAO_IDL/be/be_util.cpp:
* TAO_IDL/be_include/be_global.h:
Added skel_export_file and stub_export_file to define an explicit
filename for these export files that are different than the stub/skel
export_include which could be a full path. This fixes bugzilla 3980
Diffstat (limited to 'TAO/MPC')
| -rw-r--r-- | TAO/MPC/modules/IDLHelper.pm | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/TAO/MPC/modules/IDLHelper.pm b/TAO/MPC/modules/IDLHelper.pm index 21bec3f8ec8..de2ddd8dc3f 100644 --- a/TAO/MPC/modules/IDLHelper.pm +++ b/TAO/MPC/modules/IDLHelper.pm @@ -11,11 +11,19 @@ sub get_output { if ($flags =~ /-Gxhex/ && $flags =~ /-Wb,exec_export_include=(\S*)/) { push(@out, $1); } - if ($flags =~ /-Gxhst/ && $flags =~ /-Wb,stub_export_include=(\S*)/) { - push(@out, $1); + if ($flags =~ /-Gxhst/) { + if ($flags =~ /-Wb,stub_export_file=(\S*)/) { + push(@out, $1); + } elsif ($flags =~ /-Wb,stub_export_include=(\S*)/) { + push(@out, $1); + } } - if ($flags =~ /-Gxhsk/ && $flags =~ /-Wb,skel_export_include=(\S*)/) { - push(@out, $1); + if ($flags =~ /-Gxhsk/) { + if ($flags =~ /-Wb,skel_export_file=(\S*)/) { + push(@out, $1); + } elsif ($flags =~ /-Wb,skel_export_include=(\S*)/) { + push(@out, $1); + } } if ($flags =~ /-Gxhsv/ && $flags =~ /-Wb,svnt_export_include=(\S*)/) { push(@out, $1); |