[openrtm-commit:02980] r3114 - in trunk/OpenRTM-aist: . examples examples/Fsm src/lib/hrtm src/lib/hrtm/idls win32/OpenRTM-aist win32/OpenRTM-aist/examples win32/OpenRTM-aist/ext/sdo
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 12月 11日 (月) 06:16:07 JST
Author: n-ando
Date: 2017-12-11 06:16:07 +0900 (Mon, 11 Dec 2017)
New Revision: 3114
Added:
trunk/OpenRTM-aist/src/lib/hrtm/idls/Makefile.am
trunk/OpenRTM-aist/src/lib/hrtm/libHRTM.vcproj.yaml
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Fsm/
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/extended_fsm/
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/fsm4rtc_observer/
trunk/OpenRTM-aist/win32/OpenRTM-aist/hrtm/
Modified:
trunk/OpenRTM-aist/configure.ac
trunk/OpenRTM-aist/examples/Fsm/Makefile.am
trunk/OpenRTM-aist/examples/Makefile.am
trunk/OpenRTM-aist/src/lib/hrtm/Makefile.am
trunk/OpenRTM-aist/src/lib/hrtm/idls/
trunk/OpenRTM-aist/src/lib/hrtm/version.h
trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am
Log:
merged changes from branches/FSM4RTC/OpenRTM-aist r2770-2772, Makefile.ams confliction resolved:
[FSM4RTC,win32,->RELENG_2_0] libHRTM source and build proj file prepared for win32. refs #3653
[FSM4RTC,win32,->RELENG_2_0] Fsm example win32 proj file prepared. refs #3655
[FSM4RTC,win32,->RELENG_2_0] libHRTM source and build proj file prepared for win32. refs #3653
Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac 2017-12-10 21:02:52 UTC (rev 3113)
+++ trunk/OpenRTM-aist/configure.ac 2017-12-10 21:16:07 UTC (rev 3114)
@@ -1604,8 +1604,9 @@
packages/rpm/Makefile
src/Makefile
src/lib/Makefile
+ src/lib/hrtm/Makefile
+ src/lib/hrtm/idls/Makefile
src/lib/rtm/Makefile
- src/lib/hrtm/Makefile
src/lib/rtm/idl/Makefile
src/lib/rtm/ext/Makefile
src/lib/rtm/idl/device_interfaces/Makefile
@@ -1717,6 +1718,7 @@
win32/OpenRTM-aist/examples/SimpleService/Makefile
win32/OpenRTM-aist/examples/Throughput/Makefile
win32/OpenRTM-aist/examples/USBCamera/Makefile
+ win32/OpenRTM-aist/examples/Fsm/Makefile
win32/OpenRTM-aist/ext/Makefile
win32/OpenRTM-aist/ext/ec/artlinux/Makefile
win32/OpenRTM-aist/ext/ec/Makefile
@@ -1729,6 +1731,8 @@
win32/OpenRTM-aist/ext/sdo/Makefile
win32/OpenRTM-aist/ext/sdo/logger/Makefile
win32/OpenRTM-aist/ext/sdo/observer/Makefile
+ win32/OpenRTM-aist/ext/sdo/fsm4rtc_observer/Makefile
+ win32/OpenRTM-aist/ext/sdo/extended_fsm/Makefile
win32/OpenRTM-aist/utils/Makefile
win32/OpenRTM-aist/utils/rtc-template/Makefile
win32/OpenRTM-aist/utils/rtcd/Makefile
@@ -1738,6 +1742,9 @@
win32/OpenRTM-aist/rtm/ext/Makefile
win32/OpenRTM-aist/rtm/idl/Makefile
win32/OpenRTM-aist/rtm/idl/device_interfaces/Makefile
- ])
+ win32/OpenRTM-aist/hrtm/Makefile
+ win32/OpenRTM-aist/hrtm/idls/Makefile
+ win32/OpenRTM-aist/installer/Makefile
+ win32/OpenRTM-aist/installer/Bitmaps/Makefile ])
Modified: trunk/OpenRTM-aist/examples/Fsm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/Fsm/Makefile.am 2017-12-10 21:02:52 UTC (rev 3113)
+++ trunk/OpenRTM-aist/examples/Fsm/Makefile.am 2017-12-10 21:16:07 UTC (rev 3114)
@@ -49,9 +49,9 @@
# Extra distributed files
#------------------------------------------------------------
EXTRA_DIST = \
- README.Fsm \
+ CMakeLists.txt \
rtc.conf \
- fsm.conf
+ rtc_shared.conf
ALL_SRC = \
FsmMain.cc \
Modified: trunk/OpenRTM-aist/examples/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/Makefile.am 2017-12-10 21:02:52 UTC (rev 3113)
+++ trunk/OpenRTM-aist/examples/Makefile.am 2017-12-10 21:16:07 UTC (rev 3114)
@@ -8,10 +8,9 @@
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = Analyzer Composite ConfigSample SimpleIO SeqIO SimpleService ExtTrigger Templates Throughput @UNITTEST@
-
+SUBDIRS = Analyzer Composite ConfigSample SimpleIO SeqIO SimpleService ExtTrigger Fsm Templates Throughput @UNITTEST@
EXTRA_DIST = \
rtc.vcproj.yaml \
rtcdll.vcproj.yaml
-DIST_SUBDIRS = Analyzer Composite ConfigSample SimpleIO SeqIO SimpleService ExtTrigger AutoTest Templates Throughput tests
+DIST_SUBDIRS = Analyzer Composite ConfigSample SimpleIO SeqIO SimpleService ExtTrigger Fsm AutoTest Templates Throughput tests
\ No newline at end of file
Modified: trunk/OpenRTM-aist/src/lib/hrtm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/hrtm/Makefile.am 2017-12-10 21:02:52 UTC (rev 3113)
+++ trunk/OpenRTM-aist/src/lib/hrtm/Makefile.am 2017-12-10 21:16:07 UTC (rev 3114)
@@ -7,36 +7,24 @@
AUTOMAKE_OPTIONS = 1.4
-ARTLIB = @ARTLIB@
+SUBDIRS = idls
-AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/coil/include -I$(top_srcdir)/src/lib/rtm -I$(top_srcdir)/src/lib/rtm/idl -I$(top_srcdir)/src/lib/hrtm
-AM_LDFLAGS=-L$(top_builddir) -L$(top_builddir)/src/lib/rtm -L$(top_builddir)/src/lib/rtm/idl -L$(top_builddir)/src/lib/coil/lib
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/lib \
+ -I$(top_srcdir)/src/lib/coil/include \
+ -I$(top_srcdir)/src/lib/rtm \
+ -I$(top_srcdir)/src/lib/rtm/idl \
+ -I$(top_srcdir)/src/lib/hrtm
+AM_LDFLAGS = \
+ -L$(top_builddir) \
+ -L$(top_builddir)/src/lib/rtm \
+ -L$(top_builddir)/src/lib/rtm/idl \
+ -L$(top_builddir)/src/lib/coil/lib
-# version.h would be generated from configure before lib build process.
-BUILT_SOURCES = version.h version.txt
-version.h:
- echo '// This header file is automatically generated.' > $@
- echo '// Do not edit this file.' >> $@
- echo '' >> $@
- echo 'const char* openrtm_name = "'${PACKAGE}'-'${VERSION}'";' >> $@
- echo 'const char* openrtm_version = "'${VERSION}'";' >> $@
- echo 'const char* corba_name = "'${ORB}'";' >> $@
-
-version.txt:
- echo 'name = '${PACKAGE}'-'${VERSION} >> $@
- echo 'language = C++' >> $@
- echo 'version = '${RTM_VERSION}'' >> $@
- echo 'major_version = '${RTM_MAJOR_VERSION} >> $@
- echo 'minor_version = '${RTM_MINOR_VERSION} >> $@
- echo 'revision_num = '${RTM_REVISION_NUM} >> $@
- echo 'short_version = '${RTM_SHORT_VERSION} >> $@
- echo 'corba = '${ORB} >> $@
-
# libHRTM.so, libHRTM.a library build entry
lib_LTLIBRARIES = libHRTM.la
# sources of libHRTM.la
-
HRTM_SRC = \
component_manager.cpp \
data_flow_component.cpp \
@@ -43,29 +31,9 @@
logger.cpp \
properties.cpp \
statechart.cpp
-# configuration.cc \
-# corba_object.cc \
-# corba_port.cc
-# event_driven_execution_context.cc \
-# execution_context_base.cc \
-# ext_trig_execution_context.cc \
-# ior_utils.cc \
-# logger_poco.cc \
-# organization.cc \
-# periodic_ec_shared_composite.cc \
-# periodic_execution_context.cc \
-# port.cc
-# utils.cc
-
-
-
libHRTM_la_SOURCES = $(HRTM_SRC)
-# version.h \
-# version.txt \
-# $(HRTM_SRC)
-
libHRTM_la_LIBADD = \
$(top_builddir)/src/lib/coil/lib/libcoil.la \
$(top_builddir)/src/lib/rtm/idl/libRTCSkel.la \
@@ -83,51 +51,12 @@
hrtmheader_HEADERS = \
$(libHRTM_la_SOURCES:.cpp=.h) \
defs.h \
- logger.h \
+ in_port.h \
out_port.h \
- properties.h \
+ utils.h \
version.h
-# SDO.h \
-# bind_manager.h \
-# bind_set.h \
-# buffer_policy.h \
-# component_factory.h \
-# consumer.h \
-# consumer_pull.h \
-# consumer_push.h \
-# consumer_push_flush.h \
-# consumer_push_local.h \
-# consumer_push_new-inl.h \
-# consumer_push_new.h \
-# consumer_push_periodic.h \
-# consumer_push_with_buffer.h \
-# corba_consumer.h \
-# data_port_status.h
-# event_driven_execution_context.h \
-# execution_context_base.h \
-# ext_trig_execution_context.h \
-# extended_fsm_service.h \
-# generic_object_interface.h \
-# gtest_utils.h
-# in_port.h \
-# in_port_cdr.h \
-# in_port_cdr_flush.h \
-# in_port_cdr_local.h \
-# in_port_cdr_no_buffer.h
-# marshalizer.h \
-# misc.h \
-# monitoring.h
-# out_port_cdr.h \
-# port_corba.h \
-# port_type.h
-# send_policy.h \
-# simple_deque.h \
-# trace.h
-# vw_main.h \
-# watch.h
-
#------------------------------------------------------------
# File list for deb/ports packages
#------------------------------------------------------------
@@ -134,7 +63,6 @@
lst:
echo $(HRTM_SRC) > src.lst
echo $(hrtmheader_HEADERS) > header.lst
- echo version.txt >> header.lst
#------------------------------------------------------------
# Visual Studio Project
@@ -148,11 +76,11 @@
--type DLL \
--vcversion "8.00" \
--version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/libHRTM_vc8.vcproj \
+ --out $(win32_builddir)/hrtm/libHRTM_vc8.vcproj \
--yaml libHRTM.vcproj.yaml \
--source $(HRTM_SRC) \
--header $(hrtmheader_HEADERS)
- qkc -O- -sm $(win32_builddir)/rtm/libHRTM_vc8.vcproj
+ qkc -O- -sm $(win32_builddir)/hrtm/libHRTM_vc8.vcproj
vc9proj: libHRTM.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -159,11 +87,11 @@
--type DLL \
--vcversion "9.00" \
--version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/libHRTM_vc9.vcproj \
+ --out $(win32_builddir)/hrtm/libHRTM_vc9.vcproj \
--yaml libHRTM.vcproj.yaml \
--source $(HRTM_SRC) \
--header $(hrtmheader_HEADERS)
- qkc -O- -sm $(win32_builddir)/rtm/libHRTM_vc9.vcproj
+ qkc -O- -sm $(win32_builddir)/hrtm/libHRTM_vc9.vcproj
vc10proj: libHRTM.vcproj.yaml
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -170,11 +98,11 @@
--type DLL \
--vcversion "10.00" \
--version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/libHRTM_vc10.vcxproj \
+ --out $(win32_builddir)/hrtm/libHRTM_vc10.vcxproj \
--yaml libHRTM.vcproj.yaml \
--source $(HRTM_SRC) \
--header $(hrtmheader_HEADERS)
- qkc -O- -sm $(win32_builddir)/rtm/libHRTM_vc10.vcxproj
+ qkc -O- -sm $(win32_builddir)/hrtm/libHRTM_vc10.vcxproj
vc11proj: libHRTM.vcproj.yaml
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -181,11 +109,11 @@
--type DLL \
--vcversion "11.00" \
--version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/libHRTM_vc11.vcxproj \
+ --out $(win32_builddir)/hrtm/libHRTM_vc11.vcxproj \
--yaml libHRTM.vcproj.yaml \
--source $(HRTM_SRC) \
--header $(hrtmheader_HEADERS)
- qkc -O- -sm $(win32_builddir)/rtm/libHRTM_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/hrtm/libHRTM_vc11.vcxproj
vc12proj: libHRTM.vcproj.yaml
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -192,22 +120,22 @@
--type DLL \
--vcversion "12.00" \
--version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/libHRTM_vc12.vcxproj \
+ --out $(win32_builddir)/hrtm/libHRTM_vc12.vcxproj \
--yaml libHRTM.vcproj.yaml \
--source $(HRTM_SRC) \
--header $(hrtmheader_HEADERS)
- qkc -O- -sm $(win32_builddir)/rtm/libHRTM_vc12.vcxproj
-
+ qkc -O- -sm $(win32_builddir)/hrtm/libHRTM_vc12.vcxproj
+
vc14proj: libHRTM.vcproj.yaml
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "14.00" \
--version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/libHRTM_vc14.vcxproj \
+ --out $(win32_builddir)/hrtm/libHRTM_vc14.vcxproj \
--yaml libHRTM.vcproj.yaml \
--source $(HRTM_SRC) \
--header $(hrtmheader_HEADERS)
- qkc -O- -sm $(win32_builddir)/rtm/libHRTM_vc14.vcxproj
+ qkc -O- -sm $(win32_builddir)/hrtm/libHRTM_vc14.vcxproj
#------------------------------------------------------------
# for wxs file
@@ -216,7 +144,7 @@
$(top_srcdir)/build/makewxs.py flist \
-c Headers \
-o $(win32_builddir)installer/headers.yaml \
- -p ..\\rtm \
+ -p ..\\hrtm \
*.h version.txt
Index: trunk/OpenRTM-aist/src/lib/hrtm/idls
===================================================================
--- trunk/OpenRTM-aist/src/lib/hrtm/idls 2017-12-10 21:02:52 UTC (rev 3113)
+++ trunk/OpenRTM-aist/src/lib/hrtm/idls 2017-12-10 21:16:07 UTC (rev 3114)
Property changes on: trunk/OpenRTM-aist/src/lib/hrtm/idls
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+Makefile.in
+Makefile
+
Copied: trunk/OpenRTM-aist/src/lib/hrtm/idls/Makefile.am (from rev 2772, branches/FSM4RTC/OpenRTM-aist/src/lib/hrtm/idls/Makefile.am)
===================================================================
--- trunk/OpenRTM-aist/src/lib/hrtm/idls/Makefile.am (rev 0)
+++ trunk/OpenRTM-aist/src/lib/hrtm/idls/Makefile.am 2017-12-10 21:16:07 UTC (rev 3114)
@@ -0,0 +1,49 @@
+## -*- Makefile -*-
+##------------------------------------------------------------
+## Makefile.am for libHRTM
+##
+## $Id: Makefile.am 2720 2016-05-20 10:35:25Z n-ando $
+##------------------------------------------------------------
+
+AUTOMAKE_OPTIONS = 1.4
+
+hrtmheaderdir = $(rtm_includedir)/hrtm/idls
+
+hrtmheader_HEADERS = \
+ BasicDataType.h \
+ ExtendedDataTypes.h \
+ HRTM.h
+
+#------------------------------------------------------------
+# File list for deb/ports packages
+#------------------------------------------------------------
+lst:
+ echo $(hrtmheader_HEADERS) > header.lst
+
+#------------------------------------------------------------
+# Visual Studio Project
+#------------------------------------------------------------
+win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
+
+#------------------------------------------------------------
+# for wxs file
+#------------------------------------------------------------
+wxs:
+ $(top_srcdir)/build/makewxs.py flist \
+ -c Headers \
+ -o $(win32_builddir)installer/headers.yaml \
+ -p ..\\hrtm\\idls \
+ *.h
+
+
+dist-hook: lst
+
+clean-local:
+ rm -f *~ Makefile.old *core
+ rm -f *.lst
+ rm -f *.gch *.bak *.rpo *.sym lib*.*_pure_*
+
+
+EXTRA_DIST = \
+ $(hrtmheader_HEADERS)
+
Copied: trunk/OpenRTM-aist/src/lib/hrtm/libHRTM.vcproj.yaml (from rev 2772, branches/FSM4RTC/OpenRTM-aist/src/lib/hrtm/libHRTM.vcproj.yaml)
===================================================================
--- trunk/OpenRTM-aist/src/lib/hrtm/libHRTM.vcproj.yaml (rev 0)
+++ trunk/OpenRTM-aist/src/lib/hrtm/libHRTM.vcproj.yaml 2017-12-10 21:16:07 UTC (rev 3114)
@@ -0,0 +1,428 @@
+#
+# @brief VCProject configuration file for libHRTM
+# @date $Date: 2008-02-29 04:58:39 $
+# @author Norkai Ando <n-ando at aist.go.jp>
+#
+ProjectType: "Visual C++"
+Version: "__VCVERSION__"
+Name: libHRTM
+ProjectGUID: __GUID__
+RootNamespace: libHRTM
+Keyword: "Win32Proj"
+Configurations:
+#------------------------------------------------------------
+# Debug Configuration
+#------------------------------------------------------------
+ - Name: "Debug|Win32"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ VCCLCompilerTool:
+ - Key: Optimization
+ Value: "0"
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "3"
+ - Key: RuntimeLibrary
+ Value: "3"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "4"
+ VCPreLinkEventTool:
+ - Key: CommandLine
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(TargetDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
+ move RTC$(rtm_dllver)d.def ..\
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTC.lib:libRTCSkeld.lib;$(rtm_depend_libd)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver)d.dll"
+ - Key: Version
+ Value: $(rtm_shortver)
+ - Key: LinkIncremental
+ Value: "2"
+ - Key: ModuleDefinitionFile
+ Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
+ copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "true"
+ VC10_VCCLCompilerTool:
+ - Key: Optimization
+ Value: "Disabled"
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "EnableFastChecks"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDebugDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCPreLinkEventTool:
+ - Key: Command
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(TargetDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
+ move RTC$(rtm_dllver)d.def ..\
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTC.lib;libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver)d.dll"
+ - Key: Version
+ Value: $(rtm_shortver)
+ - Key: LinkIncremental
+ Value: "true"
+ - Key: ModuleDefinitionFile
+ Value: "RTC$(rtm_dllver)d.def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: TargetMachine
+ Value: "MachineX86"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\RTC$(rtm_dllver)d.lib"
+ copy "$(OutDir)\\RTC$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
+ - Name: "Debug|x64"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ VCCLCompilerTool:
+ - Key: Optimization
+ Value: "0"
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "3"
+ - Key: RuntimeLibrary
+ Value: "3"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "4"
+ VCPreLinkEventTool:
+ - Key: CommandLine
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(TargetDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
+ move RTC$(rtm_dllver)d.def ..\
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTC.lib;libRTCSkeld.lib;$(rtm_depend_libd)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver)d.dll"
+ - Key: Version
+ Value: $(rtm_shortver)
+ - Key: LinkIncremental
+ Value: "2"
+ - Key: ModuleDefinitionFile
+ Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
+ copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "true"
+ VC10_VCCLCompilerTool:
+ - Key: Optimization
+ Value: "Disabled"
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "EnableFastChecks"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDebugDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCPreLinkEventTool:
+ - Key: Command
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(TargetDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
+ move RTC$(rtm_dllver)d.def ..\
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTCd.lib;libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver)d.dll"
+ - Key: Version
+ Value: $(rtm_shortver)
+ - Key: LinkIncremental
+ Value: "true"
+ - Key: ModuleDefinitionFile
+ Value: "RTC$(rtm_dllver)d.def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: TargetMachine
+ Value: "MachineX64"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\RTC$(rtm_dllver)d.lib"
+ copy "$(OutDir)\\RTC$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
+#------------------------------------------------------------
+# Release Configuration
+#------------------------------------------------------------
+ - Name: "Release|Win32"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ WholeProgramOptimization: "0"
+ VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "2"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "3"
+ VCPreLinkEventTool:
+ - Key: CommandLine
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(OutDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
+ move RTC$(rtm_dllver).def ..\\
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTC.lib;libRTCSkel.lib;$(rtm_depend_lib)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver).dll"
+ - Key: LinkIncremental
+ Value: "1"
+ - Key: ModuleDefinitionFile
+ Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "2"
+ - Key: OptimizeReferences
+ Value: "2"
+ - Key: EnableCOMDATFolding
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
+ copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "false"
+ VC10_VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCPreLinkEventTool:
+ - Key: Command
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(OutDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver) $(rtm_shortver) RTC$(rtm_dllver).def
+ move RTC$(rtm_dllver).def ..\\
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTC.lib;libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver).dll"
+ - Key: LinkIncremental
+ Value: "false"
+ - Key: ModuleDefinitionFile
+ Value: "RTC$(rtm_dllver).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: OptimizeReferences
+ Value: "true"
+ - Key: EnableCOMDATFolding
+ Value: "true"
+ - Key: TargetMachine
+ Value: "MachineX86"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\RTC$(rtm_dllver).lib"
+ copy "$(OutDir)\\RTC$(rtm_dllver).dll" "$(SolutionDir)bin\\"
+ - Name: "Release|x64"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ WholeProgramOptimization: "0"
+ VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "2"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "3"
+ VCPreLinkEventTool:
+ - Key: CommandLine
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(OutDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
+ move RTC$(rtm_dllver).def ..\\
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTC.lib;libRTCSkel.lib;$(rtm_depend_lib)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver).dll"
+ - Key: LinkIncremental
+ Value: "1"
+ - Key: ModuleDefinitionFile
+ Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "2"
+ - Key: OptimizeReferences
+ Value: "2"
+ - Key: EnableCOMDATFolding
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
+ copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "false"
+ VC10_VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCPreLinkEventTool:
+ - Key: Command
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(OutDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver) $(rtm_shortver) RTC$(rtm_dllver).def
+ move RTC$(rtm_dllver).def ..\\
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTC.lib;libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver).dll"
+ - Key: LinkIncremental
+ Value: "false"
+ - Key: ModuleDefinitionFile
+ Value: "RTC$(rtm_dllver).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: OptimizeReferences
+ Value: "true"
+ - Key: EnableCOMDATFolding
+ Value: "true"
+ - Key: TargetMachine
+ Value: "MachineX64"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\RTC$(rtm_dllver).lib"
+ copy "$(OutDir)\\RTC$(rtm_dllver).dll" "$(SolutionDir)bin\\"
Modified: trunk/OpenRTM-aist/src/lib/hrtm/version.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/hrtm/version.h 2017-12-10 21:02:52 UTC (rev 3113)
+++ trunk/OpenRTM-aist/src/lib/hrtm/version.h 2017-12-10 21:16:07 UTC (rev 3114)
@@ -1,6 +1,12 @@
-// This header file is automatically generated.
-// Do not edit this file.
+#ifndef HRTM_VERSION_H_
+#define HRTM_VERSION_H_
+/*
+ Copyright 2011 Honda R&D Co.,Ltd.
+*/
-const char* openrtm_name = "OpenRTM-aist-1.1.2";
-const char* openrtm_version = "1.1.2";
-const char* corba_name = "omniORB";
+#define HRTM_VERSION_MAJOR 0
+#define HRTM_VERSION_MINOR 6
+#define HRTM_VERSION_PATCH 13
+#define HRTM_REVISION
+
+#endif // HRTM_VERSION_H_
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-12-10 21:02:52 UTC (rev 3113)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-12-10 21:16:07 UTC (rev 3114)
@@ -4,9 +4,8 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = bin etc cmake build docs examples ext utils coil rtm .
+SUBDIRS = bin etc cmake build docs examples ext utils coil rtm hrtm installer .
-
clean-local:
rm -f *~ *.sln *.yaml *.ncb *.suo *.user
rm -f AUTHORS COPYING.LIB COPYRIGHT ChangeLog README README.jp
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2017-12-10 21:02:52 UTC (rev 3113)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2017-12-10 21:16:07 UTC (rev 3114)
@@ -4,8 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = Analyzer Composite ConfigSample ExtTrigger LTTSample SimpleIO SeqIO SimpleService Throughput USBCamera .
-
+SUBDIRS = Analyzer Composite ConfigSample ExtTrigger Fsm LTTSample SimpleIO SeqIO SimpleService Throughput USBCamera .
clean-local:
rm -f *~
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am 2017-12-10 21:02:52 UTC (rev 3113)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am 2017-12-10 21:16:07 UTC (rev 3114)
@@ -4,8 +4,7 @@
##
## $Id: Makefile.am 1680 2010-01-17 15:12:59Z n-ando $
##---------------------------------------------------------------------------
-SUBDIRS = observer logger .
-
+SUBDIRS = logger extended_fsm fsm4rtc_observer observer .
clean-local:
rm -f *~
More information about the openrtm-commit
mailing list