[openrtm-commit:02946] r781 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java: src/jp/go/aist/rtm/rtcbuilder/java/manager src/jp/go/aist/rtm/rtcbuilder/java/template/java test/jp/go/aist/rtm/rtcbuilder/java/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 12月 2日 (土) 20:18:36 JST
Author: ga
Date: 2017-12-02 20:18:35 +0900 (Sat, 02 Dec 2017)
New Revision: 781
Added:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/runRTC.xml.vsl
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java
Log:
Added ANT script for Eclipse execution.#4380
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java 2017-12-02 11:04:22 UTC (rev 780)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java 2017-12-02 11:18:35 UTC (rev 781)
@@ -138,6 +138,8 @@
result.add(gr);
gr = generateRunSh(contextMap);
result.add(gr);
+ gr = generateRunXML(contextMap);
+ result.add(gr);
gr = generateBuildXML(contextMap);
result.add(gr);
@@ -218,6 +220,15 @@
return result;
}
+ public GeneratedResult generateRunXML(Map<String, Object> contextMap) {
+ RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+ String outfile = "run_" + rtcParam.getName() + ".xml";
+ String infile = "java/runRTC.xml.vsl";
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
+ }
+
// 1.0系 (ビルド環境)
public GeneratedResult generateBuildXML(Map<String, Object> contextMap) {
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/runRTC.xml.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/runRTC.xml.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/runRTC.xml.vsl 2017-12-02 11:18:35 UTC (rev 781)
@@ -0,0 +1,25 @@
+<!--
+# -*- Buildfile -*-
+# @file run_${rtcParam.name}.xml
+# @brief Execute RTComponent for "${rtcParam.name} component"
+# @date ${dol}Date${dol}
+#
+# ${dol}Id${dol}
+ -->
+<project name="${rtcParam.name}" default="exec">
+ <property environment="env" />
+ <property name="option" value="" />
+
+ <target name="exec" >
+ <java classname="${rtcParam.name}Comp">
+ <classpath>
+ <pathelement location="bin"/>
+ <pathelement location="."/>
+ <fileset dir="${dol}{env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <arg line="${dol}{option}" />
+ </java>
+ </target>
+</project>
\ No newline at end of file
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java 2017-12-02 11:04:22 UTC (rev 780)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java 2017-12-02 11:18:35 UTC (rev 781)
@@ -83,7 +83,7 @@
String resourceDir = rootPath + "/resource/100/base/service2/";
- assertEquals(32, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -127,7 +127,7 @@
String resourceDir = rootPath + "/resource/100/base/service1/";
- assertEquals(32, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -160,12 +160,11 @@
String resourceDir = rootPath + "/resource/100/base/outport2/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
//
-// checkCode(result, resourceDir, ".classpath");
checkCode(result, resourceDir, "build_foo.xml");
}
@@ -192,12 +191,11 @@
String resourceDir = rootPath + "/resource/100/base/outport1/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
//
-// checkCode(result, resourceDir, ".classpath");
checkCode(result, resourceDir, "build_foo.xml");
}
@@ -221,12 +219,11 @@
String resourceDir = rootPath + "/resource/100/base/inport2/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
//
-// checkCode(result, resourceDir, ".classpath");
checkCode(result, resourceDir, "build_foo.xml");
}
@@ -249,12 +246,11 @@
String resourceDir = rootPath + "/resource/100/base/inport1/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
//
-// checkCode(result, resourceDir, ".classpath");
checkCode(result, resourceDir, "build_foo.xml");
}
@@ -273,12 +269,11 @@
String resourceDir = rootPath + "/resource/100/base/name/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
//
- //checkCode(result, resourceDir, ".classpath");
checkCode(result, resourceDir, "build_foo.xml");
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java 2017-12-02 11:04:22 UTC (rev 780)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java 2017-12-02 11:18:35 UTC (rev 781)
@@ -89,7 +89,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(32, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -151,7 +151,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(36, result.size());
+ assertEquals(37, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java 2017-12-02 11:04:22 UTC (rev 780)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java 2017-12-02 11:18:35 UTC (rev 781)
@@ -58,7 +58,7 @@
String targetDir = rootPath + "/resource/100/ConfigSet/AIST7/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, targetDir, "src/ModuleNameComp.java");
checkCode(result, targetDir, "src/ModuleName.java");
checkCode(result, targetDir, "src/ModuleNameImpl.java");
@@ -87,7 +87,7 @@
String targetDir = rootPath + "/resource/100/ConfigSet/AIST6/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, targetDir, "src/ModuleNameComp.java");
checkCode(result, targetDir, "src/ModuleName.java");
checkCode(result, targetDir, "src/ModuleNameImpl.java");
@@ -114,7 +114,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset1/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -143,7 +143,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset2/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -175,7 +175,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset3/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -209,7 +209,7 @@
String resourceDir = rootPath
+ "/resource/100/ConfigSet/ConfigSetType/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java 2017-12-02 11:04:22 UTC (rev 780)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java 2017-12-02 11:18:35 UTC (rev 781)
@@ -81,7 +81,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(34, result.size());
+ assertEquals(35, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -133,7 +133,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(36, result.size());
+ assertEquals(37, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java 2017-12-02 11:04:22 UTC (rev 780)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java 2017-12-02 11:18:35 UTC (rev 781)
@@ -63,7 +63,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceM/";
- assertEquals(32, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -99,7 +99,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceCon/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -146,7 +146,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceMC/";
- assertEquals(32, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java 2017-12-02 11:04:22 UTC (rev 780)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java 2017-12-02 11:18:35 UTC (rev 781)
@@ -102,7 +102,7 @@
String resourceDir = rootPath + "/resource/100/Multi/ProConMulti/";
- assertEquals(33, result.size());
+ assertEquals(34, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -157,7 +157,7 @@
String resourceDir = rootPath + "/resource/100/Multi/ConMulti/";
- assertEquals(31, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -210,7 +210,7 @@
String resourceDir = rootPath + "/resource/100/Multi/ProMulti/";
- assertEquals(33, result.size());
+ assertEquals(34, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
More information about the openrtm-commit
mailing list