[openrtm-commit:02708] r758 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder: . generator manager template/cmake
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 7月 26日 (水) 12:38:35 JST
Author: ga
Date: 2017-07-26 12:38:35 +0900 (Wed, 26 Jul 2017)
New Revision: 758
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/GeneratedResult.java
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/template/cmake/CMakeLists.txt.vsl
Log:
Modified CMakeLists.txt #4133
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2017-07-26 03:38:12 UTC (rev 757)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2017-07-26 03:38:35 UTC (rev 758)
@@ -649,7 +649,9 @@
if(generatedResult.getEncode().length()==0) {
String strFullPath = outputFile.getLocation().toOSString();
FileOutputStream fos = new FileOutputStream(strFullPath);
- fos.write(0xef); fos.write(0xbb); fos.write(0xbf);
+ if(generatedResult.isNotBom()==false) {
+ fos.write(0xef); fos.write(0xbb); fos.write(0xbf);
+ }
OutputStreamWriter osw = new OutputStreamWriter( fos , "UTF-8");
BufferedWriter fp = new BufferedWriter( osw );
fp.write ( generatedResult.getCode());
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/GeneratedResult.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/GeneratedResult.java 2017-07-26 03:38:12 UTC (rev 757)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/GeneratedResult.java 2017-07-26 03:38:35 UTC (rev 758)
@@ -7,6 +7,7 @@
private String name;
private String code = "";
private String encode = "";
+ private boolean isNotBom = false;
public GeneratedResult() {
this.name = "";
@@ -39,4 +40,12 @@
public void setEncode(String encode) {
this.encode = encode;
}
+
+ public boolean isNotBom() {
+ return isNotBom;
+ }
+ public void setNotBom(boolean isNotBom) {
+ this.isNotBom = isNotBom;
+ }
+
}
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 2017-07-26 03:38:12 UTC (rev 757)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java 2017-07-26 03:38:35 UTC (rev 758)
@@ -150,7 +150,9 @@
public GeneratedResult generateCMakeLists(Map<String, Object> contextMap) {
String outfile = "CMakeLists.txt";
String infile = "cmake/CMakeLists.txt.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
// 1.0系 (CMake/cmake)
@@ -157,13 +159,17 @@
public GeneratedResult generateCmakeCMakeLists(Map<String, Object> contextMap) {
String outfile = "cmake/CMakeLists.txt";
String infile = "cmake/cmake/CMakeCMakeLists.txt.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
public GeneratedResult generateCmakeCPackOption(Map<String, Object> contextMap) {
String outfile = "cmake/cpack_options.cmake.in";
String infile = "cmake/cmake/cpack_options_cmake.in.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
public GeneratedResult generateResourceLicenseRTF(
@@ -177,7 +183,9 @@
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = "cmake/" + rtcParam.getName().toLowerCase() + "-config-version.cmake.in";
String infile = "cmake/cmake/config_version.cmake.in.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
public GeneratedResult generateCmakeConfig(Map<String, Object> contextMap) {
@@ -184,7 +192,9 @@
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = "cmake/" + rtcParam.getName().toLowerCase() + "-config.cmake.in";
String infile = "cmake/cmake/config.cmake.in.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
public GeneratedResult generateCmakePcIn(Map<String, Object> contextMap) {
@@ -198,7 +208,9 @@
Map<String, Object> contextMap) {
String outfile = "cmake/uninstall_target.cmake.in";
String infile = "cmake/cmake/cmake_uninstall.cmake.in.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
public GeneratedResult generateUtilIn(
@@ -212,7 +224,9 @@
public GeneratedResult generateDocCMakeLists(Map<String, Object> contextMap) {
String outfile = "doc/CMakeLists.txt";
String infile = "cmake/doc/DocCMakeLists.txt.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
public GeneratedResult generateDocConfPy(Map<String, Object> contextMap) {
@@ -244,7 +258,9 @@
public GeneratedResult generateIdlCMakeLists(Map<String, Object> contextMap) {
String outfile = "idl/CMakeLists.txt";
String infile = "cmake/idl/IdlCMakeLists.txt.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
// 1.0系 (CMake/include)
@@ -251,7 +267,9 @@
public GeneratedResult generateIncludeCMakeLists(Map<String, Object> contextMap) {
String outfile = "include/CMakeLists.txt";
String infile = "cmake/include/IncludeCMakeLists.txt.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
// 1.0系 (CMake/include/module)
@@ -259,7 +277,9 @@
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = "include/" + rtcParam.getName() + "/CMakeLists.txt";
String infile = "cmake/include/IncModuleCMakeLists.txt.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
// 1.0系 (CMake/src)
@@ -266,7 +286,9 @@
public GeneratedResult generateSrcCMakeLists(Map<String, Object> contextMap) {
String outfile = "src/CMakeLists.txt";
String infile = "cmake/src/SrcCMakeLists.txt.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
}
public GeneratedResult generate(String infile, String outfile,
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2017-07-26 03:38:12 UTC (rev 757)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2017-07-26 03:38:35 UTC (rev 758)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 2.8)
cmake_policy(SET CMP0002 OLD)
if(POLICY CMP0046)
cmake_policy(SET CMP0046 OLD)
More information about the openrtm-commit
mailing list