[openrtm-commit:01146] r456 - branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-01-07 16:42:29 +0900 (Tue, 07 Jan 2014)
New Revision: 456

Modified:
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyCMakeGenerateManager.java
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyGenerateManager.java
Log:
Daily work.

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyCMakeGenerateManager.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyCMakeGenerateManager.java	2014-01-07 05:06:37 UTC (rev 455)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyCMakeGenerateManager.java	2014-01-07 07:42:29 UTC (rev 456)
@@ -1,6 +1,7 @@
 package jp.go.aist.rtm.rtcbuilder.safety.manager;
 
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -49,12 +50,12 @@
 	@Override
 	public List<GeneratedResult> generateTemplateCode10(
 			Map<String, Object> contextMap) {
-		List<GeneratedResult> result = super.generateTemplateCode10(contextMap);
+		//List<GeneratedResult> result = super.generateTemplateCode10(contextMap);
+		List<GeneratedResult> result = new ArrayList<GeneratedResult>();
+		//GeneratedResult gr;
+		//gr = generateModulesSafetyCompile(contextMap);
+		//result.add(gr);
 
-		GeneratedResult gr;
-		gr = generateModulesSafetyCompile(contextMap);
-		result.add(gr);
-
 		return result;
 	}
 

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyGenerateManager.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyGenerateManager.java	2014-01-07 05:06:37 UTC (rev 455)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyGenerateManager.java	2014-01-07 07:42:29 UTC (rev 456)
@@ -125,34 +125,37 @@
 		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
 
 		GeneratedResult gr;
-		gr = generateCompSource(contextMap);
-		result.add(gr);
+		//gr = generateCompSource(contextMap);
+		//result.add(gr);
 		gr = generateRTCHeader(contextMap);
 		result.add(gr);
 		gr = generateRTCSource(contextMap);
 		result.add(gr);
-		gr = generateRTCImplSource(contextMap);
-		result.add(gr);
+		//gr = generateRTCImplSource(contextMap);
+		//result.add(gr);
 
-		gr = generateClassPath(contextMap);
-		result.add(gr);
-		gr = generateRunBat(contextMap);
-		result.add(gr);
-		gr = generateRunSh(contextMap);
-		result.add(gr);
+		//gr = generateClassPath(contextMap);
+		//result.add(gr);
+		//gr = generateRunBat(contextMap);
+		//result.add(gr);
+		//gr = generateRunSh(contextMap);
+		//result.add(gr);
 
-		gr = generateBuildXML(contextMap);
+		//gr = generateBuildXML(contextMap);
+		//result.add(gr);
+
+		//for (IdlFileParam idl : rtcParam.getProviderIdlPathes()) {
+		//	contextMap.put("idlFileParam", idl);
+		//	for (ServiceClassParam svc : idl.getServiceClassParams()) {
+		//		contextMap.put("serviceClassParam", svc);
+		//		gr = generateSVCSource(contextMap);
+		//		result.add(gr);
+		//	}
+		//}
+
+		gr = generateDoxygen(contextMap);
 		result.add(gr);
 
-		for (IdlFileParam idl : rtcParam.getProviderIdlPathes()) {
-			contextMap.put("idlFileParam", idl);
-			for (ServiceClassParam svc : idl.getServiceClassParams()) {
-				contextMap.put("serviceClassParam", svc);
-				gr = generateSVCSource(contextMap);
-				result.add(gr);
-			}
-		}
-
 		return result;
 	}
 
@@ -167,14 +170,16 @@
 
 	public GeneratedResult generateRTCSource(Map<String, Object> contextMap) {
 		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = "src/" + rtcParam.getName() + ".c";
+		//String outfile = "src/" + rtcParam.getName() + ".c";
+		String outfile = rtcParam.getName() + ".c";
 		String infile = "safety/Safety_RTC.c.vsl";
 		return generate(infile, outfile, contextMap);
 	}
 
 	public GeneratedResult generateRTCHeader(Map<String, Object> contextMap) {
 		RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-		String outfile = "include/" + rtcParam.getName() + "/" + rtcParam.getName() + ".h";
+		//String outfile = "include/" + rtcParam.getName() + "/" + rtcParam.getName() + ".h";
+		String outfile = rtcParam.getName() + ".h";
 		String infile = "safety/Safety_RTC.h.vsl";
 		return generate(infile, outfile, contextMap);
 	}
@@ -243,5 +248,11 @@
 					new String[] { "RTMSafety", outfile }), e);
 		}
 	}
+	public GeneratedResult generateDoxygen(Map<String, Object> contextMap) {
+		String outfile = "Doxygen.conf";
+		String infile = "safety/Doxygen.conf.vsl";
+		return generate(infile, outfile, contextMap);
+	}
 
+
 }