From 57614a21885e304ab6afed3c81b9bf5764ef667b Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 7 Sep 2011 17:29:26 +0000 Subject: Wed Sep 7 17:27:01 UTC 2011 Johnny Willemsen * 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 --- TAO/MPC/modules/IDLHelper.pm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'TAO/MPC') 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); -- cgit v1.2.1