[openrtm-commit:02324] r661 - trunk/rtmtools/jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder

[openrtm ＠ openrtm.org]

Author: ga
Date: 2017-01-24 23:16:57 +0900 (Tue, 24 Jan 2017)
New Revision: 661

Modified:
   trunk/rtmtools/jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder/CuiRtcBuilder.java
Log:
Modified generated CMakeFile #3874, #3602

Modified: trunk/rtmtools/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	2017-01-23 16:38:19 UTC (rev 660)
+++ trunk/rtmtools/jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder/CuiRtcBuilder.java	2017-01-24 14:16:57 UTC (rev 661)
@@ -14,7 +14,6 @@
 import java.util.List;
 
 import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
 import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
 import jp.go.aist.rtm.rtcbuilder.generator.IDLParamConverter;
 import jp.go.aist.rtm.rtcbuilder.generator.ProfileHandler;
@@ -112,12 +111,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) {
-					idlTarget = targetDir + File.separator + "idl" + File.separator + idlFile.getIdlFile();
-				} else {
-					idlTarget = targetDir + File.separator + idlFile.getIdlFile();
-				}
+				String idlTarget = targetDir + File.separator + "idl" + File.separator + idlFile.getIdlFile();
 				FileChannel src = new FileInputStream(idlFile.getIdlPath()).getChannel();
 				FileChannel trg = new FileOutputStream(idlTarget).getChannel();
 				try {
@@ -130,12 +124,7 @@
 				}
 			}
 			for( IdlFileParam idlFile : rtcParam.getConsumerIdlPathes() ) {
-				String idlTarget;
-				if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
-					idlTarget = targetDir + File.separator + "idl" + File.separator + idlFile.getIdlFile();
-				} else {
-					idlTarget = targetDir + File.separator + idlFile.getIdlFile();
-				}
+				String idlTarget = targetDir + File.separator + "idl" + File.separator + idlFile.getIdlFile();
 				FileChannel src = new FileInputStream(idlFile.getIdlPath()).getChannel();
 				FileChannel trg = new FileOutputStream(idlTarget).getChannel();
 				try {
@@ -150,12 +139,7 @@
 			//
 			for( String includedIdlFile : rtcParam.getIncludedIdls() ) {
 				File target = new File(includedIdlFile);
-				String idlTarget;
-				if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
-					idlTarget = targetDir + File.separator + "idl" + File.separator + target.getName();
-				} else {
-					idlTarget = targetDir + File.separator + target.getName();
-				}
+				String idlTarget = targetDir + File.separator + "idl" + File.separator + target.getName();
 				FileChannel src = new FileInputStream(includedIdlFile).getChannel();
 				FileChannel trg = new FileOutputStream(idlTarget).getChannel();
 				try {