From 9bedaf2b19113d9d4f886849b661c331a1125095 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 29 Jan 2009 18:50:28 +0100 Subject: [PATCH] Added ORTE Multicast for metatraffic doesn't work correctly. --- Makefile | 64 +++++++++++++++++++++++++++++++----------------- ortedemo.desktop | 18 ++++++++++++++ ortedemo.sh | 6 +++++ 3 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 ortedemo.desktop create mode 100755 ortedemo.sh diff --git a/Makefile b/Makefile index 3074da0..5a01d0e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -SLAX_MODULES = frsh_forb +SLAX_MODULES = frsh_forb orte -all: freslax-0.2/slax/modules/$(SLAX_MODULES:%=%.lzm) +all: $(SLAX_MODULES:%=freslax-0.2/slax/modules/%.lzm) -include $(SLAX_MODULES:%=%.lzm.dep) -$(SLAX_MODULES:%=%.lzm): %.lzm: frsh_forb +$(SLAX_MODULES:%=%.lzm): %.lzm: % @exec > $@.dep; echo -n "$@ : "; find $* -print0|tr '\0' ' '; echo; find $*|sed -e 's/$$/:/' dir2lzm $* $@; echo chmod u+w $@ @@ -12,27 +12,47 @@ $(SLAX_MODULES:%=%.lzm): %.lzm: frsh_forb freslax-0.2/slax/modules/%: % cp $< $@ -ffsrc=$@/usr/src/frsh_forb - +frsh_forb: src=$@/usr/src/frsh_forb frsh_forb: mkdir -p $@/usr/local/bin && cp `which omk` $@/usr/local/bin - mkdir -p $(ffsrc) $(ffsrc)/src - svn co http://www.frescor.org/private/svn/frescor/omk-build/trunk $(ffsrc)/omk-build - cd $(ffsrc)/omk-build && ./update-all -d 1 - rm -rf $(ffsrc)/src/omk-build - - cd $(ffsrc)/omk-build/aquosa && ./create-links ../../src - $(MAKE) -C $(ffsrc)/omk-build/aquosa default-config - rm -rf $(ffsrc)/omk-build/aquosa/_build - - cd $(ffsrc)/omk-build/marte && ./create-links ../../src - $(MAKE) -C $(ffsrc)/omk-build/marte default-config - rm -rf $(ffsrc)/omk-build/marte/_build - rm -rf $(ffsrc)/omk-build/marte/marte.mk - - find $(ffsrc) -type d -name .svn|xargs rm -rf - cp README.frsh_forb $(ffsrc) + mkdir -p $(src) $(src)/src + svn co http://www.frescor.org/private/svn/frescor/omk-build/trunk $(src)/omk-build + cd $(src)/omk-build && ./update-all -d 1 + rm -rf $(src)/src/omk-build + + cd $(src)/omk-build/aquosa && ./create-links ../../src + $(MAKE) -C $(src)/omk-build/aquosa default-config + rm -rf $(src)/omk-build/aquosa/_build + + cd $(src)/omk-build/marte && ./create-links ../../src + $(MAKE) -C $(src)/omk-build/marte default-config + rm -rf $(src)/omk-build/marte/_build + rm -rf $(src)/omk-build/marte/marte.mk + + find $(src) -type d -name .svn|xargs rm -rf + cp README.frsh_forb $(src) + +orte: src=$@/usr/src/orte +orte: + git clone --depth=1 git://rtime.felk.cvut.cz/orte.git $(src) + cd $(src) && rm OCERA_TOP_DIR && $(MAKE) default-config all + cd $(src)/orte/contrib/shape && qmake-qt4 && $(MAKE) + mkdir -p $@/usr/local/bin $@/usr/lib + cp $(src)/_compiled/bin*/* $@/usr/local/bin + cp $(src)/orte/contrib/shape/ortedemo $@/usr/local/bin + ldd $(src)/orte/contrib/shape/ortedemo |grep '\(Qt\|audio\)' |grep -o '/usr/lib/[^ ]*'|while read lib; do \ + cp -v `readlink -e $$lib` $@/usr/lib; \ + done + $(MAKE) -C $(src) distclean + cp ortedemo.sh $@/usr/local/bin + mkdir -p $@/root/Desktop + cp ortedemo.desktop $@/root/Desktop + + find /usr/share/icons/hicolor -name 'kfouleggs.*'|while read icon; do\ + mkdir -p `dirname $@$${icon}`; \ + cp -v $$icon $@$${icon}; \ + done clean: rm $(SLAX_MODULES:%=%.lzm) $(SLAX_MODULES:%=%.lzm.dep) - rm -rf $(SLAX_MODULES) \ No newline at end of file + rm -rf $(SLAX_MODULES) diff --git a/ortedemo.desktop b/ortedemo.desktop new file mode 100644 index 0000000..34ad0a3 --- /dev/null +++ b/ortedemo.desktop @@ -0,0 +1,18 @@ +[Desktop Entry] +Comment= +Comment[en_US]= +Exec[$e]=ortedemo.sh +GenericName=Demonstration of RTPS communication middleware +GenericName[en_US]=Demonstration of RTPS communication middleware +Icon=kfouleggs +MimeType= +Name=ORTE demo +Name[en_US]=ORTE demo +Path[$e]= +StartupNotify=true +Terminal=false +TerminalOptions= +Type=Application +X-DCOP-ServiceType= +X-KDE-SubstituteUID=false +X-KDE-Username= diff --git a/ortedemo.sh b/ortedemo.sh new file mode 100755 index 0000000..dfd6330 --- /dev/null +++ b/ortedemo.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +ortemanager -e -p 225.6.7.8 -I 225.6.7.8 & +om_pid=$! +trap "kill $om_pid" EXIT +ortedemo \ No newline at end of file -- 2.39.2