[openrtm-commit:00747] r2336 - in trunk/OpenRTM-aist: src/ext/ec/logical_time src/ext/ec/logical_time/example win32/OpenRTM-aist/examples win32/OpenRTM-aist/examples/LTTSample win32/OpenRTM-aist/ext
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 3月 8日 (木) 19:20:58 JST
Author: kurihara
Date: 2012-03-08 19:20:57 +0900 (Thu, 08 Mar 2012)
New Revision: 2336
Added:
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/rtc.conf
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/lttsample.yaml
Modified:
trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h
trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
trunk/OpenRTM-aist/src/ext/ec/logical_time/example/LTTSampleComp.cpp
trunk/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am
Log:
The logical time EC supported Windows. refs #2374, refs #2372
Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h 2012-03-04 15:04:19 UTC (rev 2335)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h 2012-03-08 10:20:57 UTC (rev 2336)
@@ -723,7 +723,7 @@
*
* @endif
*/
- void LogicalTimeTriggeredECInit(RTC::Manager* manager);
+ DLL_EXPORT void LogicalTimeTriggeredECInit(RTC::Manager* manager);
};
#endif // RTC_EXTTRIGEXECUTIONCONTEXT_H
Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am 2012-03-04 15:04:19 UTC (rev 2335)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am 2012-03-08 10:20:57 UTC (rev 2336)
@@ -94,7 +94,7 @@
#------------------------------------------------------------
# Visual Studio Project
#------------------------------------------------------------
-win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/sdo/observer
+win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/ec/logical_time
PROJNAME=LogicalTimeTriggeredEC
vcproj: vc8proj vc9proj vc10proj
Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/example/LTTSampleComp.cpp
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/example/LTTSampleComp.cpp 2012-03-04 15:04:19 UTC (rev 2335)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/example/LTTSampleComp.cpp 2012-03-08 10:20:57 UTC (rev 2336)
@@ -12,7 +12,7 @@
#include <string>
#include "LTTSample.h"
#include <rtm/NVUtil.h>
-#include "../LogicalTimeTriggeredECStub.h"
+#include <LogicalTimeTriggeredECStub.h>
void MyModuleInit(RTC::Manager* manager)
@@ -25,8 +25,13 @@
comp = manager->createComponent("LTTSample");
std::cout << "succeed." << std::endl;
RTC::ExecutionContextList_var eclist = comp->get_owned_contexts();
- eclist[0]->start();
- eclist[0]->activate_component(RTC::RTObject::_duplicate(comp->getObjRef()));
+ if ( eclist->length() > 0) {
+ eclist[0]->start();
+ eclist[0]->activate_component(RTC::RTObject::_duplicate(comp->getObjRef()));
+ }
+ else {
+ std::cerr << "No owned EC." << std::endl;
+ }
RTC::ComponentProfile_var prof;
prof = comp->get_component_profile();
std::cout << "=================================================" << std::endl;
Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am 2012-03-04 15:04:19 UTC (rev 2335)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am 2012-03-08 10:20:57 UTC (rev 2336)
@@ -7,7 +7,7 @@
AUTOMAKE_OPTIONS = 1.4
-AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/coil/include -I$(top_srcdir)/src/lib/rtm/idl
+AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/coil/include -I$(top_srcdir)/src/lib/rtm/idl -I../
AM_LDFLAGS=-L$(top_builddir) -L$(top_builddir)/src/lib/rtm -L$(top_builddir)/src/lib/rtm/idl
all-local:
@@ -50,87 +50,87 @@
#------------------------------------------------------------
# File list for deb/ports packages
#------------------------------------------------------------
-#lst:
-# echo $(ALL_SRC) > src.lst
-# echo $(EXTRA_DIST) > other.lst
+lst:
+ echo $(ALL_SRC) > src.lst
+ echo $(EXTRA_DIST) > other.lst
#------------------------------------------------------------
# Visual Studio Project
#------------------------------------------------------------
-#win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/LTTSample
+win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/LTTSample
-#vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj
-#vc8proj:
-# $(top_builddir)/build/vcprojtool.py vcproj \
-# --type EXE \
-# --vcversion "8.00" \
-# --projectname "LTTSampleComp" \
-# --version $(RTM_VERSION) \
-# --out $(win32_builddir)/LTTSample_vc8.vcproj \
-# --yaml ../rtc.vcproj.yaml \
-# --source LTTSample.cpp LTTSampleComp.cpp \
-# --header LTTSample.h
-# qkc -sm $(win32_builddir)/LTTSample_vc8.vcproj
-# $(top_builddir)/build/vcprojtool.py vcproj \
-# --type DLL \
-# --vcversion "8.00" \
-# --projectname "LTTSample" \
-# --version $(RTM_VERSION) \
-# --out $(win32_builddir)/LTTSampleDll_vc8.vcproj \
-# --yaml ../rtcdll.vcproj.yaml \
-# --source LTTSample.cpp \
-# --header LTTSample.h
-# qkc -sm $(win32_builddir)/LTTSampleDll_vc8.vcproj
-#
-#vc9proj:
-# $(top_builddir)/build/vcprojtool.py vcproj \
-# --type EXE \
-# --vcversion "9.00" \
-# --projectname "LTTSampleComp" \
-# --version $(RTM_VERSION) \
-# --out $(win32_builddir)/LTTSample_vc9.vcproj \
-# --yaml ../rtc.vcproj.yaml \
-# --source LTTSample.cpp LTTSampleComp.cpp \
-# --header LTTSample.h
-# qkc -sm $(win32_builddir)/LTTSample_vc9.vcproj
-# $(top_builddir)/build/vcprojtool.py vcproj \
-# --type DLL \
-# --vcversion "9.00" \
-# --projectname "LTTSample" \
-# --version $(RTM_VERSION) \
-# --out $(win32_builddir)/LTTSampleDll_vc9.vcproj \
-# --yaml ../rtcdll.vcproj.yaml \
-# --source LTTSample.cpp \
-# --header LTTSample.h
-# qkc -sm $(win32_builddir)/LTTSampleDll_vc9.vcproj
-#
-#vc10proj:
-# $(top_builddir)/build/vcxprojtool.py vcxproj \
-# --type EXE \
-# --vcversion "10.00" \
-# --projectname "LTTSampleComp" \
-# --version $(RTM_VERSION) \
-# --out $(win32_builddir)/LTTSample_vc10.vcxproj \
-# --yaml ../rtc.vcxproj.yaml \
-# --source LTTSample.cpp LTTSampleComp.cpp \
-# --header LTTSample.h
-# qkc -sm $(win32_builddir)/LTTSample_vc10.vcxproj
-# $(top_builddir)/build/vcxprojtool.py vcxproj \
-# --type DLL \
-# --vcversion "10.00" \
-# --projectname "LTTSample" \
-# --version $(RTM_VERSION) \
-# --out $(win32_builddir)/LTTSampleDll_vc10.vcxproj \
-# --yaml ../rtcdll.vcxproj.yaml \
-# --source LTTSample.cpp \
-# --header LTTSample.h
-# qkc -sm $(win32_builddir)/LTTSampleDll_vc10.vcxproj
+vc8proj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type EXE \
+ --vcversion "8.00" \
+ --projectname "LTTSampleComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/LTTSample_vc8.vcproj \
+ --yaml $(top_builddir)/examples/rtc.vcproj.yaml \
+ --source LTTSample.cpp LTTSampleComp.cpp LogicalTimeTriggeredECStub.cpp \
+ --header LTTSample.h LogicalTimeTriggeredECStub.h
+ qkc -sm $(win32_builddir)/LTTSample_vc8.vcproj
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type DLL \
+ --vcversion "8.00" \
+ --projectname "LTTSample" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/LTTSampleDll_vc8.vcproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source LTTSample.cpp \
+ --header LTTSample.h
+ qkc -sm $(win32_builddir)/LTTSampleDll_vc8.vcproj
-#dist-hook: vcproj
+vc9proj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type EXE \
+ --vcversion "9.00" \
+ --projectname "LTTSampleComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/LTTSample_vc9.vcproj \
+ --yaml $(top_builddir)/examples/rtc.vcproj.yaml \
+ --source LTTSample.cpp LTTSampleComp.cpp LogicalTimeTriggeredECStub.cpp \
+ --header LTTSample.h LogicalTimeTriggeredECStub.h
+ qkc -sm $(win32_builddir)/LTTSample_vc9.vcproj
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type DLL \
+ --vcversion "9.00" \
+ --projectname "LTTSample" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/LTTSampleDll_vc9.vcproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source LTTSample.cpp \
+ --header LTTSample.h
+ qkc -sm $(win32_builddir)/LTTSampleDll_vc9.vcproj
+vc10proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "LTTSampleComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/LTTSample_vc10.vcxproj \
+ --yaml $(top_builddir)/examples/rtc.vcproj.yaml \
+ --source LTTSample.cpp LTTSampleComp.cpp LogicalTimeTriggeredECStub.cpp \
+ --header LTTSample.h LogicalTimeTriggeredECStub.h
+ qkc -sm $(win32_builddir)/LTTSample_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "LTTSample" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/LTTSampleDll_vc10.vcxproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source LTTSample.cpp \
+ --header LTTSample.h
+ qkc -sm $(win32_builddir)/LTTSampleDll_vc10.vcxproj
+
+dist-hook: lst vcproj
+
clean-local:
rm -f *.bak *.rpo *.sym lib*.*_pure_* *.lst
- rm -f Makefile.old *core *~ *.so *.log
+ rm -f *core *~ *.so *.log
rm -f $(example_PROGRAMS)
rm -rf idl
Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/Makefile.am (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/Makefile.am 2012-03-08 10:20:57 UTC (rev 2336)
@@ -0,0 +1,26 @@
+## -*- Makefile -*-
+##---------------------------------------------------------------------------
+## Makefile.am for win32/OpenRTM-aist/examples/LTTSample
+##
+## $Id: Makefile.am 2107 2011-05-23 02:54:49Z n-ando $
+##---------------------------------------------------------------------------
+clean-local:
+ rm -rf Debug Release
+ rm -rf *~ *.h *.idl *.cpp LTTSample.conf TickApp.py
+ rm -rf *.vcproj *.vcxproj *.user *.ncb *.suo
+ rm -rf LTTSampleComp
+
+src:
+ cp -p $(top_srcdir)/src/ext/ec/logical_time/example/*.cpp .
+ cp -p $(top_srcdir)/src/ext/ec/logical_time/example/*.h .
+ cp -p $(top_srcdir)/src/ext/ec/logical_time/example/TickApp.py .
+ cp -p $(top_srcdir)/src/ext/ec/logical_time/example/LTTSample.conf .
+ cp -p $(top_srcdir)/src/ext/ec/logical_time/example/idl/*.idl .
+ cp -p $(top_srcdir)/src/ext/ec/logical_time/example/idl/*.idl .
+ qkc -ms *.cpp
+ qkc -ms *.h
+ qkc -ms *.conf
+ qkc -ms *.py
+ qkc -ms *.idl
+
+dist-hook: src
Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/rtc.conf
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/rtc.conf (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/LTTSample/rtc.conf 2012-03-08 10:20:57 UTC (rev 2336)
@@ -0,0 +1,17 @@
+corba.nameservers: localhost
+naming.formats: %n.rtc
+logger.log_level: PARANOID
+logger.date_format: %b %d %H:%M:%S.%Q.%q
+logger.clock_type: logical
+exec_cxt.periodic.type: ltt_ec
+exec_cxt.periodic.rate: 1000
+exec_cxt.sync_transition: NO
+manager.modules.load_path: C:\\Program Files\\OpenRTM-aist\\1.1\\ext\\local_service\\nameservice_file, \
+ C:\\Program Files\\OpenRTM-aist\\1.1\\ext\\ec\\logical_time
+manager.modules.preload: LogicalTimeTriggeredEC.dll
+manager.modules.abs_path_allowed: yes
+manager.local_service.modules: FileNameservice.dll
+ec.ltt_ec.sync_tick: YES
+example.LTTSample.config_file: LTTSample.conf
+manager.local_service.org.openrtm.local_service.nameservice.file_nameservice.base_path: ./
+manager.local_service.org.openrtm.local_service.nameservice.file_nameservice.file_structure: flat
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2012-03-04 15:04:19 UTC (rev 2335)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2012-03-08 10:20:57 UTC (rev 2336)
@@ -4,14 +4,14 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = Composite ConfigSample SimpleIO SeqIO SimpleService USBCamera .
+SUBDIRS = Composite ConfigSample LTTSample SimpleIO SeqIO SimpleService USBCamera .
wxs:
- cp -p example.yaml ../installer/
+ cp -p *.yaml ../installer/
clean-local:
rm -f *~
dist-hook: clean-local wxs
-EXTRA_DIST = example.yaml
+EXTRA_DIST = example.yaml lttsample.yaml
Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/lttsample.yaml
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/lttsample.yaml (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/lttsample.yaml 2012-03-08 10:20:57 UTC (rev 2336)
@@ -0,0 +1,36 @@
+LTTSample:
+ GUID: C41EB819-D5E6-11DC-A98E-0090CC74407D
+ Files:
+ - Id: rtc.conf.lttsample
+ ShortName: rtc.cnf
+ Name: rtc.conf
+ Source: ..\\examples\\LTTSample\\rtc.conf
+ - Id: lttsample.conf
+ ShortName: lttsample.cnf
+ Name: LTTSample.conf
+ Source: ..\\examples\\LTTSample\\LTTSample.conf
+ - Id: LTTSampleComp.exe
+ ShortName: LTT.exe
+ Name: LTTSampleComp.exe
+ Source: ..\\examples\\LTTSample\\LTTSampleComp\\Release\\LTTSampleComp.exe
+ - Id: LTTSample.dll
+ ShortName: LTT.dll
+ Name: LTTSample.dll
+ Source: ..\\examples\\LTTSample\\LTTSample\\Release\\LTTSample.dll
+ - Id: TickApp.py
+ ShortName: Tick.py
+ Name: TickApp.py
+ Source: ..\\examples\\LTTSample\\TickApp.py
+ - Id: logicaltimetriggeredec.idl
+ ShortName: lttec.idl
+ Name: LogicalTimeTriggeredEC.idl
+ Source: ..\\examples\\LTTSample\\LogicalTimeTriggeredEC.idl
+ - Id: sdl.idl
+ ShortName: sdo.idl
+ Name: SDOPackage.idl
+ Source: ..\\examples\\LTTSample\\SDOPackage.idl
+ - Id: RTC.idl
+ ShortName: rtc.idl
+ Name: RTC.idl
+ Source: ..\\examples\\LTTSample\\RTC.idl
+
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am 2012-03-04 15:04:19 UTC (rev 2335)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am 2012-03-08 10:20:57 UTC (rev 2336)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = sdo .
+SUBDIRS = ec local_service sdo .
clean-local:
rm -f *~
openrtm-commit メーリングリストの案内