[openrtm-commit:02294] r643 - in branches/FSM4RTC: . jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder

[openrtm ＠ openrtm.org]

Author: ga
Date: 2017-01-22 15:01:33 +0900 (Sun, 22 Jan 2017)
New Revision: 643

Added:
   branches/FSM4RTC/jp.go.aist.rtm.cuirtcbuilder/
Modified:
   branches/FSM4RTC/jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder/CuiRtcBuilder.java
Log:


Modified: branches/FSM4RTC/jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder/CuiRtcBuilder.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder/CuiRtcBuilder.java	2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder/CuiRtcBuilder.java	2017-01-22 06:01:33 UTC (rev 643)
@@ -113,7 +113,7 @@
 			RtcParam rtcParam = generatorParam.getRtcParams().get(0);
 			for( IdlFileParam idlFile : rtcParam.getProviderIdlPathes() ) {
 				String idlTarget;
-				if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
+				if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
 					idlTarget = targetDir + File.separator + "idl" + File.separator + idlFile.getIdlFile();
 				} else {
 					idlTarget = targetDir + File.separator + idlFile.getIdlFile();
@@ -131,7 +131,7 @@
 			}
 			for( IdlFileParam idlFile : rtcParam.getConsumerIdlPathes() ) {
 				String idlTarget;
-				if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
+				if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
 					idlTarget = targetDir + File.separator + "idl" + File.separator + idlFile.getIdlFile();
 				} else {
 					idlTarget = targetDir + File.separator + idlFile.getIdlFile();
@@ -151,7 +151,7 @@
 			for( String includedIdlFile : rtcParam.getIncludedIdls() ) {
 				File target = new File(includedIdlFile);
 				String idlTarget;
-				if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
+				if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
 					idlTarget = targetDir + File.separator + "idl" + File.separator + target.getName();
 				} else {
 					idlTarget = targetDir + File.separator + target.getName();