diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-01-23 20:22:44 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-01-23 20:22:44 +0000 |
| commit | 4add4dd4455d90350e634135c8c03c3758521bce (patch) | |
| tree | 1a1ccdd071d3f1b6f2917c15d80e323bec4d33ea | |
| parent | 90f779908a0dd6610edb63a13be7993e76f73ee8 (diff) | |
| download | ATCD-4add4dd4455d90350e634135c8c03c3758521bce.tar.gz | |
Mon Jan 23 20:21:50 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/MakeProjectCreator/templates/gnu.mpd:
Fixed support for idl3toxmi and idl3toidl2 flags
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/templates/gnu.mpd | 8 | ||||
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/MPC/config/taobaseidl3toidl2defaults.mpb | 1 | ||||
| -rw-r--r-- | CIAO/MPC/config/taoidl3toxmidefaults.mpb | 1 |
5 files changed, 17 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 074e8111b77..f214bcb1823 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 23 20:21:50 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/templates/gnu.mpd: + Fixed support for idl3toxmi and idl3toidl2 flags + Mon Jan 23 12:02:07 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/templates/gnu.mpd: diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index e10301b9e1a..b0dd93f14c5 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -130,8 +130,8 @@ TAO_IDL3_TO_IDL2 = <%tao_idl3_to_idl2%> <%if(tao_idl3_to_idl2_dep)%> TAO_IDL3_TO_IDL2_DEP = <%tao_idl3_to_idl2_dep%>$(EXEEXT) <%endif%> -<%if(idl3toidl2flags)%> -TAO_IDL3_TO_IDL2_FLAGS = <%idl3toidl2flags%> +<%if(tao_idl3toidl2flags)%> +TAO_IDL3_TO_IDL2_FLAGS = <%tao_idl3toidl2flags%> <%endif%> <%if(tao_idl3_to_xmi)%> TAO_IDL3_TO_XMI = <%tao_idl3_to_xmi%> @@ -139,8 +139,8 @@ TAO_IDL3_TO_XMI = <%tao_idl3_to_xmi%> <%if(tao_idl3_to_xmi_dep)%> TAO_IDL3_TO_XMI_DEP = <%tao_idl3_to_xmi_dep%>$(EXEEXT) <%endif%> -<%if(idl3toxmiflags)%> -TAO_IDL3_TO_XMI_FLAGS = <%idl3toxmiflags%> +<%if(tao_idl3toxmiflags)%> +TAO_IDL3_TO_XMI_FLAGS = <%tao_idl3toxmiflags%> <%endif%> <%if(exename)%> diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 2fe9e7fc22c..39ab8f35e0b 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 23 20:21:32 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * MPC/config/taobaseidl3toidl2defaults.mpb: + * MPC/config/taoidl3toxmidefaults.mpb: + Fixed again + Mon Jan 23 20:12:06 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * MPC/config/taobaseidl3toidl2defaults.mpb: diff --git a/CIAO/MPC/config/taobaseidl3toidl2defaults.mpb b/CIAO/MPC/config/taobaseidl3toidl2defaults.mpb index a9a773fb356..3c212c2499e 100644 --- a/CIAO/MPC/config/taobaseidl3toidl2defaults.mpb +++ b/CIAO/MPC/config/taobaseidl3toidl2defaults.mpb @@ -20,4 +20,5 @@ project { } after += TAO_IDL3_TO_IDL2_EXE + idl3toidl2flags += $(TAO_IDL3_TO_IDL2_FLAGS) } diff --git a/CIAO/MPC/config/taoidl3toxmidefaults.mpb b/CIAO/MPC/config/taoidl3toxmidefaults.mpb index 00c2c5c8752..fab6521f07f 100644 --- a/CIAO/MPC/config/taoidl3toxmidefaults.mpb +++ b/CIAO/MPC/config/taoidl3toxmidefaults.mpb @@ -21,4 +21,5 @@ project : xerces { after += CIAO_IDL3_TO_XMI_EXE // This is necessary for MPC to pull in rules.ciao.GNU includes += $(CIAO_ROOT) + idl3toxmiflags += $(TAO_IDL3_TO_XMI_FLAGS) } |