[openrtm-commit:00246] r205 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: META-INF src/jp/go/aist/rtm/rtcbuilder/manager test/jp/go/aist/rtm/rtcbuilder/_test/_100

[openrtm ＠ openrtm.org]

Author: sakamoto
Date: 2011-07-17 23:41:03 +0900 (Sun, 17 Jul 2011)
New Revision: 205

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
Log:
Modify Version No. and CMake code

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF	2011-07-17 14:39:59 UTC (rev 204)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF	2011-07-17 14:41:03 UTC (rev 205)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder; singleton:=true
-Bundle-Version: 1.1.0.rc1v20110526
+Bundle-Version: 1.1.0.rc2v20110725
 Bundle-ClassPath: .,
  lib/velocity-1.6.3-dep.jar
 Bundle-Vendor: %providerName

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java	2011-07-17 14:39:59 UTC (rev 204)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java	2011-07-17 14:41:03 UTC (rev 205)
@@ -124,8 +124,8 @@
 		result.add(gr);
 		gr = generateModulesCPackWIX(contextMap);
 		result.add(gr);
-		gr = generateModulesFindOpenRTM(contextMap);
-		result.add(gr);
+//		gr = generateModulesFindOpenRTM(contextMap);
+//		result.add(gr);
 
 		gr = generateResourceDescriptionTXT(contextMap);
 		result.add(gr);
@@ -171,9 +171,10 @@
 
 	public GeneratedResult generateModulesFindOpenRTM(
 			Map<String, Object> contextMap) {
-		String outfile = "cmake_modules/FindOpenRTM.cmake";
-		String infile = "cmake/FindOpenRTM.cmake.vsl";
-		return generate(infile, outfile, contextMap);
+//		String outfile = "cmake_modules/FindOpenRTM.cmake";
+//		String infile = "cmake/FindOpenRTM.cmake.vsl";
+//		return generate(infile, outfile, contextMap);
+		return null;
 	}
 
 	// 1.0系 (CMake/cpack_resources)

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java	2011-07-17 14:39:59 UTC (rev 204)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java	2011-07-17 14:41:03 UTC (rev 205)
@@ -253,7 +253,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(15, result.size());
+		assertEquals(14, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -264,7 +264,7 @@
 		checkCode(result, resourceDir, "Doxyfile.in");
 		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
 		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-		checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
+//		checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
 		checkCode(result, resourceDir, "cpack_resources/Description.txt");
 		checkCode(result, resourceDir, "cpack_resources/License.txt");
 		checkCode(result, resourceDir, "cpack_resources/License.rtf");
@@ -332,7 +332,7 @@
 
 		String resourceDir = fixturePath(name) + "/";
 
-		assertEquals(17, result.size());
+		assertEquals(16, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");
@@ -345,7 +345,7 @@
 		checkCode(result, resourceDir, "Doxyfile.in");
 		checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
 		checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-		checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
+//		checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
 		checkCode(result, resourceDir, "cpack_resources/Description.txt");
 		checkCode(result, resourceDir, "cpack_resources/License.txt");
 		checkCode(result, resourceDir, "cpack_resources/License.rtf");