[openrtm-commit:01488] r521 - in branches/work_kawauchi/rtmtools: . jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-10-24 16:26:40 +0900 (Fri, 24 Oct 2014)
New Revision: 521

Modified:
   branches/work_kawauchi/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
   branches/work_kawauchi/rtmtools/version
Log:
Added fixes for r520.

Modified: branches/work_kawauchi/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
===================================================================
--- branches/work_kawauchi/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java	2014-10-24 07:05:11 UTC (rev 520)
+++ branches/work_kawauchi/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java	2014-10-24 07:26:40 UTC (rev 521)
@@ -81,6 +81,20 @@
 		return generatePython(infile, outfile, contextMap);
 	}
 
+	@Override
+	public GeneratedResult generateResourceDescriptionTXT(Map<String, Object> contextMap) {
+		String outfile = "cpack_resources/Description.txt";
+		String infile = "cmake/Description.txt.vsl";
+		return generatePython(infile, outfile, contextMap);
+	}
+
+	@Override
+	public GeneratedResult generateResourceDescriptionTXT(Map<String, Object> contextMap) {
+		String outfile = "cpack_resources/License.txt";
+		String infile = "cmake/License.txt.vsl";
+		return generatePython(infile, outfile, contextMap);
+	}
+
 	public GeneratedResult generatePython(String infile, String outfile,
 			Map<String, Object> contextMap) {
 		try {

Modified: branches/work_kawauchi/rtmtools/version
===================================================================
--- branches/work_kawauchi/rtmtools/version	2014-10-24 07:05:11 UTC (rev 520)
+++ branches/work_kawauchi/rtmtools/version	2014-10-24 07:26:40 UTC (rev 521)
@@ -1,2 +1,2 @@
 VERSION=1.1.0
-PROJECT_VERSION=${VERSION}.rc4v$(date +%Y%m%d)
+PROJECT_VERSION=${VERSION}.rc5v$(date +%Y%m%d)