[openrtm-commit:03287] r834 - trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager

openrtm @ openrtm.org openrtm @ openrtm.org
2018年 3月 27日 (火) 20:53:24 JST


Author: ga
Date: 2018-03-27 20:53:24 +0900 (Tue, 27 Mar 2018)
New Revision: 834

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java
Log:
Modified not to generate doc dir. #4491

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java	2018-03-27 11:46:42 UTC (rev 833)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java	2018-03-27 11:53:24 UTC (rev 834)
@@ -63,8 +63,35 @@
 		String infile = "cmake/CMakeLists.txt.vsl";
 		return generateJava(infile, outfile, contextMap);
 	}
+	
+	public GeneratedResult generateModulesJavaCompile(
+			Map<String, Object> contextMap) {
+		String outfile = "cmake_modules/cmake_javacompile.cmake.in";
+		String infile = "cmake/cmake_javacompile.cmake.in.vsl";
+		return generateJava(infile, outfile, contextMap);
+	}
 
+	// 1.0系 (CMake/doc)
+	public GeneratedResult generateDocCMakeLists(Map<String, Object> contextMap) {
+//		String outfile = "doc/CMakeLists.txt";
+//		String infile = "cmake/doc/DocCMakeLists.txt.vsl";
+//		GeneratedResult result = generateJava(infile, outfile, contextMap); 
+//		result.setNotBom(true);
+//		return result;
+		return new GeneratedResult();
+	}
+	
 	@Override
+	public GeneratedResult generateDocConfPy(Map<String, Object> contextMap) {
+		return new GeneratedResult();
+	}
+
+	@Override
+	public GeneratedResult generateDoxyfile(Map<String, Object> contextMap) {
+		return new GeneratedResult();
+	}
+
+	@Override
 	public GeneratedResult generateSrcCMakeLists(Map<String, Object> contextMap) {
 		return new GeneratedResult();
 	}
@@ -79,22 +106,16 @@
 		return new GeneratedResult();
 	}
 	
-	public GeneratedResult generateModulesJavaCompile(
-			Map<String, Object> contextMap) {
-		String outfile = "cmake_modules/cmake_javacompile.cmake.in";
-		String infile = "cmake/cmake_javacompile.cmake.in.vsl";
-		return generateJava(infile, outfile, contextMap);
+	@Override
+	public GeneratedResult generateDocIndex(Map<String, Object> contextMap) {
+		return new GeneratedResult();
 	}
+	@Override
+	public GeneratedResult generateDocIndexJ(Map<String, Object> contextMap) {
+		return new GeneratedResult();
+	}
 
-	// 1.0系 (CMake/doc)
-	public GeneratedResult generateDocCMakeLists(Map<String, Object> contextMap) {
-		String outfile = "doc/CMakeLists.txt";
-		String infile = "cmake/doc/DocCMakeLists.txt.vsl";
-		GeneratedResult result = generateJava(infile, outfile, contextMap); 
-		result.setNotBom(true);
-		return result;
-	}
-	
+
 	// 1.0系 (CMake/cpack_resources)
 	public GeneratedResult generateJava(String infile, String outfile,
 			Map<String, Object> contextMap) {



openrtm-commit メーリングリストの案内