[openrtm-commit:02461] r683 - in branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python: manager template/python

[openrtm ＠ openrtm.org]

Author: ga
Date: 2017-02-19 15:12:33 +0900 (Sun, 19 Feb 2017)
New Revision: 683

Modified:
   branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java
   branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl
   branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.sh.vsl
Log:


Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java	2017-02-19 06:12:22 UTC (rev 682)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java	2017-02-19 06:12:33 UTC (rev 683)
@@ -69,9 +69,11 @@
 		}
 
 		List<IdlFileParam> allIdlFileParams = new ArrayList<IdlFileParam>();
-		allIdlFileParams = new ArrayList<IdlFileParam>();
 		allIdlFileParams.addAll(rtcParam.getProviderIdlPathes());
 		allIdlFileParams.addAll(rtcParam.getConsumerIdlPathes());
+		List<IdlFileParam> allIdlFileParamsForBuild = new ArrayList<IdlFileParam>();
+		allIdlFileParamsForBuild.addAll(allIdlFileParams);
+		allIdlFileParamsForBuild.addAll(rtcParam.getIncludedIdlPathes());
 
 		// IDLファイル内に記述されているServiceClassParamを設定する
 		for (IdlFileParam idlFileParam : allIdlFileParams) {
@@ -92,6 +94,7 @@
 		contextMap.put("pyConv", new PythonConverter());
 		contextMap.put("allIdlFileParam", allIdlFileParams);
 		contextMap.put("idlPathes", rtcParam.getIdlPathes());
+		contextMap.put("allIdlFileParamBuild", allIdlFileParamsForBuild);
 
 		return generateTemplateCode10(contextMap);
 	}

Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl	2017-02-19 06:12:22 UTC (rev 682)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl	2017-02-19 06:12:33 UTC (rev 683)
@@ -2,7 +2,7 @@
 setlocal
 for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
 if exist %f% do (
-  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" #foreach($IdlPath in ${idlPathes})-I"${IdlPath}" #end#foreach($IdlFile in ${allIdlFileParam})idl/${IdlFile.IdlFile} #end
+  %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" #foreach($IdlPath in ${idlPathes})-I"${IdlPath}" #end#foreach($IdlFile in ${allIdlFileParamBuild})idl/${IdlFile.IdlFile} #end
 
 ) else (
   echo "python.exe" can not be found.

Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.sh.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.sh.vsl	2017-02-19 06:12:22 UTC (rev 682)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.sh.vsl	2017-02-19 06:12:33 UTC (rev 683)
@@ -1,3 +1,3 @@
 #!/bin/sh
-omniidl -bpython -I"%RTM_ROOT%rtm\idl" #foreach($IdlPath in ${idlPathes})-I"${IdlPath}" #end#foreach($IdlFile in ${allIdlFileParam})idl/${IdlFile.IdlFile} #end
+omniidl -bpython -I"%RTM_ROOT%rtm\idl" #foreach($IdlPath in ${idlPathes})-I"${IdlPath}" #end#foreach($IdlFile in ${allIdlFileParamBuild})idl/${IdlFile.IdlFile} #end