[openrtm-commit:01143] r453 - in branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety: manager template/safety

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-01-05 14:52:35 +0900 (Sun, 05 Jan 2014)
New Revision: 453

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/template/safety/Safety_RTC.h.vsl
Log:
'Daily

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-04 18:20:58 UTC (rev 452)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyGenerateManager.java	2014-01-05 05:52:35 UTC (rev 453)
@@ -174,12 +174,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";
-		//}
+		String outfile = "include/" + rtcParam.getName() + "/" + rtcParam.getName() + ".h";
 		String infile = "safety/Safety_RTC.h.vsl";
 		return generate(infile, outfile, contextMap);
 	}

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.h.vsl
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.h.vsl	2014-01-04 18:20:58 UTC (rev 452)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.h.vsl	2014-01-05 05:52:35 UTC (rev 453)
@@ -3,7 +3,7 @@
  * @file  ${rtcParam.name}.h
  * @brief ${rtcParam.description}
  * @date  ${dol}Date${dol}
-#parse("${template}/cpp/_doc.vsl")
+#parse("${template}/safety/_doc.vsl")
  * ${dol}Id${dol}
  */