diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-10-20 09:46:10 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-10-20 09:46:10 +0000 |
| commit | 02686f8d5108580e8a3d56bfe9b124405fdedd18 (patch) | |
| tree | 0426ac218b7505e1c06dbf5ff8d2b10144d7ce75 /ACE | |
| parent | b2334408ebeffc6686b1f976247926df8411caec (diff) | |
| download | ATCD-02686f8d5108580e8a3d56bfe9b124405fdedd18.tar.gz | |
Tue Oct 20 09:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 21 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/crosscompile.mpb | 2 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/global.features | 2 | ||||
| -rwxr-xr-x | ACE/bin/mwc.pl | 2 |
4 files changed, 25 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 3e4daaf240f..64b2fadda5f 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,24 @@ +Tue Oct 20 09:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Tue Oct 18 09:23:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * bin/MakeProjectCreator/config/global.features: + Add ccm_direct_collocation + + Wed Oct 12 13:08:13 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * bin/MakeProjectCreator/config/crosscompile.mpb: + Fixed install issues. + + * bin/mwc.pl: + Removed unnecessary STDERR. + + === end changelog === + Thu Oct 20 06:57:38 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * *.*: diff --git a/ACE/bin/MakeProjectCreator/config/crosscompile.mpb b/ACE/bin/MakeProjectCreator/config/crosscompile.mpb index d755f480cac..225b6a19cde 100644 --- a/ACE/bin/MakeProjectCreator/config/crosscompile.mpb +++ b/ACE/bin/MakeProjectCreator/config/crosscompile.mpb @@ -13,7 +13,7 @@ project { } verbatim(gnuace, circuit) { ifneq ($(CROSS-COMPILE),) - all clean realclean idl_stubs depend lib_warning require_warning avoid_warning: + all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install: " @echo This project will not build on CROSS-COMPILE platforms." else } diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features index b7a1c75278f..e30673e6bc7 100644 --- a/ACE/bin/MakeProjectCreator/config/global.features +++ b/ACE/bin/MakeProjectCreator/config/global.features @@ -153,5 +153,7 @@ link_codecfactory = 0 ccm_lw = 1 // Feature for CCM for disabling events. ccm_noevent = 0 +// Feature for direct collocation +ccm_direct_collocation = 0 valuetype_out_indirection=1 diff --git a/ACE/bin/mwc.pl b/ACE/bin/mwc.pl index 8e8a838eb29..171ca860954 100755 --- a/ACE/bin/mwc.pl +++ b/ACE/bin/mwc.pl @@ -34,7 +34,7 @@ my($mpcpath) = (defined $mpcroot ? $mpcroot : unshift(@INC, $mpcpath . '/modules'); if (defined $mpcroot) { - print STDERR "MPC_ROOT was set to $mpcroot.\n"; + print "MPC_ROOT was set to $mpcroot.\n"; } if (! -d "$mpcpath/modules") { |