[openrtm-commit:02374] r671 - in branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java: src/jp/go/aist/rtm/rtcbuilder/java/manager test/jp/go/aist/rtm/rtcbuilder/java/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 2月 2日 (木) 19:28:12 JST
Author: ga
Date: 2017-02-02 19:28:11 +0900 (Thu, 02 Feb 2017)
New Revision: 671
Modified:
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java
Log:
Modified generated CMakeFile #3874, #3602
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java 2017-02-02 10:27:49 UTC (rev 670)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java 2017-02-02 10:28:11 UTC (rev 671)
@@ -67,16 +67,6 @@
return generateJava(infile, outfile, contextMap);
}
- // 1.0系 (CMake/cmake_modules)
-
- @Override
- public GeneratedResult generateModulesFindOpenRTM(
- Map<String, Object> contextMap) {
- String outfile = "cmake_modules/FindOpenRTMJava.cmake";
- String infile = "cmake/FindOpenRTMJava.cmake.vsl";
- return generateJava(infile, outfile, contextMap);
- }
-
public GeneratedResult generateModulesJavaCompile(
Map<String, Object> contextMap) {
String outfile = "cmake_modules/cmake_javacompile.cmake.in";
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java 2017-02-02 10:27:49 UTC (rev 670)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java 2017-02-02 10:28:11 UTC (rev 671)
@@ -83,7 +83,7 @@
String resourceDir = rootPath + "/resource/100/base/service2/";
- assertEquals(34, 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(34, 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,7 +160,7 @@
String resourceDir = rootPath + "/resource/100/base/outport2/";
- assertEquals(33, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -192,7 +192,7 @@
String resourceDir = rootPath + "/resource/100/base/outport1/";
- assertEquals(33, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -221,7 +221,7 @@
String resourceDir = rootPath + "/resource/100/base/inport2/";
- assertEquals(33, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -249,7 +249,7 @@
String resourceDir = rootPath + "/resource/100/base/inport1/";
- assertEquals(33, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -273,7 +273,7 @@
String resourceDir = rootPath + "/resource/100/base/name/";
- assertEquals(33, 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: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java 2017-02-02 10:27:49 UTC (rev 670)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java 2017-02-02 10:28:11 UTC (rev 671)
@@ -89,7 +89,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(34, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -163,7 +163,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(38, 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: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java 2017-02-02 10:27:49 UTC (rev 670)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java 2017-02-02 10:28:11 UTC (rev 671)
@@ -58,7 +58,7 @@
String targetDir = rootPath + "/resource/100/ConfigSet/AIST7/";
- assertEquals(33, 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(33, 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(33, 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(33, 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(33, 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(33, 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: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java 2017-02-02 10:27:49 UTC (rev 670)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java 2017-02-02 10:28:11 UTC (rev 671)
@@ -81,7 +81,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(36, 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(38, 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: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java 2017-02-02 10:27:49 UTC (rev 670)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java 2017-02-02 10:28:11 UTC (rev 671)
@@ -63,7 +63,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceM/";
- assertEquals(34, 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(33, 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(34, 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: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java 2017-02-02 10:27:49 UTC (rev 670)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java 2017-02-02 10:28:11 UTC (rev 671)
@@ -102,7 +102,7 @@
String resourceDir = rootPath + "/resource/100/Multi/ProConMulti/";
- assertEquals(35, 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(33, 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(35, 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