[openrtm-commit:02299] r648 - in branches/FSM4RTC: . jp.go.aist.rtm.rtcbuilder jp.go.aist.rtm.rtcbuilder/META-INF jp.go.aist.rtm.rtcbuilder/lib jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset4 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1 jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2 jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/fsm jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 1月 22日 (日) 15:07:20 JST
Author: ga
Date: 2017-01-22 15:07:20 +0900 (Sun, 22 Jan 2017)
New Revision: 648
Added:
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-beanutils-1.9.3.jar
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-collections-3.2.2.jar
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-digester-2.1.jar
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-logging-1.2.jar
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-scxml-0.9.jar
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/ScXMLHandler.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/StateParam.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/TransitionParam.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/fsm/
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/fsm/CXX_FSM.cpp.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/fsm/CXX_FSM.h.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/FSMEditorFormPage.java
Removed:
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter04.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common_04/
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc8.vcproj.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc9.vcproj.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.sln.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.vcproj.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.sln.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.vcproj.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/copyprops.bat.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/user_config.vsprops.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp_04/
Modified:
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/.classpath
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/build.properties
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset4/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ModuleName.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/TestModule.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/LanguageEditorFormPage.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
Log:
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/.classpath 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/.classpath 2017-01-22 06:07:20 UTC (rev 648)
@@ -2,6 +2,11 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-digester-2.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-scxml-0.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/velocity-1.6.3-dep.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF 2017-01-22 06:07:20 UTC (rev 648)
@@ -6,7 +6,12 @@
Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder; singleton:=true
Bundle-Version: 1.1.0.rc4v20130124
Bundle-ClassPath: .,
- lib/velocity-1.6.3-dep.jar
+ lib/velocity-1.6.3-dep.jar,
+ lib/commons-collections-3.2.2.jar,
+ lib/commons-beanutils-1.9.3.jar,
+ lib/commons-digester-2.1.jar,
+ lib/commons-logging-1.2.jar,
+ lib/commons-scxml-0.9.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: jp.go.aist.rtm.rtcbuilder,
@@ -40,7 +45,8 @@
org.eclipse.gef,
org.eclipse.ui.ide,
org.eclipse.jdt.ui,
- jp.go.aist.rtm.toolscommon.profiles;visibility:=reexport
+ jp.go.aist.rtm.toolscommon.profiles;visibility:=reexport,
+ jp.go.aist.rtm.toolscommon;bundle-version="1.1.0"
Bundle-ActivationPolicy: lazy
Bundle-Activator: jp.go.aist.rtm.rtcbuilder.RtcBuilderPlugin
Eclipse-BuddyPolicy: registered
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/build.properties
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/build.properties 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/build.properties 2017-01-22 06:07:20 UTC (rev 648)
@@ -8,7 +8,12 @@
plugin.xml,\
plugin.properties,\
icons/,\
- lib/
+ lib/,\
+ lib/commons-beanutils-1.9.3.jar,\
+ lib/commons-digester-2.1.jar,\
+ lib/commons-logging-1.2.jar,\
+ lib/commons-scxml-0.9.jar,\
+ lib/commons-collections-3.2.2.jar
jars.compile.order = .
source.. = src/
output.. = bin/
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-beanutils-1.9.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-beanutils-1.9.3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-collections-3.2.2.jar
===================================================================
(Binary files differ)
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-collections-3.2.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-digester-2.1.jar
===================================================================
(Binary files differ)
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-digester-2.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-logging-1.2.jar
===================================================================
(Binary files differ)
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-logging-1.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-scxml-0.9.jar
===================================================================
(Binary files differ)
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-scxml-0.9.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/ModuleName.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/ConfigType/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -299,6 +300,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset1/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -263,6 +264,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset2/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -269,6 +270,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset3/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -287,6 +288,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset4/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset4/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ConfigSet/configset4/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -263,6 +264,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -261,6 +262,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
privateParam
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
using namespace MyType;
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -271,6 +272,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -36,6 +36,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -541,6 +542,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -287,6 +288,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ModuleName.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ModuleName.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Manip/ModuleName.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ConMulti/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -279,6 +280,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProConMulti/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -31,6 +31,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -292,6 +293,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Multi/ProMulti/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -279,6 +280,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -293,6 +294,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -293,6 +294,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -293,6 +294,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -293,6 +294,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -293,6 +294,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -293,6 +294,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -293,6 +294,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -293,6 +294,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -293,6 +294,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -293,6 +294,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -287,6 +288,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -273,6 +274,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -287,6 +288,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -287,6 +288,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -261,6 +262,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
int private1
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -261,6 +262,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -265,6 +266,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/name/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -257,6 +258,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -263,6 +264,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
int private1
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -269,6 +270,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -273,6 +274,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -280,6 +281,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -287,6 +288,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DFFSMMM/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowFiniteStateMachineMultiModeComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -257,6 +258,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/DataFlow/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -257,6 +258,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basicClass/FSM/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/FiniteStateMachineComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -257,6 +258,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -287,6 +288,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -267,6 +267,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -277,6 +278,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -263,6 +264,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -269,6 +270,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -281,6 +282,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit1/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -270,6 +271,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlinherit/inherit2/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -277,6 +278,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArgStruct/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceCon/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -287,6 +288,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -287,6 +288,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -30,6 +30,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -287,6 +288,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/TestModule.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/TestModule.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/TestModule.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/IDLType1/ModuleName.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/SeqString/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct/ModuleName.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/Struct2/ModuleName.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idltype/type/test.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,6 +29,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -264,6 +265,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/all/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -257,6 +258,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/execute/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -257,6 +258,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/finalize/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -257,6 +258,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/impl/initialize/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -257,6 +258,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library1/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -257,6 +258,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/library/library2/foo.h 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,6 +28,7 @@
// <rtc-template block="port_stub_h">
// </rtc-template>
+
#include <rtm/Manager.h>
#include <rtm/DataFlowComponentBase.h>
#include <rtm/CorbaPort.h>
@@ -257,6 +258,7 @@
// </rtc-template>
+
private:
// <rtc-template block="private_attribute">
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -15,12 +15,14 @@
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.IDLParser;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.ParseException;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.specification;
+import jp.go.aist.rtm.rtcbuilder.fsm.StateParam;
import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
import jp.go.aist.rtm.rtcbuilder.generator.IDLParamConverter;
import jp.go.aist.rtm.rtcbuilder.generator.PreProcessor;
import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.PropertyParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
@@ -242,6 +244,37 @@
throw new RuntimeException(IMessageConstants.CONFIGURATION_VALIDATE_DUPLICATE + rtcParam.getName());
configNames.add(config.getName());
}
+ /////FSM
+ //TODO 国際化
+ PropertyParam fsm = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSM);
+ if(fsm!=null) {
+ if(Boolean.valueOf(fsm.getValue())) {
+ PropertyParam fsmType = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSMTYTPE);
+ if(fsmType==null) {
+ throw new RuntimeException("FSM型が指定されていません:" + rtcParam.getName());
+ } else {
+ String strType = fsmType.getValue();
+ if(!(strType.equals(IRtcBuilderConstants.FSMTYTPE_STATIC) || strType.equals(IRtcBuilderConstants.FSMTYTPE_DYNAMIC))) {
+ throw new RuntimeException("FSM型が不正です:" + rtcParam.getName());
+ }
+ }
+
+ StateParam fsmParam = rtcParam.getFsmParam();
+ if(fsmParam==null) {
+ throw new RuntimeException("FSMコンポーネントの状態遷移図が設定されていません:" + rtcParam.getName());
+ } else {
+ List<String> stateList = new ArrayList<String>();
+ stateList.add(fsmParam.getName());
+ for(StateParam param : fsmParam.getAllStateList() ) {
+ if(stateList.contains(param.getName())) {
+ throw new RuntimeException("状態[" + param.getName() + "]が重複しています:" + rtcParam.getName());
+ } else {
+ stateList.add(param.getName());
+ }
+ }
+ }
+ }
+ }
}
/**
@@ -541,7 +574,7 @@
}
for( IdlFileParam idlFile : rtcParam.getProviderIdlPathes() ) {
IFile idlTarget;
- if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
+ if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
} else {
idlTarget = project.getFile(idlFile.getIdlFile());
@@ -553,7 +586,7 @@
}
for( IdlFileParam idlFile : rtcParam.getConsumerIdlPathes() ) {
IFile idlTarget;
- if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
+ if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
} else {
idlTarget = project.getFile(idlFile.getIdlFile());
@@ -567,7 +600,7 @@
for( String includedIdlFile : rtcParam.getIncludedIdls() ) {
File target = new File(includedIdlFile);
IFile idlTarget;
- if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
+ if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
idlTarget = project.getFile("idl" + File.separator + target.getName());
} else {
idlTarget = project.getFile(target.getName());
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -77,8 +77,6 @@
public static final String LANG_CPP = "C++";
public static final String LANG_CPPWIN = "C++(Windows)";
- public static final String LANG_CSHARP = "C#";
- public static final String LANG_RUBY = "Ruby";
public static final String LANG_PYTHON = "Python";
public static final String LANG_JAVA = "Java";
@@ -163,4 +161,9 @@
public static final int PORT_SPACE_WIDTH = 150;
public static final int SINGLE_COLUMN_WIDTH = 200;
+ //FSM
+ public static final String PROP_TYPE_FSM = "FSM";
+ public static final String PROP_TYPE_FSMTYTPE = "FSMType";
+ public static final String FSMTYTPE_STATIC = "StaticFSM";
+ public static final String FSMTYTPE_DYNAMIC = "DynamicFSM";
}
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/ScXMLHandler.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/ScXMLHandler.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/ScXMLHandler.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -0,0 +1,144 @@
+package jp.go.aist.rtm.rtcbuilder.fsm;
+
+import java.io.BufferedReader;
+import java.io.CharArrayReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.scxml.io.SCXMLParser;
+import org.apache.commons.scxml.model.Data;
+import org.apache.commons.scxml.model.Datamodel;
+import org.apache.commons.scxml.model.Executable;
+import org.apache.commons.scxml.model.History;
+import org.apache.commons.scxml.model.Log;
+import org.apache.commons.scxml.model.SCXML;
+import org.apache.commons.scxml.model.State;
+import org.apache.commons.scxml.model.Transition;
+import org.apache.commons.scxml.model.TransitionTarget;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+public class ScXMLHandler {
+ public StateParam parseSCXML(String source) {
+ StateParam result = null;
+ try {
+ BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(source), "UTF-8"));
+ String tmp_str = null;
+ String topTag = null;
+ StringBuffer tmp_sb = new StringBuffer();
+ while((tmp_str = br.readLine()) != null){
+ tmp_sb.append(tmp_str + "\r\n");
+ if(topTag==null && tmp_str.trim().startsWith("<scxml")) {
+ topTag = tmp_str;
+ }
+ }
+ br.close();
+
+ SCXML scxml = null;
+ try {
+ scxml = (SCXML)SCXMLParser.newInstance().parse(new InputSource(new CharArrayReader((tmp_sb.toString()).toCharArray())));
+ } catch (IOException | SAXException e1) {
+ e1.printStackTrace();
+ }
+ //最上位要素のname属性を取得できないので
+ String topName = "";
+ if(topTag!=null) {
+ String[] elems = topTag.split(" ");
+ for(String elem : elems) {
+ if(elem.startsWith("name=")) {
+ topName = elem.substring(6, elem.length()-1);
+ break;
+ }
+ }
+ }
+ //
+ result = new StateParam();
+ result.setName(topName);
+ Datamodel model = scxml.getDatamodel();
+ if(model!=null) {
+ List dataList = model.getData();
+ if(0<dataList.size()) {
+ Data data = (Data)dataList.get(0);
+ if(data.getNode()!=null) {
+ result.setDataName(data.getNode().getFirstChild().getTextContent());
+ }
+ }
+ }
+
+ Set<String> keysState = scxml.getChildren().keySet();
+ for(String key : keysState) {
+ parseState(result, (State)scxml.getChildren().get(key), "Top", result.getAllStateList(), result.getAllTransList());
+ }
+
+ } catch (FileNotFoundException ex1) {
+ } catch (IOException ex) {
+ }
+ return result;
+ }
+
+ private void parseState(StateParam parentParam, State state, String parentName, List<StateParam> stateList, List<TransitionParam> transList) {
+ StateParam child = new StateParam();
+ parentParam.getStateList().add(child);
+ stateList.add(child);
+
+ String strId = state.getId();
+ child.setName(strId);
+ child.setParentName(parentName);
+ parseDataModel(state, child);
+ child.setHasEntry(parseEntryExit(state.getOnEntry()));
+ child.setHasExit(parseEntryExit(state.getOnExit()));
+
+ List<Transition> trans = state.getTransitionsList();
+ for(Transition tran : trans) {
+ TransitionParam tranParam = new TransitionParam();
+ child.getTransList().add(tranParam);
+ tranParam.setEvent(tran.getEvent());
+ tranParam.setCondition(tran.getCond());
+ tranParam.setTarget(tran.getNext());
+ transList.add(tranParam);
+ }
+
+ for(Object param : state.getHistory()) {
+ History history = (History)param;
+ if( history.isDeep() ) {
+ child.setHistory(2);
+ } else {
+ child.setHistory(1);
+ }
+ }
+ //
+ Set<String> keysState = state.getChildren().keySet();
+ for(String key : keysState) {
+ parseState(child, (State)state.getChildren().get(key), strId, stateList, transList);
+ }
+ }
+
+ private void parseDataModel(TransitionTarget targetState, StateParam targetParam) {
+ Datamodel model = targetState.getDatamodel();
+ if(model==null) return;
+ List dataList = model.getData();
+ if(dataList.size()==0) return;
+ Data data = (Data)dataList.get(0);
+ if(data.getNode()!=null) {
+ targetParam.setDataName(data.getNode().getFirstChild().getTextContent());
+ }
+ }
+
+ private boolean parseEntryExit(Executable target) {
+ List actionList = target.getActions();
+ if(actionList.size()==0) return false;
+ Object action = actionList.get(0);
+ if(action instanceof Log) {
+ Log log = (Log)action;
+ String strON = log.getLabel();
+ if(strON.equals("ON")) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/StateParam.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/StateParam.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/StateParam.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -0,0 +1,83 @@
+package jp.go.aist.rtm.rtcbuilder.fsm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StateParam {
+ private String initialState;
+ private int history;
+ private String name;
+ private String parentName;
+ private boolean hasEntry;
+ private boolean hasExit;
+ private String dataName;
+
+ private List<StateParam> stateList = new ArrayList<StateParam>();
+ private List<TransitionParam> transList = new ArrayList<TransitionParam>();
+
+ private List<StateParam> allStateList = new ArrayList<StateParam>();
+ private List<TransitionParam> allTransList = new ArrayList<TransitionParam>();
+
+ public String getInitialState() {
+ return initialState;
+ }
+ public void setInitialState(String initialState) {
+ this.initialState = initialState;
+ }
+
+ public int getHistory() {
+ return history;
+ }
+ public void setHistory(int history) {
+ this.history = history;
+ }
+
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getParentName() {
+ return parentName;
+ }
+ public void setParentName(String parentName) {
+ this.parentName = parentName;
+ }
+
+ public boolean isHasEntry() {
+ return hasEntry;
+ }
+ public void setHasEntry(boolean hasEntry) {
+ this.hasEntry = hasEntry;
+ }
+
+ public boolean isHasExit() {
+ return hasExit;
+ }
+ public void setHasExit(boolean hasExit) {
+ this.hasExit = hasExit;
+ }
+
+ public String getDataName() {
+ return dataName;
+ }
+ public void setDataName(String dataName) {
+ this.dataName = dataName;
+ }
+
+ public List<StateParam> getStateList() {
+ return stateList;
+ }
+ public List<TransitionParam> getTransList() {
+ return transList;
+ }
+
+ public List<StateParam> getAllStateList() {
+ return allStateList;
+ }
+ public List<TransitionParam> getAllTransList() {
+ return allTransList;
+ }
+}
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/TransitionParam.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/TransitionParam.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/fsm/TransitionParam.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -0,0 +1,28 @@
+package jp.go.aist.rtm.rtcbuilder.fsm;
+
+public class TransitionParam {
+ private String event;
+ private String condition;
+ private String target;
+
+ public String getEvent() {
+ return event;
+ }
+ public void setEvent(String event) {
+ this.event = event;
+ }
+
+ public String getCondition() {
+ return condition;
+ }
+ public void setCondition(String condition) {
+ this.condition = condition;
+ }
+
+ public String getTarget() {
+ return target;
+ }
+ public void setTarget(String target) {
+ this.target = target;
+ }
+}
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -12,6 +12,7 @@
import javax.xml.datatype.DatatypeFactory;
import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
+import jp.go.aist.rtm.rtcbuilder.fsm.StateParam;
import jp.go.aist.rtm.rtcbuilder.generator.ProfileHandler;
import jp.go.aist.rtm.rtcbuilder.generator.param.idl.IdlFileParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.idl.ServiceClassParam;
@@ -63,7 +64,6 @@
private RecordedList<String> langArgList = new RecordedList<String>();
private RecordedList<String> libraryPath = new RecordedList<String>();
private String architecture = new String();
- boolean enableOldBuildEnv= false;
private RecordedList<TargetEnvParam> targetEnvs = new RecordedList<TargetEnvParam>();
//RTC.xml
private String rtcxml;
@@ -71,6 +71,8 @@
private String doc_description;
private String doc_in_out;
private String doc_algorithm;
+ //FSM
+ private StateParam fsmParam;
//
private RecordedList<ActionsParam> actions;
//
@@ -145,7 +147,7 @@
//
setUpdated(false);
}
-
+ /////
public List<String> getPrivateOperations() {
return privateOperations;
}
@@ -347,9 +349,6 @@
public String getArchitecture() {
return this.architecture;
}
- public boolean enableOldBuildEnv() {
- return enableOldBuildEnv;
- }
public List<TargetEnvParam> getTargetEnvs() {
return this.targetEnvs;
}
@@ -384,10 +383,6 @@
}
return result;
}
- public void setEnableOldBuildEnv(boolean b) {
- checkUpdated(this.enableOldBuildEnv, b);
- this.enableOldBuildEnv = b;
- }
//ドキュメント-Component
public boolean isDocExist() {
@@ -839,6 +834,13 @@
public void setPublicOpeSource(String publicOpeSource) {
this.publicOpeSource = publicOpeSource;
}
+
+ public StateParam getFsmParam() {
+ return fsmParam;
+ }
+ public void setFsmParam(StateParam fsmParam) {
+ this.fsmParam = fsmParam;
+ }
@Override
public boolean isUpdated() {
@@ -886,5 +888,58 @@
//
this.targetEnvs.resetUpdated();
}
-
+ /////
+ public void addFSMPort() {
+ boolean isExist = false;
+ for(DataPortParam port : inports) {
+ if(port.getName().equals("FSMEvent")) {
+ isExist = true;
+ break;
+ }
+ }
+ if(isExist) return;
+ //
+ DataPortParam fsmParam = new DataPortParam("FSMEvent", "RTC::TimedLong", "FSMEvent", 0);
+ inports.add(fsmParam);
+ }
+
+ public void deleteFSMPort() {
+ DataPortParam target = null;
+ for(DataPortParam port : inports) {
+ if(port.getName().equals("FSMEvent")) {
+ target = port;
+ break;
+ }
+ }
+ if(target==null) return;
+ //
+ inports.remove(target);
+ }
+
+ public PropertyParam getProperty(String target) {
+ PropertyParam result = null;
+ for(PropertyParam param : properties) {
+ if( param.getName().equals(target)) {
+ result = param;
+ break;
+ }
+ }
+ return result;
+ }
+
+ public void setProperty(String target, String value) {
+ PropertyParam prop = null;
+ for(PropertyParam param : properties) {
+ if( param.getName().equals(target)) {
+ prop = param;
+ break;
+ }
+ }
+ if(prop==null) {
+ prop = new PropertyParam();
+ prop.setName(target);
+ getProperties().add(prop);
+ }
+ prop.setValue(value);
+ }
}
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -47,7 +47,6 @@
@Override
public List<GeneratedResult> generateTemplateCode(RtcParam rtcParam) {
List<GeneratedResult> result = new ArrayList<GeneratedResult>();
- if (rtcParam.enableOldBuildEnv()) return result;
if (!validateRtcParam(rtcParam)) {
return result;
@@ -142,9 +141,9 @@
result.add(gr);
//TODO アイコン、ビットマップのコピー
- //cmake/Modules
- gr = generateModulesFindOpenRTM(contextMap);
- result.add(gr);
+// //cmake/Modules
+// gr = generateModulesFindOpenRTM(contextMap);
+// result.add(gr);
//doc
gr = generateDocCMakeLists(contextMap);
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter04.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter04.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter04.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,59 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.manager;
-
-import java.util.UUID;
-
-/**
- * CXXソースを出力する際に使用されるユーティリティ
- */
-public class CXXConverter04 extends jp.go.aist.rtm.rtcbuilder.manager.CXXConverter {
- private static String projectGUID = null;
- private static String projectID = null;
- private static String compProjectID = null;
- private static String sourceID = null;
- private static String headerID = null;
- private static String compSourceID = null;
- private static String compHeaderID = null;
-
- public static String getProjectGID(boolean isTest) {
- if( isTest ) return "8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942";
- if( projectGUID==null ) projectGUID = UUID.randomUUID().toString().toUpperCase();
- return projectGUID;
- }
-
- public static String getProjectUUID(boolean isTest) {
- if( isTest ) return "D1CD3730-28E2-11DD-88AA-005056C00008";
- if( projectID==null ) projectID = UUID.randomUUID().toString().toUpperCase();
- return projectID;
- }
-
- public static String getCompProjectUUID(boolean isTest) {
- if( isTest ) return "D1322FAE-28E2-11DD-B62B-005056C00008";
- if( projectID==null ) compProjectID = UUID.randomUUID().toString().toUpperCase();
- return compProjectID;
- }
-
- public static String getSourceUUID(boolean isTest) {
- if( isTest ) return "D1CD3730-28E2-11DD-B7E1-005056C00008";
- if( sourceID==null ) sourceID = UUID.randomUUID().toString().toUpperCase();
- return sourceID;
- }
-
- public static String getHeaderUUID(boolean isTest) {
- if( isTest ) return "D1CD3730-28E2-11DD-A46E-005056C00008";
- if( headerID==null ) headerID = UUID.randomUUID().toString().toUpperCase();
- return headerID;
- }
-
- public static String getCompSourceUUID(boolean isTest) {
- if( isTest ) return "D19D74A1-28E2-11DD-81A5-005056C00008";
- if( compSourceID==null ) compSourceID = UUID.randomUUID().toString().toUpperCase();
- return compSourceID;
- }
-
- public static String getCompHeaderUUID(boolean isTest) {
- if( isTest ) return "D19D74A1-28E2-11DD-9671-005056C00008";
- if( compHeaderID==null ) compHeaderID = UUID.randomUUID().toString().toUpperCase();
- return compHeaderID;
- }
-
-}
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -7,12 +7,15 @@
import java.util.Map;
import jp.go.aist.rtm.rtcbuilder.IRTCBMessageConstants;
+import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
+import jp.go.aist.rtm.rtcbuilder.fsm.StateParam;
import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
+import jp.go.aist.rtm.rtcbuilder.generator.param.PropertyParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.idl.IdlFileParam;
import jp.go.aist.rtm.rtcbuilder.template.TemplateHelper;
import jp.go.aist.rtm.rtcbuilder.template.TemplateUtil;
-
+import jp.go.aist.rtm.rtcbuilder.manager.CXXConverter;
import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
import static jp.go.aist.rtm.rtcbuilder.util.RTCUtil.*;
@@ -54,8 +57,7 @@
Map<String, Object> contextMap = new HashMap<String, Object>();
contextMap.put("template", TEMPLATE_PATH);
contextMap.put("rtcParam", rtcParam);
- contextMap.put("cXXConv",
- new jp.go.aist.rtm.rtcbuilder.manager.CXXConverter04());
+ contextMap.put("cXXConv", new CXXConverter());
contextMap.put("tmpltHelper", new TemplateHelper());
resetIDLServiceClass(rtcParam);
@@ -76,28 +78,18 @@
result.add(gr);
gr = generateRTCSource(contextMap);
result.add(gr);
-
- if (rtcParam.enableOldBuildEnv()) {
- // 旧バージョンのビルド環境の生成
- gr = generateMakefile(contextMap);
- result.add(gr);
-
- gr = generateVC9Sln(contextMap);
- result.add(gr);
- gr = generateVC8Sln(contextMap);
- result.add(gr);
- gr = generateVC9CompProj(contextMap);
- result.add(gr);
- gr = generateVC8CompProj(contextMap);
- result.add(gr);
- gr = generateVC9RTCProj(contextMap);
- result.add(gr);
- gr = generateVC8RTCProj(contextMap);
- result.add(gr);
- gr = generateVCCopyProps(contextMap);
- result.add(gr);
- gr = generateVCUserConfig(contextMap);
- result.add(gr);
+
+ PropertyParam fsm = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSM);
+ if(fsm!=null) {
+ if(Boolean.valueOf(fsm.getValue())) {
+ PropertyParam fsmType = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSMTYTPE);
+ if(fsmType.getValue().equals(IRtcBuilderConstants.FSMTYTPE_STATIC)) {
+ gr = generateFSMHeader(contextMap);
+ result.add(gr);
+ gr = generateFSMSource(contextMap);
+ result.add(gr);
+ }
+ }
}
for (IdlFileParam idl : rtcParam.getProviderIdlPathes()) {
@@ -116,11 +108,7 @@
public GeneratedResult generateCompSource(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = null;
- if( rtcParam.enableOldBuildEnv() ) {
- outfile = rtcParam.getName() + "Comp.cpp";
- } else {
- outfile = "src/" + rtcParam.getName() + "Comp.cpp";
- }
+ outfile = "src/" + rtcParam.getName() + "Comp.cpp";
String infile = "cpp/CXX_Comp.cpp.vsl";
return generate(infile, outfile, contextMap);
}
@@ -128,11 +116,7 @@
public GeneratedResult generateRTCHeader(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = null;
- if( rtcParam.enableOldBuildEnv() ) {
- outfile = rtcParam.getName() + ".h";
- } else {
- outfile = "include/" + rtcParam.getName() + "/" + rtcParam.getName() + ".h";
- }
+ outfile = "include/" + rtcParam.getName() + "/" + rtcParam.getName() + ".h";
String infile = "cpp/CXX_RTC.h.vsl";
return generate(infile, outfile, contextMap);
}
@@ -140,11 +124,7 @@
public GeneratedResult generateRTCSource(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = null;
- if( rtcParam.enableOldBuildEnv() ) {
- outfile = rtcParam.getName() + ".cpp";
- } else {
- outfile = "src/" + rtcParam.getName() + ".cpp";
- }
+ outfile = "src/" + rtcParam.getName() + ".cpp";
String infile = "cpp/CXX_RTC.cpp.vsl";
return generate(infile, outfile, contextMap);
}
@@ -153,96 +133,50 @@
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
String outfile = null;
- if( rtcParam.enableOldBuildEnv() ) {
- outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".h";
- } else {
- outfile = "include/" + rtcParam.getName() + "/"
- + TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".h";
- }
+ outfile = "include/" + rtcParam.getName() + "/"
+ + TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+ + TemplateHelper.getServiceImplSuffix() + ".h";
String infile = "cpp/CXX_SVC.h.vsl";
return generate(infile, outfile, contextMap);
}
public GeneratedResult generateSVCSource(Map<String, Object> contextMap) {
IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = null;
- if( rtcParam.enableOldBuildEnv() ) {
- outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".cpp";
- } else {
- outfile = "src/" + TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".cpp";
- }
+ outfile = "src/" + TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+ + TemplateHelper.getServiceImplSuffix() + ".cpp";
String infile = "cpp/CXX_SVC.cpp.vsl";
return generate(infile, outfile, contextMap);
}
- // 1.0系 (ビルド環境)
-
- public GeneratedResult generateMakefile(Map<String, Object> contextMap) {
+ public GeneratedResult generateFSMHeader(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = "Makefile." + rtcParam.getName();
- String infile = "cpp/Makefile.vsl";
+ StateParam stateParam = rtcParam.getFsmParam();
+ contextMap.put("fsmParam", stateParam);
+
+ String outfile = null;
+ outfile = "include/" + rtcParam.getName() + "/" + rtcParam.getName() + "FSM.h";
+ String infile = "fsm/CXX_FSM.h.vsl";
return generate(infile, outfile, contextMap);
}
-
- public GeneratedResult generateVC9Sln(Map<String, Object> contextMap) {
+
+ public GeneratedResult generateFSMSource(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "_vc9.sln";
- String infile = "cpp/CXX_vc9.sln.vsl";
+ String outfile = null;
+ outfile = "src/" + rtcParam.getName() + "FSM.cpp";
+ String infile = "fsm/CXX_FSM.cpp.vsl";
return generate(infile, outfile, contextMap);
}
+
+ // 1.0系 (ビルド環境)
- public GeneratedResult generateVC8Sln(Map<String, Object> contextMap) {
+ public GeneratedResult generateMakefile(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "_vc8.sln";
- String infile = "cpp/CXX_vc8.sln.vsl";
+ String outfile = "Makefile." + rtcParam.getName();
+ String infile = "cpp/Makefile.vsl";
return generate(infile, outfile, contextMap);
}
- public GeneratedResult generateVC8CompProj(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "Comp_vc8.vcproj";
- String infile = "cpp/CXX_Comp_vc8.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC9CompProj(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "Comp_vc9.vcproj";
- String infile = "cpp/CXX_Comp_vc9.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC8RTCProj(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "_vc8.vcproj";
- String infile = "cpp/CXX_vc8.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC9RTCProj(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "_vc9.vcproj";
- String infile = "cpp/CXX_vc9.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVCCopyProps(Map<String, Object> contextMap) {
- String outfile = "copyprops.bat";
- String infile = "cpp/copyprops.bat.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVCUserConfig(Map<String, Object> contextMap) {
- String outfile = "user_config.vsprops";
- String infile = "cpp/user_config.vsprops.vsl";
- return generate(infile, outfile, contextMap);
- }
-
public GeneratedResult generate(String infile, String outfile,
Map<String, Object> contextMap) {
try {
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -2,11 +2,13 @@
import java.io.File;
+import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
+import jp.go.aist.rtm.rtcbuilder.fsm.StateParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigParameterParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.PropertyParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.idl.IdlFileParam;
-
import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
import static jp.go.aist.rtm.rtcbuilder.util.StringUtil.*;
@@ -335,4 +337,32 @@
return false;
return true;
}
+
+ public String getHistory(StateParam param) {
+ if(param.getHistory()==2) {
+ return " DEEPHISTORY()";
+ } else if(param.getHistory()==1) {
+ return " HISTORY()";
+ }
+ return " ";
+ }
+
+ public boolean checkFSM(RtcParam param) {
+ PropertyParam fsm = param.getProperty(IRtcBuilderConstants.PROP_TYPE_FSM);
+ if(fsm==null) return false;
+
+ if(Boolean.valueOf(fsm.getValue())) {
+ PropertyParam fsmType = param.getProperty(IRtcBuilderConstants.PROP_TYPE_FSMTYTPE);
+ if(fsmType==null) return false;
+ String strType = fsmType.getValue();
+ if(strType.equals(IRtcBuilderConstants.FSMTYTPE_STATIC)) return true;
+ }
+ return false;
+ }
+
+ public String getTopFSMName(RtcParam param) {
+ StateParam state = param.getFsmParam();
+ if(state==null) return "";
+ return state.getName();
+ }
}
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,4 +1,7 @@
-set(hdrs ${rtcParam.name}.h
+set(hdrs
+ ${rtcParam.name}.h
+#if( ${tmpltHelper.checkFSM(${rtcParam})} ) ${rtcParam.name}FSM.h
+#end
PARENT_SCOPE
#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,5 +1,15 @@
-set(comp_srcs ${rtcParam.name}.cpp #foreach($providerIdlFile in ${rtcParam.providerIdlPathes})${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp #end)
-set(standalone_srcs ${rtcParam.name}Comp.cpp)
+set(comp_srcs
+ ${rtcParam.name}.cpp
+#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp
+#end
+#if( ${tmpltHelper.checkFSM(${rtcParam})} ) ${rtcParam.name}FSM.cpp
+#end
+ )
+set(standalone_srcs
+ ${rtcParam.name}Comp.cpp
+#if( ${tmpltHelper.checkFSM(${rtcParam})} ) ${rtcParam.name}FSM.cpp
+#end
+ )
if (DEFINED OPENRTM_INCLUDE_DIRS)
string(REGEX REPLACE "-I" ";"
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc8.vcproj.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc8.vcproj.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc8.vcproj.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="${rtcParam.name}Comp"
- ProjectGUID="{${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}"
- RootNamespace="${rtcParam.name}Comp"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}Comp\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}Comp\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0500;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_libd) $(coil_libd)"
- OutputFile="$(OutDir)${yen}${rtcParam.name}Comp.exe"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}Comp\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}Comp\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0500;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_lib) $(coil_lib)"
- OutputFile="$(OutDir)${yen}${rtcParam.name}Comp.exe"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if NOT EXIST "$(SolutionDir)\\components" mkdir "$(SolutionDir)\\components"
copy "$(OutDir)\\\\${rtcParam.name}Comp.exe" "$(SolutionDir)\\components"
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{${cXXConv.getCompSourceUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.cpp"
- >
- </File>
- <File
- RelativePath="${rtcParam.name}Comp.cpp"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp"
- >
- </File>
-#end#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.cpp"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
-#end
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{${cXXConv.getCompHeaderUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.h"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h"
- >
- </File>
-#end#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
-#end
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc9.vcproj.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc9.vcproj.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc9.vcproj.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="${rtcParam.name}Comp"
- ProjectGUID="{${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}"
- RootNamespace="${rtcParam.name}Comp"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}Comp\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}Comp\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0500;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_libd) $(coil_libd)"
- OutputFile="$(OutDir)${yen}${rtcParam.name}Comp.exe"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}Comp\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}Comp\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0500;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_lib) $(coil_lib)"
- OutputFile="$(OutDir)${yen}${rtcParam.name}Comp.exe"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if NOT EXIST "$(SolutionDir)\\components" mkdir "$(SolutionDir)\\components"
copy "$(OutDir)\\\\${rtcParam.name}Comp.exe" "$(SolutionDir)\\components"
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{${cXXConv.getCompSourceUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.cpp"
- >
- </File>
- <File
- RelativePath="${rtcParam.name}Comp.cpp"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.cpp"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
-#end
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{${cXXConv.getCompHeaderUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.h"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
-#end
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -37,6 +37,12 @@
#end
// </rtc-template>
+#if( ${tmpltHelper.checkFSM(${rtcParam})} )
+// FSM headers
+// <rtc-template block="fsm_h">
+${sharp}include <${rtcParam.name}FSM.h>
+// </rtc-template>#end
+
${sharp}include <rtm/Manager.h>
${sharp}include <rtm/${rtcParam.componentKind}Base.h>
${sharp}include <rtm/CorbaPort.h>
@@ -477,6 +483,13 @@
// </rtc-template>
+#if( ${tmpltHelper.checkFSM(${rtcParam})} )
+ // FSM declaration
+ // <rtc-template block="fsm_declare">
+ ${rtcParam.name}FSM::Machine<${tmpltHelper.getTopFSMName(${rtcParam})}>* machine_;
+ // </rtc-template>
+#end
+
private:
// <rtc-template block="private_attribute">
#foreach($privateAttribute in ${rtcParam.privateAttributes})
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.sln.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.sln.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.sln.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,29 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{${cXXConv.getProjectGID(${rtcParam.isTest})}}") = "${rtcParam.name}Comp", "${rtcParam.name}Comp_vc8.vcproj", "{${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{${cXXConv.getProjectGID(${rtcParam.isTest})}}") = "${rtcParam.name}", "${rtcParam.name}_vc8.vcproj", "{${cXXConv.getProjectUUID(${rtcParam.isTest})}}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Release|Win32 = Release|Win32
- Debug|Win32 = Debug|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Release|Win32.ActiveCfg = Release|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Release|Win32.Build.0 = Release|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Debug|Win32.ActiveCfg = Debug|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Debug|Win32.Build.0 = Debug|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Release|Win32.ActiveCfg = Release|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Release|Win32.Build.0 = Release|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Debug|Win32.ActiveCfg = Debug|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Debug|Win32.Build.0 = Debug|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.vcproj.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.vcproj.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.vcproj.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="${rtcParam.name}"
- ProjectGUID="{${cXXConv.getProjectUUID(${rtcParam.isTest})}}"
- RootNamespace="${rtcParam.name}"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
-
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_libd) $(coil_libd)"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_lib) $(coil_lib)"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if NOT EXIST "$(SolutionDir)\\components" mkdir "$(SolutionDir)\\components"
copy "$(OutDir)\\\\${rtcParam.name}.dll" "$(SolutionDir)\\components"
"
- />
- </Configuration>
- </Configurations>
-
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{${cXXConv.getSourceUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.cpp"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.cpp"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
-#end
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{${cXXConv.getHeaderUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.h"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
-#end
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.sln.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.sln.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.sln.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,29 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "${rtcParam.name}Comp", "${rtcParam.name}Comp_vc9.vcproj", "{${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "${rtcParam.name}", "${rtcParam.name}_vc9.vcproj", "{${cXXConv.getProjectUUID(${rtcParam.isTest})}}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Release|Win32 = Release|Win32
- Debug|Win32 = Debug|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Release|Win32.ActiveCfg = Release|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Release|Win32.Build.0 = Release|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Debug|Win32.ActiveCfg = Debug|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Debug|Win32.Build.0 = Debug|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Release|Win32.ActiveCfg = Release|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Release|Win32.Build.0 = Release|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Debug|Win32.ActiveCfg = Debug|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Debug|Win32.Build.0 = Debug|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.vcproj.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.vcproj.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.vcproj.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="${rtcParam.name}"
- ProjectGUID="{${cXXConv.getProjectUUID(${rtcParam.isTest})}}"
- RootNamespace="${rtcParam.name}"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_libd) $(coil_libd)"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_lib) $(coil_lib)"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if NOT EXIST "$(SolutionDir)\\components" mkdir "$(SolutionDir)\\components"
copy "$(OutDir)\\\\${rtcParam.name}.dll" "$(SolutionDir)\\components"
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{${cXXConv.getSourceUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.cpp"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.cpp"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
-#end
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{${cXXConv.getHeaderUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.h"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
-#end
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/copyprops.bat.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/copyprops.bat.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/copyprops.bat.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,3 +0,0 @@
-
-copy "%RTM_ROOT%\etc\rtm_config.vsprops" .
-
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/user_config.vsprops.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/user_config.vsprops.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/user_config.vsprops.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="User property"
- >
- <UserMacro
- Name="user_lib"
- Value=""
- />
- <UserMacro
- Name="user_libd"
- Value=""
- />
-</VisualStudioPropertySheet>
-
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/fsm/CXX_FSM.cpp.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/fsm/CXX_FSM.cpp.vsl (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/fsm/CXX_FSM.cpp.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -0,0 +1,56 @@
+// -*- C++ -*-
+/*!
+ * @file ${rtcParam.name}FSM.cpp
+ * @date ${dol}Date${dol}
+ * ${dol}Id${dol}
+ */
+
+${sharp}include "${rtcParam.name}FSM.h"
+
+namespace ${rtcParam.name}FSM {
+
+void ${fsmParam.name}::set_component(Fsm* component) {
+ ::set_component(component);
+}
+void ${fsmParam.name}::notify_fsm_state_changed(const char* state) {
+ ::get_component()->notify_fsm_state_changed(state);
+}
+
+// Top state
+void ${fsmParam.name}::init() {
+}
+
+void ${fsmParam.name}::entry() {
+}
+
+void ${fsmParam.name}::exit() {
+}
+
+#foreach($eachTrans in ${fsmParam.getAllTransList()})
+void ${fsmParam.name}::${eachTrans.event}(RTC::TimedLong param) {
+}
+
+#end
+#foreach($eachState in ${fsmParam.getAllStateList()})
+//${eachState.name}
+void ${eachState.name}::init() {
+}
+
+#if( ${eachState.hasEntry} )
+void ${eachState.name}::entry() {
+}
+#end
+#if( ${eachState.hasExit} )
+void ${eachState.name}::exit() {
+}
+#end
+
+#foreach($eachTrans in ${eachState.getTransList()})
+void ${eachState.name}::${eachTrans.event}(RTC::TimedLong param) {
+ setState<${eachTrans.target}>();
+}
+
+#end
+
+#end
+} //end namespace '${rtcParam.name}FSM'
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/fsm/CXX_FSM.h.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/fsm/CXX_FSM.h.vsl (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/fsm/CXX_FSM.h.vsl 2017-01-22 06:07:20 UTC (rev 648)
@@ -0,0 +1,69 @@
+// -*- C++ -*-
+/*!
+ * @file ${rtcParam.name}FSM.h
+ * @date ${dol}Date${dol}
+ * ${dol}Id${dol}
+ */
+
+${sharp}ifndef ${rtcParam.name.toUpperCase()}_FSM_H
+${sharp}define ${rtcParam.name.toUpperCase()}_FSM_H
+
+${sharp}include <rtm/idl/BasicDataTypeSkel.h>
+${sharp}include <rtm/idl/ExtendedDataTypesSkel.h>
+${sharp}include <rtm/idl/InterfaceDataTypesSkel.h>
+
+class Fsm;
+
+namespace ${rtcParam.name}FSM {
+
+// Machine's top state
+TOPSTATE(${fsmParam.name}) {
+ // Top state variables (visible to all substates)
+#if( ${fsmParam.dataName.length()} > 0 )
+ struct ${fsmParam.dataName} {
+ ${fsmParam.dataName}() {}
+ };
+#end
+
+ STATE(${fsmParam.name})
+
+ static void set_component(Fsm* component);
+ static void notify_fsm_state_changed(const char* state);
+
+ // Event handler
+#foreach($eachTrans in ${fsmParam.getAllTransList()})
+ virtual void ${eachTrans.event}(RTC::TimedLong param);
+#end
+
+ protected:
+ void init();
+ void entry();
+ void exit();
+};
+
+#foreach($eachState in ${fsmParam.getAllStateList()})
+SUBSTATE(${eachState.name}, ${eachState.parentName}) {
+#if( ${eachState.dataName.length()} > 0 )
+ struct ${eachState.dataName} {
+ ${eachState.dataName}() {}
+ };
+#end
+ STATE(${eachState.name})
+${tmpltHelper.getHistory(${eachState})}
+#foreach($eachTrans in ${eachState.getTransList()})
+ void ${eachTrans.event}(RTC::TimedLong param);
+#end
+
+private:
+ void init();
+#if( ${eachState.hasEntry} ) void entry();
+#end
+#if( ${eachState.hasExit} ) void exit();
+#end
+};
+
+#end
+
+} //end namespace '${rtcParam.name}FSM'
+
+#endif // ${rtcParam.name.toUpperCase()}_FSM_H
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -1,29 +1,15 @@
package jp.go.aist.rtm.rtcbuilder.ui.editors;
import java.io.ByteArrayInputStream;
+import java.io.File;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.GregorianCalendar;
import java.util.Iterator;
import java.util.List;
import javax.xml.bind.JAXBException;
-import jp.go.aist.rtm.rtcbuilder.GuiRtcBuilder;
-import jp.go.aist.rtm.rtcbuilder.IRTCBMessageConstants;
-import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
-import jp.go.aist.rtm.rtcbuilder.RtcBuilderPlugin;
-import jp.go.aist.rtm.rtcbuilder.extension.ImportExtension;
-import jp.go.aist.rtm.rtcbuilder.factory.ExportCreator;
-import jp.go.aist.rtm.rtcbuilder.generator.ProfileHandler;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.ui.Perspective.LanguageProperty;
-import jp.go.aist.rtm.rtcbuilder.ui.preference.ComponentPreferenceManager;
-import jp.go.aist.rtm.rtcbuilder.ui.wizard.RtcExportWizard;
-import jp.go.aist.rtm.rtcbuilder.util.FileUtil;
-import jp.go.aist.rtm.rtcbuilder.util.StringUtil;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
@@ -60,6 +46,25 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jp.go.aist.rtm.rtcbuilder.GuiRtcBuilder;
+import jp.go.aist.rtm.rtcbuilder.IRTCBMessageConstants;
+import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
+import jp.go.aist.rtm.rtcbuilder.RtcBuilderPlugin;
+import jp.go.aist.rtm.rtcbuilder.extension.ImportExtension;
+import jp.go.aist.rtm.rtcbuilder.factory.ExportCreator;
+import jp.go.aist.rtm.rtcbuilder.fsm.StateParam;
+import jp.go.aist.rtm.rtcbuilder.generator.ProfileHandler;
+import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.PropertyParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
+import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
+import jp.go.aist.rtm.rtcbuilder.ui.Perspective.LanguageProperty;
+import jp.go.aist.rtm.rtcbuilder.ui.preference.ComponentPreferenceManager;
+import jp.go.aist.rtm.rtcbuilder.ui.preference.DocumentPreferenceManager;
+import jp.go.aist.rtm.rtcbuilder.ui.wizard.RtcExportWizard;
+import jp.go.aist.rtm.rtcbuilder.util.FileUtil;
+import jp.go.aist.rtm.rtcbuilder.util.StringUtil;
+
/**
* Basic Profile 設定ページ
*/
@@ -305,8 +310,10 @@
}
private void createGenerateSection(FormToolkit toolkit, ScrolledForm form) {
+// generateSection = createSectionBaseWithLabel(toolkit, form,
+// IMessageConstants.BASIC_GENERATE_TITLE, IMessageConstants.BASIC_GENERATE_EXPL, 2);
generateSection = createSectionBaseWithLabel(toolkit, form,
- IMessageConstants.BASIC_GENERATE_TITLE, IMessageConstants.BASIC_GENERATE_EXPL, 2);
+ IMessageConstants.BASIC_GENERATE_TITLE, IMessageConstants.BASIC_GENERATE_EXPL, 4);
//
createGenerateButton(toolkit);
createPackageButton(toolkit);
@@ -334,8 +341,20 @@
MessageDialog.openError(getSite().getShell(), "Error", validateRtcParam);
return;
}
+ //動的FSMの場合
+ boolean isDynamicFSM = false;
+ RtcParam rtcParam = editor.getRtcParam();
+ PropertyParam fsm = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSM);
+ if(fsm!=null) {
+ if(Boolean.valueOf(fsm.getValue())) {
+ PropertyParam fsmType = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSMTYTPE);
+ if(fsmType!=null && fsmType.getValue().equals(IRtcBuilderConstants.FSMTYTPE_DYNAMIC)) {
+ isDynamicFSM = true;
+ }
+ }
+ }
//対象プロジェクトの確認
- IProject project = checkTargetProject();
+ IProject project = checkTargetProject(editor.getRtcParam().getOutputProject(), true);
if( project==null) return;
// 裏からファイルを削除されている可能性があるため、
// プロジェクトとファイルシステムの同期を取る
@@ -358,7 +377,7 @@
//TODO 複数コンポーネント対応版とする場合には複数設定
generatorParam.getRtcParams().get(0).getServiceClassParams().clear();
setPrefixSuffix(generatorParam.getRtcParams().get(0));
- if (rtcBuilder.doGenerateWrite(generatorParam)) {
+ if (rtcBuilder.doGenerateWrite(generatorParam, !isDynamicFSM)) {
LanguageProperty langProp = LanguageProperty.checkPlugin(editor.getRtcParam());
if(langProp != null) {
try {
@@ -383,15 +402,146 @@
editor.getRtcParam().resetUpdated();
editor.updateDirty();
}
+ if(isDynamicFSM) {
+ generateDynamicFSM();
+ return;
+ }
}
+ private void generateDynamicFSM() {
+ RtcParam rtcParam = editor.getRtcParam();
+ StateParam stateParam = rtcParam.getFsmParam();
+
+ List<RtcParam> stateList = new ArrayList<RtcParam>();
+
+ RtcParam stateRtc = createDefaultRTC(stateParam);
+ stateList.add(stateRtc);
+ for(StateParam subState : stateParam.getAllStateList()) {
+ RtcParam subRtc = createDefaultRTC(subState);
+ stateList.add(subRtc);
+ }
+ //
+ editor.addDefaultComboValue();
+ GuiRtcBuilder rtcBuilder = new GuiRtcBuilder();
+ List<GenerateManager> managerList = RtcBuilderPlugin.getDefault().getLoader().getManagerList();
+ if (managerList != null) {
+ for (GenerateManager manager : managerList) {
+ rtcBuilder.addGenerateManager(manager);
+ }
+ }
+ GeneratorParam generatorParam = editor.getGeneratorParam();
+ RtcParam orgRtc = generatorParam.getRtcParams().get(0);
+
+ for(RtcParam targetFsm : stateList) {
+ IProject project = checkTargetProject(targetFsm.getOutputProject(), false);
+ if( project==null) continue;
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ } catch (CoreException e1) {
+ throw new RuntimeException(IRTCBMessageConstants.ERROR_GENERATE_FAILED);
+ }
+ //
+ targetFsm.getServiceClassParams().clear();
+ setPrefixSuffix(targetFsm);
+ generatorParam.getRtcParams().set(0, targetFsm);
+ //
+ if (rtcBuilder.doGenerateWrite(generatorParam, false)) {
+ LanguageProperty langProp = LanguageProperty.checkPlugin(editor.getRtcParam());
+ if(langProp != null) {
+ try {
+ IProjectDescription description = project.getDescription();
+ String[] ids = description.getNatureIds();
+ String[] newIds = new String[ids.length + langProp.getNatures().size()];
+ System.arraycopy(ids, 0, newIds, 0, ids.length);
+ for( int intIdx=0; intIdx<langProp.getNatures().size(); intIdx++ ) {
+ newIds[ids.length+intIdx] = langProp.getNatures().get(intIdx);
+ }
+ description.setNatureIds(newIds);
+ project.setDescription(description, null);
+ } catch (CoreException e1) {
+ LOGGER.error(
+ "Fail to get/set description for project",
+ e1);
+ }
+ }
+ }
+ saveRtcProfile(project);
+ }
+ editor.getRtcParam().resetUpdated();
+ editor.updateDirty();
+ generatorParam.getRtcParams().set(0, orgRtc);
+ MessageDialog.openInformation(getSite().getShell(), "Information", "Generate success.");
+ }
+
+ private RtcParam createDefaultRTC(StateParam stateParam) {
+ List<String> langList = new ArrayList<String>();
+ List<String> langArgList = new ArrayList<String>();
+ String rtmVersion = IRtcBuilderConstants.RTM_VERSION_100;
+ langList.add(IRtcBuilderConstants.LANG_CPP);
+ langArgList.add(IRtcBuilderConstants.LANG_CPP_ARG);
+
+ RtcParam targetRtc = new RtcParam(null, false);
+ targetRtc.setName(stateParam.getName());
+ targetRtc.setSchemaVersion(IRtcBuilderConstants.SCHEMA_VERSION);
+ targetRtc.setDescription(ComponentPreferenceManager.getInstance().getBasic_Description());
+ targetRtc.setCategory(ComponentPreferenceManager.getInstance().getBasic_Category());
+ targetRtc.setVersion(ComponentPreferenceManager.getInstance().getBasic_Version());
+ targetRtc.setVender(ComponentPreferenceManager.getInstance().getBasic_VendorName());
+ targetRtc.setComponentType(ComponentPreferenceManager.getInstance().getBasic_ComponentType());
+ targetRtc.setActivityType(ComponentPreferenceManager.getInstance().getBasic_ActivityType());
+ targetRtc.setComponentKind(ComponentPreferenceManager.getInstance().getBasic_ComponentKind());
+ targetRtc.setMaxInstance(ComponentPreferenceManager.getInstance().getBasic_MaxInstances());
+ targetRtc.setExecutionType(ComponentPreferenceManager.getInstance().getBasic_ExecutionType());
+ targetRtc.setExecutionRate(ComponentPreferenceManager.getInstance().getBasic_ExecutionRate());
+ ArrayList<String> docs = DocumentPreferenceManager.getDocumentValue();
+ for( int intidx=IRtcBuilderConstants.ACTIVITY_INITIALIZE; intidx<IRtcBuilderConstants.ACTIVITY_DUMMY; intidx++) {
+ targetRtc.setActionImplemented(intidx, docs.get(intidx));
+ }
+ targetRtc.setDocLicense(DocumentPreferenceManager.getLicenseValue());
+ targetRtc.setDocCreator(DocumentPreferenceManager.getCreatorValue());
+ //
+ targetRtc.setOutputProject(stateParam.getName());
+ targetRtc.getLangList().addAll(langList);
+ targetRtc.getLangArgList().addAll(langArgList);
+ targetRtc.setRtmVersion(rtmVersion);
+ return targetRtc;
+ }
+
// Profileを保存
private void saveRtcProfile(IProject project) {
ProfileHandler handler = new ProfileHandler();
try {
ExportCreator export = new ExportCreator();
export.preExport(editor);
-
+ //
+ List<PropertyParam> properties = editor.getRtcParam().getProperties();
+ PropertyParam fsmTarget = null;
+ for(PropertyParam param : properties) {
+ if( param.getName().equals("FSMPath")) {
+ fsmTarget = param;
+ break;
+ }
+ }
+ if(fsmTarget!=null) {
+ String orgPath = fsmTarget.getValue();
+ IFile orgFsmFile = project.getFile(orgPath);
+ String contents = "";
+ IFile fsmFile = null;
+ if(orgFsmFile.exists()) {
+ contents = FileUtil.readFile(orgFsmFile.getRawLocation().toOSString());
+ fsmFile = orgFsmFile;
+ } else {
+ contents = FileUtil.readFile(orgPath);
+ String fileName = new File(orgPath).getName();
+ fsmFile = project.getFile(fileName);
+ }
+ if(fsmFile.exists()) {
+ fsmFile.delete(true, null);
+ }
+ fsmFile.create(new ByteArrayInputStream(contents.getBytes("UTF-8")), true, null);
+ fsmTarget.setValue(fsmFile.getName());
+ }
+ //
String strXml = handler.convert2XML(editor.getGeneratorParam());
IFile orgRtcxml = project.getFile(IRtcBuilderConstants.DEFAULT_RTC_XML);
@@ -401,6 +551,7 @@
//バックアップ最大数以上のファイルは削除
FileUtil.removeBackupFiles(project, IRtcBuilderConstants.DEFAULT_RTC_XML);
}
+ //
IFile saveRtcxml = project.getFile(IRtcBuilderConstants.DEFAULT_RTC_XML);
saveRtcxml.create(new ByteArrayInputStream(strXml.getBytes("UTF-8")), true, null);
//
@@ -411,21 +562,23 @@
}
}
- private IProject checkTargetProject() {
- if( editor.getRtcParam().getOutputProject()==null || "".equals(editor.getRtcParam().getOutputProject()) ){
+ private IProject checkTargetProject(String targetProject, boolean isConfirmNew) {
+ if( targetProject==null || "".equals(targetProject) ){
MessageDialog.openError(getSite().getShell(), "Error", IRTCBMessageConstants.VALIDATE_ERROR_OUTPUTPROJECT);
return null;
}
IWorkspaceRoot workspaceHandle = ResourcesPlugin.getWorkspace().getRoot();
- IProject project = workspaceHandle.getProject(editor.getRtcParam().getOutputProject());
+ IProject project = workspaceHandle.getProject(targetProject);
if(!project.exists()) {
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
- Shell shell = window.getShell();
- MessageBox message = new MessageBox(shell, SWT.ICON_QUESTION | SWT.YES | SWT.NO);
- message.setText(IRTCBMessageConstants.CONFIRM_PROJECT_GENERATE_TITLE);
- message.setMessage(IRTCBMessageConstants.CONFIRM_PROJECT_GENERATE);
- if( message.open() != SWT.YES) return null;
+ if(isConfirmNew) {
+ IWorkbench workbench = PlatformUI.getWorkbench();
+ IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
+ Shell shell = window.getShell();
+ MessageBox message = new MessageBox(shell, SWT.ICON_QUESTION | SWT.YES | SWT.NO);
+ message.setText(IRTCBMessageConstants.CONFIRM_PROJECT_GENERATE_TITLE);
+ message.setMessage(IRTCBMessageConstants.CONFIRM_PROJECT_GENERATE);
+ if( message.open() != SWT.YES) return null;
+ }
try {
project.create(null);
project.open(null);
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/FSMEditorFormPage.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/FSMEditorFormPage.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/FSMEditorFormPage.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -0,0 +1,431 @@
+package jp.go.aist.rtm.rtcbuilder.ui.editors;
+
+import java.io.BufferedWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
+import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
+import jp.go.aist.rtm.rtcbuilder.fsm.ScXMLHandler;
+import jp.go.aist.rtm.rtcbuilder.fsm.StateParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.PropertyParam;
+import jp.go.aist.rtm.rtcbuilder.util.FileUtil;
+import jp.go.aist.rtm.toolscommon.fsm.editor.SCXMLGraphEditor;
+import jp.go.aist.rtm.toolscommon.fsm.editor.SCXMLNotifier;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.ui.forms.widgets.Section;
+
+/**
+ * FSMページ
+ */
+public class FSMEditorFormPage extends AbstractEditorFormPage {
+
+ private Button fsmBtn;
+ private Button staticBtn;
+ private Button dynamicBtn;
+ private Button importBtn;
+ private Button newBtn;
+ private Button editBtn;
+
+ private SCXMLReceiver observer;
+ private SCXMLGraphEditor scxmlEditor;
+ //
+
+ /**
+ * コンストラクタ
+ *
+ * @param editor
+ * 親のエディタ
+ */
+ public FSMEditorFormPage(RtcBuilderEditor editor) {
+ super(editor, "id", "FSM");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void createFormContent(IManagedForm managedForm) {
+ ScrolledForm form = super.createBase(managedForm, "Finite State Machine(FSM)");
+ FormToolkit toolkit = managedForm.getToolkit();
+ //
+ createFSMSection(toolkit, form);
+ createHintSection(toolkit, form);
+
+ load();
+ }
+
+ private void createHintSection(FormToolkit toolkit, ScrolledForm form) {
+ Composite composite = createHintSectionBase(toolkit, form, 3);
+ createHintLabel(IMessageConstants.DOCUMENT_HINT_COMPONENT_TITLE, IMessageConstants.DOCUMENT_HINT_COMPONENT_DESC, toolkit, composite);
+ createHintLabel(IMessageConstants.DOCUMENT_HINT_ETC_TITLE, IMessageConstants.DOCUMENT_HINT_ETC_DESC, toolkit, composite);
+ }
+
+ private void createFSMSection(FormToolkit toolkit, ScrolledForm form) {
+ Section sctOverView = toolkit.createSection(form.getBody(),
+ Section.TITLE_BAR | Section.EXPANDED | Section.TWISTIE);
+ sctOverView.setText(IMessageConstants.DOCUMENT_OVERVIEW_TITLE);
+ GridData gridData = new GridData();
+ gridData.horizontalAlignment = GridData.FILL;
+ gridData.verticalAlignment = GridData.BEGINNING;
+ sctOverView.setLayoutData(gridData);
+ //
+ Composite composite = toolkit.createComposite(sctOverView, SWT.NULL);
+ composite.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
+ toolkit.paintBordersFor(composite);
+ GridLayout gl = new GridLayout(4, false);
+ composite.setLayout(gl);
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ composite.setLayoutData(gd);
+ sctOverView.setClient(composite);
+ //
+ fsmBtn = createRadioCheckButton(toolkit, composite, "FSM", SWT.CHECK);
+ gd = new GridData();
+ gd.verticalAlignment = SWT.CENTER;
+ fsmBtn.setLayoutData(gd);
+ fsmBtn.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ staticBtn.setEnabled(fsmBtn.getSelection());
+ dynamicBtn.setEnabled(fsmBtn.getSelection());
+ newBtn.setEnabled(fsmBtn.getSelection());
+ editBtn.setEnabled(fsmBtn.getSelection());
+ importBtn.setEnabled(fsmBtn.getSelection());
+ if(fsmBtn.getSelection()) {
+ editor.getRtcParam().addFSMPort();
+ } else {
+ editor.getRtcParam().deleteFSMPort();
+ }
+ editor.updateEMFDataPorts(
+ editor.getRtcParam().getInports(), editor.getRtcParam().getOutports(),
+ editor.getRtcParam().getServicePorts());
+ update();
+ }
+ });
+
+ Group compGroup = new Group(composite, SWT.NONE);
+ compGroup.setLayout(new GridLayout(3, false));
+ gd = new GridData();
+ gd.horizontalSpan = 3;
+ compGroup.setLayoutData(gd);
+
+ staticBtn = createRadioCheckButton(toolkit, compGroup, IRtcBuilderConstants.FSMTYTPE_STATIC, SWT.RADIO);
+ dynamicBtn = createRadioCheckButton(toolkit, compGroup, IRtcBuilderConstants.FSMTYTPE_DYNAMIC, SWT.RADIO);
+ staticBtn.setSelection(true);
+ dynamicBtn.setSelection(false);
+
+ toolkit.createLabel(composite, "SCXML");
+
+ newBtn = toolkit.createButton(composite, "New", SWT.PUSH);
+ gd = new GridData();
+ gd.widthHint = 100;
+ gd.horizontalAlignment = GridData.BEGINNING;
+ newBtn.setLayoutData(gd);
+ newBtn.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ String cmpName = editor.getRtcParam().getName() + "FSM.scxml";
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceRoot root = workspace.getRoot();
+ IProject project = root.getProject(editor.getRtcParam().getOutputProject());
+ IFile fsmFile = project.getFile(cmpName);
+ if(fsmFile.exists()) {
+ boolean confirm = MessageDialog.openConfirm(getSite().getShell(), "FSM Editor",
+ "FSM定義が存在します．上書きしてもよろしいですか？");
+ if (!confirm) return;
+ }
+ /////
+ try {
+ if(observer==null) {
+ observer = new SCXMLReceiver();
+ }
+ observer.setFsmName(cmpName);
+ scxmlEditor = SCXMLGraphEditor.openEditor(null, observer, false);
+ // String contents = FileUtil.readFile(targetFile);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ });
+
+ editBtn = toolkit.createButton(composite, "Edit", SWT.PUSH);
+ gd = new GridData();
+ gd.widthHint = 100;
+ gd.horizontalAlignment = GridData.END;
+ editBtn.setLayoutData(gd);
+ editBtn.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ String fsmName = editor.getRtcParam().getName() + "FSM.scxml";
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceRoot root = workspace.getRoot();
+ IProject project = root.getProject(editor.getRtcParam().getOutputProject());
+ IFile fsmFile = project.getFile(fsmName);
+ String targetFile = "";
+ if(fsmFile.exists()) {
+ targetFile = fsmFile.getLocation().toOSString();
+ } else {
+ MessageDialog.openWarning(getSite().getShell(), "FSM Editor",
+ "FSMの定義が存在しません");
+ return;
+ }
+
+ try {
+ if(observer==null) {
+ observer = new SCXMLReceiver();
+ }
+ observer.setFsmName(fsmName);
+ scxmlEditor = SCXMLGraphEditor.openEditor(targetFile, observer, false);
+// String contents = FileUtil.readFile(targetFile);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ });
+ /////
+ importBtn = toolkit.createButton(composite, "Import", SWT.PUSH);
+ gd = new GridData();
+ gd.widthHint = 100;
+ gd.horizontalAlignment = GridData.BEGINNING;
+ importBtn.setLayoutData(gd);
+ importBtn.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ String cmpName = editor.getRtcParam().getName() + "FSM.scxml";
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceRoot root = workspace.getRoot();
+ IProject project = root.getProject(editor.getRtcParam().getOutputProject());
+ IFile fsmFile = project.getFile(cmpName);
+ if(fsmFile.exists()) {
+ boolean confirm = MessageDialog.openConfirm(getSite().getShell(), "FSM Editor",
+ "FSM定義が存在します．上書きしてもよろしいですか？");
+ if (!confirm) return;
+ }
+ /////
+ FileDialog dialog = new FileDialog(getEditorSite().getShell(), SWT.OPEN);
+ dialog.setFilterNames(new String[]{"SCXMLファイル", "XMLファイル"});
+ dialog.setFilterExtensions(new String[]{"*.scxml", "*.xml"});
+ String newFile = dialog.open();
+ if (newFile == null) return;
+ /////
+ String strPath = fsmFile.getLocation().toOSString();
+ String contents;
+ try {
+ contents = FileUtil.readFile(newFile);
+ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(strPath), "UTF-8"));
+ writer.write(contents);
+ writer.close();
+ MessageDialog.openInformation(getSite().getShell(), "Save", "対象データをインポートしました");
+ } catch (IOException e1) {
+ MessageDialog.openWarning(getSite().getShell(), "Save", "対象データのインポートに失敗しました");
+ e1.printStackTrace();
+ }
+ }
+ });
+ staticBtn.setEnabled(false);
+ dynamicBtn.setEnabled(false);
+ newBtn.setEnabled(false);
+ editBtn.setEnabled(false);
+ importBtn.setEnabled(false);
+ /////
+// Button updateButton = toolkit.createButton(composite, "Update", SWT.PUSH);
+// updateButton.addSelectionListener(new SelectionAdapter() {
+// public void widgetSelected(SelectionEvent e) {
+// scxmlEditor.updateEditor("Off");
+// scxmlEditor.updateEditor("Idle");
+// scxmlEditor.updateEditor("Configuring");
+// }
+// });
+// Button parseButton = toolkit.createButton(composite, "Parse", SWT.PUSH);
+// parseButton.addSelectionListener(new SelectionAdapter() {
+// public void widgetSelected(SelectionEvent e) {
+// String cmpName = editor.getRtcParam().getName() + "FSM.scxml";
+// IWorkspace workspace = ResourcesPlugin.getWorkspace();
+// IWorkspaceRoot root = workspace.getRoot();
+// IProject project = root.getProject(editor.getRtcParam().getOutputProject());
+// IFile fsmFile = project.getFile(cmpName);
+//
+// ScXMLHandler handler = new ScXMLHandler();
+// handler.parseSCXML(fsmFile.getLocation().toOSString());
+// }
+// });
+ }
+
+ public void update() {
+ RtcParam rtcParam = editor.getRtcParam();
+
+ if( fsmBtn != null ) {
+ String targetFile = editor.getRtcParam().getName() + "FSM.scxml";
+ if(targetFile!=null && targetFile.length()!=0) {
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceRoot root = workspace.getRoot();
+ IProject project = root.getProject(editor.getRtcParam().getOutputProject());
+ IFile fsmFile = project.getFile(targetFile);
+ if(fsmFile.exists()) {
+ targetFile = fsmFile.getLocation().toOSString();
+ }
+
+ ScXMLHandler handler = new ScXMLHandler();
+ StateParam rootState = handler.parseSCXML(targetFile);
+ if(rootState!=null) {
+ rtcParam.setFsmParam(rootState);
+ }
+ }
+
+ rtcParam.setProperty(IRtcBuilderConstants.PROP_TYPE_FSM, Boolean.valueOf(fsmBtn.getSelection()).toString());
+ //
+ String fsmCompType = "";
+ if(dynamicBtn.getSelection()) {
+ fsmCompType = IRtcBuilderConstants.FSMTYTPE_DYNAMIC;
+ } else if(staticBtn.getSelection()) {
+ fsmCompType = IRtcBuilderConstants.FSMTYTPE_STATIC;
+ }
+ rtcParam.setProperty(IRtcBuilderConstants.PROP_TYPE_FSMTYTPE, fsmCompType);
+ }
+
+ editor.updateDirty();
+ }
+
+ /**
+ * データをロードする
+ */
+ public void load() {
+ RtcParam rtcParam = editor.getRtcParam();
+
+ PropertyParam target = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSM);
+ if(target!=null) {
+ fsmBtn.setSelection(Boolean.valueOf(target.getValue()));
+ staticBtn.setEnabled(fsmBtn.getSelection());
+ dynamicBtn.setEnabled(fsmBtn.getSelection());
+ newBtn.setEnabled(fsmBtn.getSelection());
+ editBtn.setEnabled(fsmBtn.getSelection());
+ importBtn.setEnabled(fsmBtn.getSelection());
+ }
+ //
+ PropertyParam fsmType = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSMTYTPE);
+ if(fsmType!=null) {
+ String fsmCompType = fsmType.getValue();
+ if(fsmCompType.equals(IRtcBuilderConstants.FSMTYTPE_DYNAMIC) ) {
+ dynamicBtn.setSelection(true);
+ staticBtn.setSelection(false);
+ } else if(fsmCompType.equals(IRtcBuilderConstants.FSMTYTPE_STATIC)) {
+ dynamicBtn.setSelection(false);
+ staticBtn.setSelection(true);
+ }
+ }
+ //
+ String targetFile = editor.getRtcParam().getName() + "FSM.scxml";
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceRoot root = workspace.getRoot();
+ IProject project = root.getProject(editor.getRtcParam().getOutputProject());
+ IFile fsmFile = project.getFile(targetFile);
+ if(fsmFile.exists()) {
+ targetFile = fsmFile.getLocation().toOSString();
+ ScXMLHandler handler = new ScXMLHandler();
+ StateParam rootState = handler.parseSCXML(targetFile);
+ if(rootState!=null) {
+ rtcParam.setFsmParam(rootState);
+ }
+ }
+ }
+
+ public String validateParam() {
+ String result = null;
+ RtcParam rtcParam = editor.getRtcParam();
+ if(rtcParam==null) return result;
+ PropertyParam fsm = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSM);
+ if(fsm==null) return result;
+
+ if(Boolean.valueOf(fsm.getValue())) {
+ PropertyParam fsmType = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSMTYTPE);
+ if(fsmType==null) {
+ result = "FSM型が指定されていません";
+ } else {
+ String strType = fsmType.getValue();
+ if(!(strType.equals(IRtcBuilderConstants.FSMTYTPE_STATIC) || strType.equals(IRtcBuilderConstants.FSMTYTPE_DYNAMIC))) {
+ result = "FSM型が不正です";
+ }
+ }
+
+ StateParam fsmParam = rtcParam.getFsmParam();
+ if(fsmParam==null) {
+ result = "FSMコンポーネントの状態遷移図が設定されていません";
+ } else {
+ List<String> stateList = new ArrayList<String>();
+ stateList.add(fsmParam.getName());
+ for(StateParam param : fsmParam.getAllStateList() ) {
+ if(stateList.contains(param.getName())) {
+ result = "状態[" + param.getName() + "]が重複しています";
+ break;
+ } else {
+ stateList.add(param.getName());
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+ class SCXMLReceiver implements SCXMLNotifier {
+ private String fsmName;
+ private String scXmlContents;
+
+ public void setFsmName(String fsmName) {
+ this.fsmName = fsmName;
+ }
+
+ @Override
+ public void notifyContents(String contents) {
+ scXmlContents = contents;
+ //
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceRoot root = workspace.getRoot();
+ IProject project = root.getProject(editor.getRtcParam().getOutputProject());
+ IFile fsmFile = project.getFile(fsmName);
+ if(contents.trim().length()==0) {
+ try {
+ fsmFile.delete(true, null);
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ } else {
+ if(fsmFile.exists()==false) {
+ try {
+ fsmFile.create(null, true, null);
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ }
+ String strPath = fsmFile.getLocation().toOSString();
+ String xmlSplit[] = scXmlContents.split("\n");
+ try {
+ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(strPath), "UTF-8"));
+ for (String s : xmlSplit) {
+ writer.write(s);
+ writer.newLine();
+ }
+ writer.close();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+}
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/LanguageEditorFormPage.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/LanguageEditorFormPage.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/LanguageEditorFormPage.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -47,8 +47,6 @@
*/
public class LanguageEditorFormPage extends AbstractEditorFormPage {
- static final String LABEL_USE_OLD_BUILD = IMessageConstants.LANGUAGE_USE_OLD_BUILD;
-
private static final int LANGUAGE_VERSION = 0;
private static final int LANGUAGE_OS = 1;
//
@@ -59,9 +57,7 @@
private List<GenerateManager> managerList = null;
private Group LangGroup;
private Button cppRadio;
- private Button rubyRadio;
private List<Button> buttonList = new ArrayList<Button>();
- Button oldBuildEnvButton;
//
private Composite envSection;
private TableViewer langVersionViewer;
@@ -102,9 +98,6 @@
buttonList.add(extRadio);
}
}
- rubyRadio = createRadioCheckButton(toolkit, LangGroup, "Ruby",
- SWT.RADIO);
- rubyRadio.setEnabled(false);
load();
}
@@ -173,24 +166,6 @@
//
cppRadio = createRadioCheckButton(toolkit, LangGroup, "C++", SWT.RADIO);
cppRadio.addSelectionListener(createLanguageRadioListner());
-
- // 旧バージョンのビルド環境の指定
- Composite c = new Composite(composite, SWT.NONE);
- GridLayout gl = new GridLayout(2, false);
- c.setLayout(gl);
- gd = new GridData();
- gd.horizontalAlignment = GridData.END;
- gd.verticalAlignment = GridData.END;
- c.setLayoutData(gd);
- oldBuildEnvButton = new Button(c, SWT.CHECK);
- Label l = new Label(c, SWT.NONE);
- l.setText(LABEL_USE_OLD_BUILD);
- oldBuildEnvButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- update();
- }
- });
}
private void createHintSection(FormToolkit toolkit, ScrolledForm form) {
@@ -486,7 +461,6 @@
rtcParam.getLangArgList().addAll(langArgList);
rtcParam.setRtmVersion(rtmVersion);
}
- rtcParam.setEnableOldBuildEnv(oldBuildEnvButton.getSelection());
//
StructuredSelection selection = (StructuredSelection) langVersionViewer.getSelection();
TargetEnvParam selectParam = (TargetEnvParam) selection.getFirstElement();
@@ -537,8 +511,6 @@
}
}
}
- oldBuildEnvButton.setSelection(rtcParam.enableOldBuildEnv());
- //
langVersionViewer.setInput(rtcParam.getTargetEnvs());
//
StructuredSelection selection = (StructuredSelection) langVersionViewer
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -15,6 +15,8 @@
import jp.go.aist.rtm.rtcbuilder.RtcBuilderPlugin;
import jp.go.aist.rtm.rtcbuilder.extension.AddFormPageExtension;
import jp.go.aist.rtm.rtcbuilder.extension.EditorExtension;
+import jp.go.aist.rtm.rtcbuilder.fsm.ScXMLHandler;
+import jp.go.aist.rtm.rtcbuilder.fsm.StateParam;
import jp.go.aist.rtm.rtcbuilder.generator.ProfileHandler;
import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
@@ -38,6 +40,9 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -86,6 +91,7 @@
private RtcXmlEditorFormPage rtcXmlFormPage;
private DocumentEditorFormPage documentFormPage;
private ActivityEditorFormPage activityFormPage;
+ private FSMEditorFormPage fsmFormPage;
private Map<Integer, AbstractCustomFormPage> customFormPages;
@@ -114,7 +120,21 @@
try {
ProfileHandler handler = new ProfileHandler();
generatorParam = handler.restorefromXMLFile(fileEditorInput.getPath().toOSString());
-
+ //
+ String targetFile = this.getRtcParam().getName() + "FSM.scxml";
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceRoot root = workspace.getRoot();
+ IProject project = root.getProject(this.getRtcParam().getOutputProject());
+ IFile fsmFile = project.getFile(targetFile);
+ if(fsmFile.exists()) {
+ targetFile = fsmFile.getLocation().toOSString();
+ ScXMLHandler scHandler = new ScXMLHandler();
+ StateParam rootState = scHandler.parseSCXML(targetFile);
+ if(rootState!=null) {
+ this.getRtcParam().setFsmParam(rootState);
+ }
+ }
+ //
if( buildview==null ) buildview = ComponentFactory.eINSTANCE.createBuildView();
updateEMFModuleName(this.getRtcParam().getName());
updateEMFDataPorts(
@@ -222,24 +242,26 @@
@Override
protected void addPages() {
try {
- AbstractEditorFormPage[] defaultPages = new AbstractEditorFormPage[8];
+ AbstractEditorFormPage[] defaultPages = new AbstractEditorFormPage[9];
//
basicFormPage = new BasicEditorFormPage(this);
defaultPages[0] = basicFormPage;
activityFormPage = new ActivityEditorFormPage(this);
defaultPages[1] = activityFormPage;
+ fsmFormPage = new FSMEditorFormPage(this);
+ defaultPages[2] = fsmFormPage;
dataPortFormPage = new DataPortEditorFormPage(this);
- defaultPages[2] = dataPortFormPage;
+ defaultPages[3] = dataPortFormPage;
servicePortFormPage = new ServicePortEditorFormPage(this);
- defaultPages[3] = servicePortFormPage;
+ defaultPages[4] = servicePortFormPage;
configurationFormPage = new ConfigurationEditorFormPage(this);
- defaultPages[4] = configurationFormPage;
+ defaultPages[5] = configurationFormPage;
documentFormPage = new DocumentEditorFormPage(this);
- defaultPages[5] = documentFormPage;
+ defaultPages[6] = documentFormPage;
languageFormPage = new LanguageEditorFormPage(this);
- defaultPages[6] = languageFormPage;
+ defaultPages[7] = languageFormPage;
rtcXmlFormPage = new RtcXmlEditorFormPage(this);
- defaultPages[7] = rtcXmlFormPage;
+ defaultPages[8] = rtcXmlFormPage;
//
List<List<AbstractEditorFormPage>> forms = new ArrayList<List<AbstractEditorFormPage>>();
forms.add(new ArrayList<AbstractEditorFormPage>());
@@ -329,6 +351,7 @@
if( rtcXmlFormPage != null ) rtcXmlFormPage.load();
if( documentFormPage != null ) documentFormPage.load();
if( activityFormPage != null ) activityFormPage.load();
+ if( fsmFormPage != null ) fsmFormPage.load();
//
customPagesOperation("load");
}
@@ -341,6 +364,7 @@
languageFormPage.update();
documentFormPage.update();
activityFormPage.update();
+ fsmFormPage.update();
//
customPagesOperation("update");
}
@@ -519,6 +543,7 @@
if (languageFormPage != null) languageFormPage.load();
if (documentFormPage != null) documentFormPage.load();
if (activityFormPage != null) activityFormPage.load();
+ if (fsmFormPage != null) fsmFormPage.load();
//
customPagesOperation("load");
//
@@ -695,6 +720,8 @@
basicFormPage.setEnabledInfo(widgetInfo, true);
widgetInfo = createWidgetInfo("activity.*.*");
activityFormPage.setEnabledInfo(widgetInfo, true);
+ widgetInfo = createWidgetInfo("fsm.*.*");
+ fsmFormPage.setEnabledInfo(widgetInfo, true);
widgetInfo = createWidgetInfo("dataport.*.*");
dataPortFormPage.setEnabledInfo(widgetInfo, true);
widgetInfo = createWidgetInfo("serviceport.*.*");
@@ -710,6 +737,8 @@
basicFormPage.setEnabledInfo(widgetInfo, false);
} else if (widgetInfo.matchForm("activity")) {
activityFormPage.setEnabledInfo(widgetInfo, false);
+ } else if (widgetInfo.matchForm("fsm")) {
+ fsmFormPage.setEnabledInfo(widgetInfo, false);
} else if (widgetInfo.matchForm("dataport")) {
dataPortFormPage.setEnabledInfo(widgetInfo, false);
} else if (widgetInfo.matchForm("serviceport")) {
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -42,7 +42,7 @@
int resultindex = -1;
for( int intIdx=0; intIdx<targetList.size(); intIdx++ ) {
- if( targetList.get(intIdx).getName().equals(targetName) ) {
+ if( targetList.get(intIdx).getName().contains(targetName) ) {
return intIdx;
}
}
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -29,7 +29,6 @@
rtcParam.setMaxInstance(5);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -65,7 +64,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -39,7 +39,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
rtcParam.getPrivateAttributes().clear();
rtcParam.getPrivateAttributes().add("int private1");
@@ -63,7 +62,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/operation/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -79,7 +78,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
rtcParam.getPrivateAttributes().clear();
rtcParam.getPrivateAttributes().add("int private1");
@@ -98,7 +96,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/attribute/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -114,7 +112,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -152,7 +149,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/service2/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -170,7 +167,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -197,7 +193,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/service1/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -215,7 +211,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -231,7 +226,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/outport2/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -247,7 +242,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -262,7 +256,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/outport1/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -278,7 +272,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setMaxInstance(5);
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -290,7 +283,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/inport2/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -306,7 +299,6 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -317,7 +309,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/inport1/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "testComp.cpp");
checkCode(result, resourceDir, "test.h");
checkCode(result, resourceDir, "test.cpp");
@@ -333,14 +325,13 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
- rtcParam.setEnableOldBuildEnv(true);
Generator generator = new Generator();
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
String resourceDir = rootPath + "/resource/100/CXX/basic/name/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -40,171 +40,6 @@
return rootPath + "resource/100/CXX/" + name;
}
- public void testVc1() throws Exception {
- String name = "build/vc1";
-
- rtcParam.setName("foo");
- rtcParam.setDescription("test module");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("sample");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setMaxInstance(2);
-
- // 旧ビルド環境
- rtcParam.setEnableOldBuildEnv(true);
-
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
-
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedInt", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "acc", "", "", rootPath + "resource/MyService.idl",
- "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort", 0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(
- service2, "rate", "", "",
- rootPath + "resource/DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = fixturePath(name) + "/";
-
- assertEquals(17, result.size());
- checkCode(result, resourceDir, "fooComp.cpp");
- checkCode(result, resourceDir, "foo.h");
- checkCode(result, resourceDir, "foo.cpp");
- checkCode(result, resourceDir, "MyServiceSVC_impl.h");
- checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
- //
- // checkCode(result, resourceDir, "CMakeLists.txt");
- // checkCode(result, resourceDir, "Doxyfile.in");
- // checkCode(result, resourceDir,
- // "cmake_modules/cmake_uninstall.cmake.in");
- // checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
- // checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
- // checkCode(result, resourceDir, "cpack_resources/Description.txt");
- // checkCode(result, resourceDir, "cpack_resources/License.txt");
- // checkCode(result, resourceDir, "cpack_resources/License.rtf");
- // checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
- //
- checkCode(result, resourceDir, "Makefile.foo");
- checkCode(result, resourceDir, "foo_vc8.sln");
- checkCode(result, resourceDir, "foo_vc8.vcproj");
- checkCode(result, resourceDir, "fooComp_vc8.vcproj");
- checkCode(result, resourceDir, "foo_vc9.sln");
- checkCode(result, resourceDir, "foo_vc9.vcproj");
- checkCode(result, resourceDir, "fooComp_vc9.vcproj");
- checkCode(result, resourceDir, "copyprops.bat");
- checkCode(result, resourceDir, "user_config.vsprops");
- }
-
- public void testVc2() throws Exception {
- String name = "build/vc2";
-
- rtcParam.setName("foo");
- rtcParam.setDescription("test module");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("sample");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setMaxInstance(2);
-
- // 旧ビルド環境
- rtcParam.setEnableOldBuildEnv(true);
-
- List<ServicePortParam> svports = new ArrayList<ServicePortParam>();
-
- ServicePortParam sv1 = new ServicePortParam("MyServiceProvider", 0);
- List<ServicePortInterfaceParam> iflist = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam sif1 = new ServicePortInterfaceParam(sv1,
- "MyServiceProvider", "", "", fixturePath(name)
- + "/MyServiceChildMulti.idl", "MyServiceChild",
- fixturePath(name), 0);
- iflist.add(sif1);
- ServicePortInterfaceParam sif2 = new ServicePortInterfaceParam(sv1,
- "MyServiceProvider2", "", "", fixturePath(name)
- + "/MyServiceChildWithType.idl",
- "MyServiceWithTypeChild", fixturePath(name), 0);
- iflist.add(sif2);
- sv1.getServicePortInterfaces().addAll(iflist);
- svports.add(sv1);
-
- ServicePortParam sv2 = new ServicePortParam("MyServiceRequire", 0);
- iflist = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam sif3 = new ServicePortInterfaceParam(sv2,
- "MyServiceRequire", "", "", fixturePath(name)
- + "/MyServiceChildMulti.idl", "MyServiceChild",
- fixturePath(name), 1);
- iflist.add(sif3);
- ServicePortInterfaceParam sif4 = new ServicePortInterfaceParam(sv2,
- "MyServiceRequire2", "", "", fixturePath(name)
- + "/MyServiceChildWithType.idl",
- "MyServiceWithTypeChild", fixturePath(name), 1);
- iflist.add(sif4);
- sv2.getServicePortInterfaces().addAll(iflist);
- svports.add(sv2);
-
- rtcParam.getServicePorts().addAll(svports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = fixturePath(name) + "/";
-
- assertEquals(19, result.size());
- checkCode(result, resourceDir, "fooComp.cpp");
- checkCode(result, resourceDir, "foo.h");
- checkCode(result, resourceDir, "foo.cpp");
- checkCode(result, resourceDir, "MyServiceChildMultiSVC_impl.h");
- checkCode(result, resourceDir, "MyServiceChildMultiSVC_impl.cpp");
- checkCode(result, resourceDir, "MyServiceChildWithTypeSVC_impl.h");
- checkCode(result, resourceDir, "MyServiceChildWithTypeSVC_impl.cpp");
- //
- // checkCode(result, resourceDir, "CMakeLists.txt");
- // checkCode(result, resourceDir, "Doxyfile.in");
- // checkCode(result, resourceDir,
- // "cmake_modules/cmake_uninstall.cmake.in");
- // checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
- // checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
- // checkCode(result, resourceDir, "cpack_resources/Description.txt");
- // checkCode(result, resourceDir, "cpack_resources/License.txt");
- // checkCode(result, resourceDir, "cpack_resources/License.rtf");
- // checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
- //
- checkCode(result, resourceDir, "Makefile.foo");
- checkCode(result, resourceDir, "foo_vc8.sln");
- checkCode(result, resourceDir, "foo_vc8.vcproj");
- checkCode(result, resourceDir, "fooComp_vc8.vcproj");
- checkCode(result, resourceDir, "foo_vc9.sln");
- checkCode(result, resourceDir, "foo_vc9.vcproj");
- checkCode(result, resourceDir, "fooComp_vc9.vcproj");
- checkCode(result, resourceDir, "copyprops.bat");
- checkCode(result, resourceDir, "user_config.vsprops");
- }
-
public void testCMake1() throws Exception {
String name = "build/cmake1";
@@ -253,7 +88,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(30, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "src/fooComp.cpp");
checkCode(result, resourceDir, "include/foo/foo.h");
checkCode(result, resourceDir, "src/foo.cpp");
@@ -332,7 +167,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.cpp");
checkCode(result, resourceDir, "include/foo/foo.h");
checkCode(result, resourceDir, "src/foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -32,7 +32,6 @@
rtcParam.setMaxInstance(3);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -112,7 +111,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -32,7 +32,6 @@
rtcParam.setMaxInstance(3);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -77,7 +76,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -39,7 +39,6 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
- rtcParam.setEnableOldBuildEnv(true);
//
rtcParam.setDetailContent(IRtcBuilderConstants.ACTIVITY_INITIALIZE, " init();");
rtcParam.setDetailContent(IRtcBuilderConstants.ACTIVITY_FINALIZE, " fin();");
@@ -59,7 +58,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Content/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -24,7 +24,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -61,7 +60,7 @@
String resourceDir = rootPath + "/resource/100/CXX/DataPortIDL/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -28,7 +28,6 @@
rtcParam.setLanguageArg(LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -229,7 +228,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Doc/fullLong/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -24,7 +24,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -53,7 +52,7 @@
String resourceDir = rootPath + "/resource/100/CXX/ExecutionCxt/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -38,7 +38,6 @@
rtcParam.setMaxInstance(2);
rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
generator = new Generator();
@@ -79,7 +78,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -128,7 +127,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(19, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -25,7 +25,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -55,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceM/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -90,7 +89,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/idlmodule/serviceCon/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -125,7 +124,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArg/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -159,7 +158,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -26,7 +26,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -77,7 +76,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath3/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -132,7 +131,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath2/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -186,7 +185,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath1/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -26,7 +26,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -58,7 +57,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlstruct/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "TestModuleComp.cpp");
checkCode(result, resourceDir, "TestModule.h");
checkCode(result, resourceDir, "TestModule.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -25,7 +25,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
}
public void testIDLStruct() throws Exception {
@@ -57,7 +56,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -93,7 +92,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/SeqString/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -164,7 +163,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct2/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -201,7 +200,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -22,7 +22,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -54,7 +53,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/all/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -81,7 +80,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/execute/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -107,7 +106,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/finalize/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -130,7 +129,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/initialize/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -23,7 +23,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -48,7 +47,7 @@
String resourceDir = rootPath + "/resource/100/CXX/library/library2/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -74,7 +73,7 @@
String resourceDir = rootPath + "/resource/100/CXX/library/library1/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -25,7 +25,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -55,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -92,7 +91,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
- assertEquals(34, result.size());
+ assertEquals(58, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -128,7 +127,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Manip/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -35,7 +35,6 @@
rtcParam.setMaxInstance(2);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
@@ -88,7 +87,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProConMulti/";
- assertEquals(19, result.size());
+ assertEquals(31, result.size());
checkResults(result, resourceDir);
checkCode(result, resourceDir, "MyServiceSVC_impl.h");
checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -120,7 +119,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ConMulti/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkResults(result, resourceDir);
nonexist(result, resourceDir, "MyServiceSVC_impl.h");
nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -152,7 +151,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProMulti/";
- assertEquals(19, result.size());
+ assertEquals(31, result.size());
checkResults(result, resourceDir);
checkCode(result, resourceDir, "MyServiceSVC_impl.h");
checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -36,7 +36,6 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
//
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
@@ -220,7 +219,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -25,7 +25,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -59,7 +58,7 @@
String resourceDir = rootPath + "/resource/100/CXX/SystemConfig/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -25,7 +25,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -54,7 +53,7 @@
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
String targetDir = rootPath + "/resource/100/CXX/AIST2/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, targetDir, "ModuleNameComp.cpp");
checkCode(result, targetDir, "ModuleName.h");
checkCode(result, targetDir, "ModuleName.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2017-01-22 06:07:20 UTC (rev 648)
@@ -26,7 +26,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -77,7 +76,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort2/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -132,7 +131,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort1/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -168,7 +167,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Variable/DataPort/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
More information about the openrtm-commit
mailing list