[openrtm-commit:00745] r2335 - in trunk/OpenRTM-aist/src/ext/ec: . logical_time logical_time/example
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 3月 5日 (月) 00:04:19 JST
Author: n-ando
Date: 2012-03-05 00:04:19 +0900 (Mon, 05 Mar 2012)
New Revision: 2335
Modified:
trunk/OpenRTM-aist/src/ext/ec/Makefile.am
trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
trunk/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am
Log:
Logical time triggered EC is now included in the build tree. refs #2373
Modified: trunk/OpenRTM-aist/src/ext/ec/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/Makefile.am 2012-03-04 14:59:21 UTC (rev 2334)
+++ trunk/OpenRTM-aist/src/ext/ec/Makefile.am 2012-03-04 15:04:19 UTC (rev 2335)
@@ -7,7 +7,7 @@
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = @ARTLINUX@ @RTPREEMPTEC@
+SUBDIRS = @ARTLINUX@ @RTPREEMPTEC@ logical_time
DIST_SUBDIRS = artlinux rtpreempt logical_time
#SUBDIRS = logical_time
Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am 2012-03-04 14:59:21 UTC (rev 2334)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am 2012-03-04 15:04:19 UTC (rev 2335)
@@ -59,7 +59,7 @@
# Targets
#------------------------------------------------------------
# Targets directories
-socompdir = $(rtm_sdodir)
+socompdir = $(rtm_ecdir)
# Loadable Module
noinst_LTLIBRARIES = libLogicalTimeTriggeredECSkel.la libLogicalTimeTriggeredECStub.la
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 14:59:21 UTC (rev 2334)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am 2012-03-04 15:04:19 UTC (rev 2335)
@@ -57,78 +57,78 @@
#------------------------------------------------------------
# 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
+#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
-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
+#dist-hook: 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
-
-dist-hook: lst
-
clean-local:
rm -f *.bak *.rpo *.sym lib*.*_pure_* *.lst
rm -f Makefile.old *core *~ *.so *.log
openrtm-commit メーリングリストの案内