diff options
| author | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-10-20 17:03:33 +0000 |
|---|---|---|
| committer | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-10-20 17:03:33 +0000 |
| commit | 81abe7664ca9eec62c15dfe436a1921db6e6896d (patch) | |
| tree | 3a4860caf6acc6fcc0ea8d55e7c470753c8d3f39 /bin | |
| parent | 0d037a70bca47416e7288991a30caba38074bc07 (diff) | |
| download | ATCD-81abe7664ca9eec62c15dfe436a1921db6e6896d.tar.gz | |
Fri Oct 20 17:00:03 UTC 2006 General TAO team Account <tao_g@ociweb.com> - Importing changes from the HEAD
Diffstat (limited to 'bin')
7 files changed, 34 insertions, 12 deletions
diff --git a/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb b/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb new file mode 100644 index 00000000000..d082eb93f04 --- /dev/null +++ b/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id + +project : ciao_targetmanager_stub { + includes += $(CIAO_ROOT)/DAnCE/NodeApplicationManager + libs += NodeApplicationManager + after += NodeApplicationManager +} diff --git a/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb b/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb new file mode 100644 index 00000000000..3208af9bd00 --- /dev/null +++ b/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id + +project : ciao_deployment_stub { + includes += $(CIAO_ROOT)/DAnCE/Interfaces + includes += $(CIAO_ROOT)/DAnCE/NodeManager + libs += NodeManager_stub + after += NodeManager_stub +} diff --git a/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb b/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb new file mode 100644 index 00000000000..4856402b74b --- /dev/null +++ b/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id + +project : ciao_nodemanager_stub { + libs += NodeManager + after += NodeManager_svnt +} diff --git a/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb b/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb index 5f2e5afd09f..62c745db095 100644 --- a/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb +++ b/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb @@ -1,12 +1,6 @@ // -*- MPC -*- // $Id$ -project : ciao_component_dnc, iortable { +project : ciao_nodemanager_svnt, ciao_nodeapplicationmanager, ciao_component_dnc, iortable { - includes += $(CIAO_ROOT)/DAnCE/NodeApplicationManager - includes += $(CIAO_ROOT)/DAnCE/NodeManager - includes += $(CIAO_ROOT)/DAnCE/Interfaces - - libs += NodeManager NodeManager_stub NodeApplicationManager TargetManager_stub - after += NodeManager NodeManager_stub NodeApplicationManager TargetManager_stub } diff --git a/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb b/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb new file mode 100644 index 00000000000..107f41f94a7 --- /dev/null +++ b/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id + +project : ciao_nodemanager_stub { + includes += $(CIAO_ROOT)/DAnCE/TargetManager + libs += TargetManager_stub + after += CIAO_TargetManager_stub +} diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 7ea302ffee0..ad2d0d0c444 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -621,11 +621,7 @@ endif <%endif%> $(BIN): $(addprefix $(VDIR), $(OBJS)) $(DEPLIBS) -ifndef kylix $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) -else - $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $(VLDLIBS) $(BORINITEXEOBJ) $(POSTLINK) $^, $@,, -endif endif <%endif%> diff --git a/bin/generate_rel_manpages b/bin/generate_rel_manpages index ce81980cce3..446ecfba768 100755 --- a/bin/generate_rel_manpages +++ b/bin/generate_rel_manpages @@ -30,7 +30,7 @@ my $dot_path = '/usr/bin'; my $doxy_path = '/usr/bin'; -my $doxy_version = '1.4.7-1'; +my $doxy_version = '1.5.0-1'; &can_run($doxy_path.'/doxygen --version | grep '.$doxy_version.' >/dev/null') || die "$0: doxygen path or version incorrect, please fix the script\n"; |