[openrtm-commit:02325] r662 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: src/jp/go/aist/rtm/rtcbuilder src/jp/go/aist/rtm/rtcbuilder/generator/param src/jp/go/aist/rtm/rtcbuilder/manager src/jp/go/aist/rtm/rtcbuilder/template src/jp/go/aist/rtm/rtcbuilder/template/cmake src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake src/jp/go/aist/rtm/rtcbuilder/template/cpp src/jp/go/aist/rtm/rtcbuilder/ui/editors test/jp/go/aist/rtm/rtcbuilder/_test test/jp/go/aist/rtm/rtcbuilder/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 1月 24日 (火) 23:17:47 JST
Author: ga
Date: 2017-01-24 23:17:45 +0900 (Tue, 24 Jan 2017)
New Revision: 662
Removed:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter04.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common_04/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc8.vcproj.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc9.vcproj.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.sln.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.vcproj.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.sln.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.vcproj.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/Makefile.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/copyprops.bat.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/user_config.vsprops.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp_04/
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/IRtcBuilderConstants.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.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/manager/CXXGenerateManager.java
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/ui/editors/LanguageEditorFormPage.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
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/CXXConfigSetTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
Log:
Modified generated CMakeFile #3874, #3602
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-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -540,24 +540,14 @@
}
}
for( IdlFileParam idlFile : rtcParam.getProviderIdlPathes() ) {
- IFile idlTarget;
- if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
- idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
- } else {
- idlTarget = project.getFile(idlFile.getIdlFile());
- }
+ IFile idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
if( !idlTarget.getLocation().toOSString().equals(idlFile.getIdlPath()) ) {
idlTarget.delete(true, null);
idlTarget.create(new FileInputStream(idlFile.getIdlPath()), true, null);
}
}
for( IdlFileParam idlFile : rtcParam.getConsumerIdlPathes() ) {
- IFile idlTarget;
- if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
- idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
- } else {
- idlTarget = project.getFile(idlFile.getIdlFile());
- }
+ IFile idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
if( !idlTarget.getLocation().toOSString().equals(idlFile.getIdlPath()) ) {
idlTarget.delete(true, null);
idlTarget.create(new FileInputStream(idlFile.getIdlPath()), true, null);
@@ -566,12 +556,7 @@
//
for( String includedIdlFile : rtcParam.getIncludedIdls() ) {
File target = new File(includedIdlFile);
- IFile idlTarget;
- if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100) && rtcParam.enableOldBuildEnv()==false) {
- idlTarget = project.getFile("idl" + File.separator + target.getName());
- } else {
- idlTarget = project.getFile(target.getName());
- }
+ IFile idlTarget = project.getFile("idl" + File.separator + target.getName());
if( !idlTarget.getLocation().toOSString().equals(includedIdlFile) ) {
idlTarget.delete(true, null);
idlTarget.create(new FileInputStream(includedIdlFile), true, null);
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -77,8 +77,6 @@
public static final String LANG_CPP = "C++";
public static final String LANG_CPPWIN = "C++(Windows)";
- public static final String LANG_CSHARP = "C#";
- public static final String LANG_RUBY = "Ruby";
public static final String LANG_PYTHON = "Python";
public static final String LANG_JAVA = "Java";
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -63,7 +63,6 @@
private RecordedList<String> langArgList = new RecordedList<String>();
private RecordedList<String> libraryPath = new RecordedList<String>();
private String architecture = new String();
- boolean enableOldBuildEnv= false;
private RecordedList<TargetEnvParam> targetEnvs = new RecordedList<TargetEnvParam>();
//RTC.xml
private String rtcxml;
@@ -347,9 +346,6 @@
public String getArchitecture() {
return this.architecture;
}
- public boolean enableOldBuildEnv() {
- return enableOldBuildEnv;
- }
public List<TargetEnvParam> getTargetEnvs() {
return this.targetEnvs;
}
@@ -384,10 +380,6 @@
}
return result;
}
- public void setEnableOldBuildEnv(boolean b) {
- checkUpdated(this.enableOldBuildEnv, b);
- this.enableOldBuildEnv = b;
- }
//ドキュメント-Component
public boolean isDocExist() {
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-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -47,7 +47,6 @@
@Override
public List<GeneratedResult> generateTemplateCode(RtcParam rtcParam) {
List<GeneratedResult> result = new ArrayList<GeneratedResult>();
- if (rtcParam.enableOldBuildEnv()) return result;
if (!validateRtcParam(rtcParam)) {
return result;
@@ -142,10 +141,6 @@
result.add(gr);
//TODO アイコン、ビットマップのコピー
- //cmake/Modules
- gr = generateModulesFindOpenRTM(contextMap);
- result.add(gr);
-
//doc
gr = generateDocCMakeLists(contextMap);
result.add(gr);
@@ -262,14 +257,6 @@
return generate(infile, outfile, contextMap);
}
- // 1.0系 (CMake/cmake/Modules)
- public GeneratedResult generateModulesFindOpenRTM(
- Map<String, Object> contextMap) {
- String outfile = "cmake/Modules/FindOpenRTM.cmake";
- String infile = "cmake/cmake/FindOpenRTM.cmake.vsl";
- return generate(infile, outfile, contextMap);
- }
-
// 1.0系 (CMake/doc)
public GeneratedResult generateDocCMakeLists(Map<String, Object> contextMap) {
String outfile = "doc/CMakeLists.txt";
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter04.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter04.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter04.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,59 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.manager;
-
-import java.util.UUID;
-
-/**
- * CXXソースを出力する際に使用されるユーティリティ
- */
-public class CXXConverter04 extends jp.go.aist.rtm.rtcbuilder.manager.CXXConverter {
- private static String projectGUID = null;
- private static String projectID = null;
- private static String compProjectID = null;
- private static String sourceID = null;
- private static String headerID = null;
- private static String compSourceID = null;
- private static String compHeaderID = null;
-
- public static String getProjectGID(boolean isTest) {
- if( isTest ) return "8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942";
- if( projectGUID==null ) projectGUID = UUID.randomUUID().toString().toUpperCase();
- return projectGUID;
- }
-
- public static String getProjectUUID(boolean isTest) {
- if( isTest ) return "D1CD3730-28E2-11DD-88AA-005056C00008";
- if( projectID==null ) projectID = UUID.randomUUID().toString().toUpperCase();
- return projectID;
- }
-
- public static String getCompProjectUUID(boolean isTest) {
- if( isTest ) return "D1322FAE-28E2-11DD-B62B-005056C00008";
- if( projectID==null ) compProjectID = UUID.randomUUID().toString().toUpperCase();
- return compProjectID;
- }
-
- public static String getSourceUUID(boolean isTest) {
- if( isTest ) return "D1CD3730-28E2-11DD-B7E1-005056C00008";
- if( sourceID==null ) sourceID = UUID.randomUUID().toString().toUpperCase();
- return sourceID;
- }
-
- public static String getHeaderUUID(boolean isTest) {
- if( isTest ) return "D1CD3730-28E2-11DD-A46E-005056C00008";
- if( headerID==null ) headerID = UUID.randomUUID().toString().toUpperCase();
- return headerID;
- }
-
- public static String getCompSourceUUID(boolean isTest) {
- if( isTest ) return "D19D74A1-28E2-11DD-81A5-005056C00008";
- if( compSourceID==null ) compSourceID = UUID.randomUUID().toString().toUpperCase();
- return compSourceID;
- }
-
- public static String getCompHeaderUUID(boolean isTest) {
- if( isTest ) return "D19D74A1-28E2-11DD-9671-005056C00008";
- if( compHeaderID==null ) compHeaderID = UUID.randomUUID().toString().toUpperCase();
- return compHeaderID;
- }
-
-}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -54,8 +54,7 @@
Map<String, Object> contextMap = new HashMap<String, Object>();
contextMap.put("template", TEMPLATE_PATH);
contextMap.put("rtcParam", rtcParam);
- contextMap.put("cXXConv",
- new jp.go.aist.rtm.rtcbuilder.manager.CXXConverter04());
+ contextMap.put("cXXConv", new CXXConverter());
contextMap.put("tmpltHelper", new TemplateHelper());
resetIDLServiceClass(rtcParam);
@@ -77,29 +76,6 @@
gr = generateRTCSource(contextMap);
result.add(gr);
- if (rtcParam.enableOldBuildEnv()) {
- // 旧バージョンのビルド環境の生成
- gr = generateMakefile(contextMap);
- result.add(gr);
-
- gr = generateVC9Sln(contextMap);
- result.add(gr);
- gr = generateVC8Sln(contextMap);
- result.add(gr);
- gr = generateVC9CompProj(contextMap);
- result.add(gr);
- gr = generateVC8CompProj(contextMap);
- result.add(gr);
- gr = generateVC9RTCProj(contextMap);
- result.add(gr);
- gr = generateVC8RTCProj(contextMap);
- result.add(gr);
- gr = generateVCCopyProps(contextMap);
- result.add(gr);
- gr = generateVCUserConfig(contextMap);
- result.add(gr);
- }
-
for (IdlFileParam idl : rtcParam.getProviderIdlPathes()) {
contextMap.put("idlFileParam", idl);
gr = generateSVCHeader(contextMap);
@@ -116,11 +92,7 @@
public GeneratedResult generateCompSource(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = null;
- if( rtcParam.enableOldBuildEnv() ) {
- outfile = rtcParam.getName() + "Comp.cpp";
- } else {
- outfile = "src/" + rtcParam.getName() + "Comp.cpp";
- }
+ outfile = "src/" + rtcParam.getName() + "Comp.cpp";
String infile = "cpp/CXX_Comp.cpp.vsl";
return generate(infile, outfile, contextMap);
}
@@ -128,11 +100,7 @@
public GeneratedResult generateRTCHeader(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = null;
- if( rtcParam.enableOldBuildEnv() ) {
- outfile = rtcParam.getName() + ".h";
- } else {
- outfile = "include/" + rtcParam.getName() + "/" + rtcParam.getName() + ".h";
- }
+ outfile = "include/" + rtcParam.getName() + "/" + rtcParam.getName() + ".h";
String infile = "cpp/CXX_RTC.h.vsl";
return generate(infile, outfile, contextMap);
}
@@ -140,11 +108,7 @@
public GeneratedResult generateRTCSource(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = null;
- if( rtcParam.enableOldBuildEnv() ) {
- outfile = rtcParam.getName() + ".cpp";
- } else {
- outfile = "src/" + rtcParam.getName() + ".cpp";
- }
+ outfile = "src/" + rtcParam.getName() + ".cpp";
String infile = "cpp/CXX_RTC.cpp.vsl";
return generate(infile, outfile, contextMap);
}
@@ -153,96 +117,22 @@
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
String outfile = null;
- if( rtcParam.enableOldBuildEnv() ) {
- outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".h";
- } else {
- outfile = "include/" + rtcParam.getName() + "/"
- + TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".h";
- }
+ outfile = "include/" + rtcParam.getName() + "/"
+ + TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+ + TemplateHelper.getServiceImplSuffix() + ".h";
String infile = "cpp/CXX_SVC.h.vsl";
return generate(infile, outfile, contextMap);
}
public GeneratedResult generateSVCSource(Map<String, Object> contextMap) {
IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = null;
- if( rtcParam.enableOldBuildEnv() ) {
- outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".cpp";
- } else {
- outfile = "src/" + TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".cpp";
- }
+ outfile = "src/" + TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+ + TemplateHelper.getServiceImplSuffix() + ".cpp";
String infile = "cpp/CXX_SVC.cpp.vsl";
return generate(infile, outfile, contextMap);
}
- // 1.0系 (ビルド環境)
-
- public GeneratedResult generateMakefile(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = "Makefile." + rtcParam.getName();
- String infile = "cpp/Makefile.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC9Sln(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "_vc9.sln";
- String infile = "cpp/CXX_vc9.sln.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC8Sln(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "_vc8.sln";
- String infile = "cpp/CXX_vc8.sln.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC8CompProj(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "Comp_vc8.vcproj";
- String infile = "cpp/CXX_Comp_vc8.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC9CompProj(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "Comp_vc9.vcproj";
- String infile = "cpp/CXX_Comp_vc9.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC8RTCProj(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "_vc8.vcproj";
- String infile = "cpp/CXX_vc8.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC9RTCProj(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "_vc9.vcproj";
- String infile = "cpp/CXX_vc9.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVCCopyProps(Map<String, Object> contextMap) {
- String outfile = "copyprops.bat";
- String infile = "cpp/copyprops.bat.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVCUserConfig(Map<String, Object> contextMap) {
- String outfile = "user_config.vsprops";
- String infile = "cpp/user_config.vsprops.vsl";
- return generate(infile, outfile, contextMap);
- }
-
public GeneratedResult generate(String infile, String outfile,
Map<String, Object> contextMap) {
try {
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-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -51,11 +51,6 @@
find_package(OpenRTM HINTS /usr/lib64/openrtm-1.1/cmake)
if(${dol}{OpenRTM_FOUND})
MESSAGE(STATUS "OpenRTM configuration Found")
-else(${dol}{OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${dol}{PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${dol}{OpenRTM_FOUND})
${sharp} Universal settings
${sharp}enable_testing()
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,311 +0,0 @@
-
-set(OMNIORB_FOUND FALSE)
-set(OPENRTM_FOUND FALSE)
-
-
-if(UNIX)
- include(FindPkgConfig)
-
- ${sharp} omniORB
- pkg_check_modules(OMNIORB REQUIRED "omniORB4")
- if(NOT OMNIORB_DIR)
- if(OMNIORB_FOUND)
- set(OMNIORB_DIR "${dol}{OMNIORB_PREFIX}")
- endif()
- set(OMNIORB_DIR "${dol}{OMNIORB_DIR}" CACHE PATH "omniORB root directory")
- endif()
-
- set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS_OTHER})
- set(OMNIORB_LDFLAGS ${dol}{OMNIORB_LDFLAGS_OTHER})
-
- ${sharp} OpenRTM-aist
- pkg_check_modules(OPENRTM REQUIRED "openrtm-aist")
- if(NOT OPENRTM_DIR)
- if(OPENRTM_FOUND)
- set(OPENRTM_DIR "${dol}{OPENRTM_PREFIX}")
- endif()
- set(OPENRTM_DIR "${dol}{OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
- endif()
-
- set(OPENRTM_CFLAGS ${dol}{OPENRTM_CFLAGS_OTHER})
- set(OPENRTM_LDFLAGS ${dol}{OPENRTM_LDFLAGS_OTHER})
-
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
- OPENRTM_VERSION_MAJOR "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
- OPENRTM_VERSION_MINOR "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
- OPENRTM_VERSION_PATCH "${dol}{OPENRTM_VERSION}")
-
- ${sharp} IDL Compiler
- set(OPENRTM_IDLC "")
- set(OPENRTM_IDLFLAGS "")
-
- execute_process(COMMAND rtm-config --idlc
- RESULT_VARIABLE result_val
- OUTPUT_VARIABLE output_val
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(result_val EQUAL 0)
- set(OPENRTM_IDLC "${dol}{output_val}")
- endif()
-
- execute_process(COMMAND rtm-config --idlflags
- RESULT_VARIABLE result_val
- OUTPUT_VARIABLE output_val
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(result_val EQUAL 0)
- string(REPLACE " " ";" output_val ${dol}{output_val})
- set(OPENRTM_IDLFLAGS ${dol}{output_val} "-I${dol}{OPENRTM_DIR}/include/rtm/idl")
- endif()
-
- ${sharp} IDL Skelton Wrapper
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(UNIX)
-
-set(WIN32_RTM "")
-set(RTM_CONFIG_CMAKE "")
-
-macro(rtm_norm_path _path _result)
- string(REGEX REPLACE "\"" "" _var "${dol}{_path}")
- string(REGEX REPLACE "[/]+" "/" _var "${dol}{_var}")
- string(REGEX REPLACE "[/]${dol}" "" _var "${dol}{_var}")
- set(${dol}{_result} "${dol}{_var}")
-endmacro(rtm_norm_path)
-
-if(WIN32)
- set(WIN32_RTM "10")
- find_file(rtm_conf "rtm_config.cmake" PATHS "${dol}ENV{RTM_ROOT}/etc")
- if(rtm_conf)
- set(WIN32_RTM "11")
- set(RTM_CONFIG_CMAKE "${dol}{rtm_conf}")
- endif()
-endif(WIN32)
-
-if(WIN32_RTM STREQUAL "11")
- include("${dol}{RTM_CONFIG_CMAKE}")
- message(STATUS "Configuration by ${dol}{RTM_CONFIG_CMAKE}.")
-
- ${sharp} omniORB
- set(OMNIORB_DIR "${dol}{omni_root}")
- set(OMNIORB_FOUND TRUE)
- file(TO_CMAKE_PATH "${dol}{OMNIORB_DIR}" OMNIORB_DIR)
-
- foreach(path ${dol}{omni_includes})
- file(TO_CMAKE_PATH "${dol}{path}" path)
- rtm_norm_path("${dol}{path}" path)
- list(APPEND OMNIORB_INCLUDE_DIRS "${dol}{path}")
- endforeach()
- foreach(path ${dol}{omni_libdir})
- file(TO_CMAKE_PATH "${dol}{path}" path)
- rtm_norm_path("${dol}{path}" path)
- list(APPEND OMNIORB_LIBRARY_DIRS "${dol}{path}")
- endforeach()
-
- ${sharp} omniORB version
- file(GLOB _vers RELATIVE "${dol}{OMNIORB_DIR}" "${dol}{OMNIORB_DIR}/THIS_IS_OMNIORB*")
- if("${dol}{_vers}" STREQUAL "")
- message(FATAL_ERROR "omniORB version file not found.")
- endif()
-
- set(OMNIORB_VERSION "${dol}{_vers}")
- string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
- OMNIORB_VERSION "${dol}{OMNIORB_VERSION}")
- string(REGEX REPLACE "[_]" "."
- OMNIORB_VERSION "${dol}{OMNIORB_VERSION}")
-
- set(OMNIORB_VERSION_NUM "${dol}{omni_dllver}")
- set(OMNIORB_THREAD_NUM "${dol}{omnithread_dllver}")
-
- set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
- if(${dol}{OMNIORB_VERSION_NUM} MATCHES "^40")
- set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
- else()
- set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
- endif()
-
- foreach(library ${dol}{omni_lib})
- list(APPEND OMNIORB_LIBRARIES optimized "${dol}{library}")
- endforeach()
- foreach(library ${dol}{omni_libd})
- list(APPEND OMNIORB_LIBRARIES debug "${dol}{library}")
- endforeach()
-
- ${sharp} OpenRTM-aist
- set(OPENRTM_DIR "${dol}{rtm_root}")
- set(OPENRTM_FOUND TRUE)
- file(TO_CMAKE_PATH "${dol}{OPENRTM_DIR}" OPENRTM_DIR)
-
- ${sharp} OpenRTM-aist version
- set(OPENRTM_VERSION "${dol}{rtm_version}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
- OPENRTM_VERSION_MAJOR "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
- OPENRTM_VERSION_MINOR "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
- OPENRTM_VERSION_PATCH "${dol}{OPENRTM_VERSION}")
-
- set(OPENRTM_VERSION_NUM "${dol}{rtm_dllver}")
-
- foreach(path ${dol}{rtm_includes})
- file(TO_CMAKE_PATH "${dol}{path}" path)
- rtm_norm_path("${dol}{path}" path)
- list(APPEND OPENRTM_INCLUDE_DIRS "${dol}{path}")
- endforeach()
- foreach(path ${dol}{rtm_libdir})
- file(TO_CMAKE_PATH "${dol}{path}" path)
- rtm_norm_path("${dol}{path}" path)
- list(APPEND OPENRTM_LIBRARY_DIRS "${dol}{path}")
- endforeach()
-
- set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
-
- foreach(library ${dol}{rtm_lib})
- list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}")
- endforeach()
- foreach(library ${dol}{coil_lib})
- list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}")
- endforeach()
-
- foreach(library ${dol}{rtm_libd})
- list(APPEND OPENRTM_LIBRARIES debug "${dol}{library}")
- endforeach()
- foreach(library ${dol}{coil_libd})
- list(APPEND OPENRTM_LIBRARIES debug "${dol}{library}")
- endforeach()
-
- ${sharp} IDL Compiler
- set(OPENRTM_IDLC "${dol}{rtm_idlc}")
- foreach(flag ${dol}{rtm_idlflags})
- string(REGEX REPLACE "[\\]" "/" flag "${flag}")
- list(APPEND OPENRTM_IDLFLAGS "${dol}{flag}")
- endforeach()
-
- ${sharp} IDL Skelton Wrapper
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(WIN32_RTM STREQUAL "11")
-
-if(WIN32_RTM STREQUAL "10")
- ${sharp} omniORB
- if(NOT OMNIORB_DIR)
- if(NOT ${dol}ENV{OMNI_ROOT} STREQUAL "")
- set(OMNIORB_DIR "${dol}ENV{OMNI_ROOT}")
- set(OMNIORB_FOUND TRUE)
- endif()
- set(OMNIORB_DIR "${dol}{OMNIORB_DIR}" CACHE PATH "omniORB root directory")
- if(NOT OMNIORB_FOUND)
- message(FATAL_ERROR "omniORB not found.")
- endif()
- endif()
-
- set(OMNIORB_INCLUDE_DIRS "${dol}{OMNIORB_DIR}/include")
- set(OMNIORB_LIBRARY_DIRS "${dol}{OMNIORB_DIR}/lib/x86_win32")
-
- ${sharp} omniORB version
- file(GLOB _vers RELATIVE "${dol}{OMNIORB_DIR}" "${dol}{OMNIORB_DIR}/THIS_IS_OMNIORB*")
- if("${dol}{_vers}" STREQUAL "")
- message(FATAL_ERROR "omniORB version file not found.")
- endif()
-
- set(OMNIORB_VERSION "${dol}{_vers}")
- string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
- OMNIORB_VERSION "${dol}{OMNIORB_VERSION}")
- string(REGEX REPLACE "[_]" "."
- OMNIORB_VERSION "${dol}{OMNIORB_VERSION}")
- string(REGEX REPLACE "[.]" ""
- OMNIORB_VERSION_NUM "${dol}{OMNIORB_VERSION}")
-
- ${sharp} omnithread version
- file(GLOB _vers RELATIVE "${dol}{OMNIORB_LIBRARY_DIRS}" "${dol}{OMNIORB_LIBRARY_DIRS}/omnithread*")
- if("${dol}{_vers}" STREQUAL "")
- message(FATAL_ERROR "omnithread not found.")
- endif()
- string(REGEX REPLACE ".*omnithread([0-9]+)_rt\\.lib.*" "\\1"
- OMNIORB_THREAD_NUM "${dol}{_vers}")
-
- set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
- if(${dol}{OMNIORB_VERSION_NUM} MATCHES "^40")
- set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
- else()
- set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
- endif()
-
- foreach(library "omniORB${dol}{OMNIORB_VERSION_NUM}_rt"
- "omniDynamic${dol}{OMNIORB_VERSION_NUM}_rt"
- "omnithread${dol}{OMNIORB_THREAD_NUM}_rt")
- list(APPEND OMNIORB_LIBRARIES optimized "${dol}{library}" debug "${dol}{library}d")
- endforeach()
-
- ${sharp} OpenRTM-aist
- if(NOT OPENRTM_DIR)
- if(NOT ${dol}ENV{RTM_ROOT} STREQUAL "")
- set(OPENRTM_DIR "${dol}ENV{RTM_ROOT}")
- set(OPENRTM_FOUND TRUE)
- endif()
- set(OPENRTM_DIR "${dol}{OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
- if(NOT OPENRTM_FOUND)
- message(FATAL_ERROR "OpenRTM-aist not found.")
- endif()
- endif()
-
- ${sharp} OpenRTM-aist version
- set(OPENRTM_VERSION "${dol}{OPENRTM_DIR}")
- string(REGEX REPLACE ".*OpenRTM-aist/" "" OPENRTM_VERSION "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1" OPENRTM_VERSION_MAJOR "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${dol}{OPENRTM_VERSION}")
- set(OPENRTM_VERSION_PATCH "0")
- set(OPENRTM_VERSION "${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}.${dol}{OPENRTM_VERSION_PATCH}")
- string(REGEX REPLACE "[.]" ""
- OPENRTM_VERSION_NUM "${dol}{OPENRTM_VERSION}")
-
- set(OPENRTM_INCLUDE_DIRS "${dol}{OPENRTM_DIR}")
- set(OPENRTM_LIBRARY_DIRS "${dol}{OPENRTM_DIR}/bin")
- list(APPEND OPENRTM_INCLUDE_DIRS "${dol}{OPENRTM_DIR}/rtm/idl")
-
- set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
-
- foreach(library "RTC${dol}{OPENRTM_VERSION_NUM}" "coil")
- list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}" debug "${dol}{library}d")
- endforeach()
- foreach(library "ws2_32" "mswsock")
- list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}" debug "${dol}{library}")
- endforeach()
-
- ${sharp} IDL Compiler
- set(OPENRTM_IDLC "omniidl")
- set(OPENRTM_IDLFLAGS -bcxx -Wba -nf)
-
- ${sharp} IDL Skelton Wrapper
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(WIN32_RTM STREQUAL "10")
-
-message(STATUS "FindOpenRTM setup done.")
-
-message(STATUS " OMNIORB_DIR=${dol}{OMNIORB_DIR}")
-message(STATUS " OMNIORB_VERSION=${dol}{OMNIORB_VERSION}")
-message(STATUS " OMNIORB_CFLAGS=${dol}{OMNIORB_CFLAGS}")
-message(STATUS " OMNIORB_INCLUDE_DIRS=${dol}{OMNIORB_INCLUDE_DIRS}")
-message(STATUS " OMNIORB_LDFLAGS=${dol}{OMNIORB_LDFLAGS}")
-message(STATUS " OMNIORB_LIBRARY_DIRS=${dol}{OMNIORB_LIBRARY_DIRS}")
-message(STATUS " OMNIORB_LIBRARIES=${dol}{OMNIORB_LIBRARIES}")
-
-message(STATUS " OPENRTM_DIR=${dol}{OPENRTM_DIR}")
-message(STATUS " OPENRTM_VERSION=${dol}{OPENRTM_VERSION}")
-message(STATUS " OPENRTM_VERSION_MAJOR=${dol}{OPENRTM_VERSION_MAJOR}")
-message(STATUS " OPENRTM_VERSION_MINOR=${dol}{OPENRTM_VERSION_MINOR}")
-message(STATUS " OPENRTM_VERSION_PATCH=${dol}{OPENRTM_VERSION_PATCH}")
-message(STATUS " OPENRTM_CFLAGS=${dol}{OPENRTM_CFLAGS}")
-message(STATUS " OPENRTM_INCLUDE_DIRS=${dol}{OPENRTM_INCLUDE_DIRS}")
-message(STATUS " OPENRTM_LDFLAGS=${dol}{OPENRTM_LDFLAGS}")
-message(STATUS " OPENRTM_LIBRARY_DIRS=${dol}{OPENRTM_LIBRARY_DIRS}")
-message(STATUS " OPENRTM_LIBRARIES=${dol}{OPENRTM_LIBRARIES}")
-
-message(STATUS " OPENRTM_IDLC=${dol}{OPENRTM_IDLC}")
-message(STATUS " OPENRTM_IDLFLAGS=${dol}{OPENRTM_IDLFLAGS}")
-message(STATUS " OPENRTM_IDL_WRAPPER=${dol}{OPENRTM_IDL_WRAPPER}")
-message(STATUS " OPENRTM_IDL_WRAPPER_FLAGS=${dol}{OPENRTM_IDL_WRAPPER_FLAGS}")
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,134 +0,0 @@
-${sharp} Find OpenRTM-aist
-${sharp}
-${sharp} The following additional directories are searched:
-${sharp} OPENRTM_ROOT (CMake variable)
-${sharp} OPENRTM_ROOT (Environment variable)
-${sharp}
-${sharp} This sets the following variables:
-${sharp} OPENRTM_FOUND - True if OpenRTM-aist was found.
-${sharp} OPENRTM_INCLUDE_DIRS - Directories containing the OpenRTM-aist include files.
-${sharp} OPENRTM_LIBRARIES - Libraries needed to use OpenRTM-aist.
-${sharp} OPENRTM_CFLAGS - Compiler flags for OpenRTM-aist.
-${sharp} OPENRTM_VERSION - The version of OpenRTM-aist found.
-${sharp} OPENRTM_VERSION_MAJOR - The major version of OpenRTM-aist found.
-${sharp} OPENRTM_VERSION_MINOR - The minor version of OpenRTM-aist found.
-${sharp} OPENRTM_VERSION_REVISION - The revision version of OpenRTM-aist found.
-${sharp} OPENRTM_VERSION_CANDIDATE - The candidate version of OpenRTM-aist found.
-${sharp} OPENRTM_IDL_COMPILER - The IDL compiler used by OpenRTM-aist.
-${sharp} OPENRTM_IDL_FLAGS - The flags used to compile OpenRTM-aist IDL files.
-${sharp} OPENRTM_IDL_DIR - The directory containing the OpenRTM-aist IDL files.
-${sharp}
-${sharp} This module also defines one macro usable in your CMakeLists.txt files:
-${sharp} OPENRTM_COMPILE_IDL_FILES(file1 file2 ...)
-${sharp} Compiles the specified IDL files, placing the generated C++ source files in
-${sharp} ${dol}{CMAKE_CURRENT_BINARY_DIR}. The source files can be found in file1_SRCS,
-${sharp} file2_SRCS, etc., and all source files for all IDL files are available in
-${sharp} ALL_IDL_SRCS. To depend on the generated files, depend on the targets
-${sharp} file1_TGT, file2_TGT, etc. The target ALL_IDL_TGT is available to depend on
-${sharp} all source files generated from IDL files.
-
-find_package(PkgConfig)
-pkg_check_modules(PC_OPENRTM openrtm-aist)
-pkg_check_modules(PC_COIL libcoil)
-pkg_check_modules(PC_OMNIORB4 omniORB4)
-pkg_check_modules(PC_OMNITHREAD3 omnithread3)
-pkg_check_modules(PC_OMNIDYNAMIC4 omniDynamic4)
-if ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- pkg_check_modules(PC_UUID uuid)
-endif ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-
-find_path(OPENRTM_INCLUDE_DIR rtm/RTC.h
- HINTS ${dol}{OPENRTM_ROOT}/include ${dol}{OPENRTM_ROOT} ${dol}ENV{OPENRTM_ROOT}/include ${dol}{PC_OPENRTM_INCLUDE_DIRS})
-
-find_path(COIL_INCLUDE_DIR coil/config_coil.h
- HINTS ${dol}{OPENRTM_ROOT}/include ${dol}ENV{OPENRTM_ROOT}/include ${dol}{PC_COIL_INCLUDE_DIRS})
-
-find_path(OMNIORB4_INCLUDE_DIR omniORB4/omniORB.h
- HITS ${dol}{OMNI_ROOT}/include ${dol}{PC_OMNIORB4_INCLUDE_DIRS})
-
-find_library(OPENRTM_LIBRARY RTC
- HINTS ${dol}{OPENRTM_ROOT}/lib ${dol}ENV{OPENRTM_ROOT}/lib
- ${dol}{PC_OPENRTM_LIBRARY_DIRS})
-find_library(COIL_LIBRARY coil
- HINTS ${dol}{OPENRTM_ROOT}/lib ${dol}ENV{OPENRTM_ROOT}/lib
- ${dol}{PC_COIL_LIBRARY_DIRS})
-find_library(OMNIORB4_LIBRARY omniORB4
- HINTS ${dol}{PC_OMNIORB4_LIBRARY_DIRS})
-find_library(OMNITHREAD3_LIBRARY omnithread
- HINTS ${dol}{PC_OMNITHREAD3_LIBRARY_DIRS})
-find_library(OMNIDYNAMIC4_LIBRARY omniDynamic4
- HINTS ${dol}{PC_OMNIDYNAMIC4_LIBRARY_DIRS})
-if ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- find_library(UUID_LIBRARY uuid
- HINTS ${dol}{PC_UUID_LIBRARY_DIRS})
-else ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- set(UUID_LIBRARY "")
-endif ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-
-set(OPENRTM_CFLAGS ${dol}{PC_OPENRTM_CFLAGS_OTHER} ${dol}{PC_COIL_CFLAGS_OTHER} ${dol}{PC_OMNIORB4_CFLAGS_OTHER})
-set(OPENRTM_INCLUDE_DIRS ${dol}{OPENRTM_INCLUDE_DIR} ${dol}{OPENRTM_INCLUDE_DIR}/rtm/idl
- ${dol}{COIL_INCLUDE_DIR} ${dol}{OMNIORB4_INCLUDE_DIR})
-set(OPENRTM_LIBRARIES ${dol}{OPENRTM_LIBRARY} ${dol}{COIL_LIBRARY} ${dol}{OMNIORB4_LIBRARY} ${dol}{OMNITHREAD3_LIBRARY} ${dol}{OMNIDYNAMIC4_LIBRARY} ${dol}{UUID_LIBRARY} dl pthread)
-
-file(STRINGS ${dol}{OPENRTM_INCLUDE_DIR}/rtm/version.h OPENRTM_VERSION
- NEWLINE_CONSUME)
-${sharp}set(OPENRTM_VERSION "1.1.0")
-string(REGEX MATCH "version = \"([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([a-zA-Z0-9]*)\""
- OPENRTM_VERSION "${dol}{OPENRTM_VERSION}")
-set(OPENRTM_VERSION_MAJOR ${dol}{CMAKE_MATCH_1})
-set(OPENRTM_VERSION_MINOR ${dol}{CMAKE_MATCH_2})
-set(OPENRTM_VERSION_REVISION ${dol}{CMAKE_MATCH_3})
-set(OPENRTM_VERSION_CANDIDATE ${dol}{CMAKE_MATCH_4})
-
-execute_process(COMMAND rtm-config --libs-only-l OUTPUT_VARIABLE
- OPENRTM_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND rtm-config --libs-only-L OUTPUT_VARIABLE
- OPENRTM_LIBRARY_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDL_COMPILER
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDL_FLAGS
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-separate_arguments(OPENRTM_IDL_FLAGS)
-execute_process(COMMAND rtm-config --prefix OUTPUT_VARIABLE _rtm_prefix
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-set(OPENRTM_IDL_DIR
- ${dol}{_rtm_prefix}/include/openrtm-${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}/rtm/idl
- CACHE STRING "Directory containing the OpenRTM-aist IDL files.")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OpenRTM
- REQUIRED_VARS OPENRTM_INCLUDE_DIR COIL_INCLUDE_DIR OPENRTM_LIBRARY
- COIL_LIBRARY OPENRTM_IDL_COMPILER)
-
-macro(_IDL_OUTPUTS _idl _dir _result)
- set(${dol}{_result} ${dol}{_dir}/${dol}{_idl}SK.cc ${dol}{_dir}/${dol}{_idl}.hh
- ${dol}{_dir}/${dol}{_idl}DynSK.cc)
-endmacro(_IDL_OUTPUTS)
-
-
-macro(_COMPILE_IDL _idl_file)
- get_filename_component(_idl ${dol}{_idl_file} NAME_WE)
- set(_idl_srcs_var ${dol}{_idl}_SRCS)
- _IDL_OUTPUTS(${dol}{_idl} ${dol}{CMAKE_CURRENT_BINARY_DIR} ${dol}{_idl_srcs_var})
-
- add_custom_command(OUTPUT ${dol}{${dol}{_idl_srcs_var}}
- COMMAND ${dol}{OPENRTM_IDL_COMPILER} ${dol}{OPENRTM_IDL_FLAGS}
- -I${dol}{OPENRTM_IDL_DIR} ${dol}{_idl_file}
- WORKING_DIRECTORY ${dol}{CURRENT_BINARY_DIR}
- DEPENDS ${dol}{_idl_file}
- COMMENT "Compiling ${dol}{_idl_file}" VERBATIM)
- add_custom_target(${dol}{_idl}_TGT DEPENDS ${dol}{${dol}{_idl_srcs_var}})
- set(ALL_IDL_SRCS ${dol}{ALL_IDL_SRCS} ${dol}{${dol}{_idl_srcs_var}})
- if(NOT TARGET ALL_IDL_TGT)
- add_custom_target(ALL_IDL_TGT)
- endif(NOT TARGET ALL_IDL_TGT)
- add_dependencies(ALL_IDL_TGT ${dol}{_idl}_TGT)
-endmacro(_COMPILE_IDL)
-
-${sharp} Module exposed to the user
-macro(OPENRTM_COMPILE_IDL_FILES)
- foreach(idl ${dol}{ARGN})
- _COMPILE_IDL(${dol}{idl})
- endforeach(idl)
-endmacro(OPENRTM_COMPILE_IDL_FILES)
-
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc8.vcproj.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc8.vcproj.vsl 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc8.vcproj.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="${rtcParam.name}Comp"
- ProjectGUID="{${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}"
- RootNamespace="${rtcParam.name}Comp"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}Comp\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}Comp\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0500;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_libd) $(coil_libd)"
- OutputFile="$(OutDir)${yen}${rtcParam.name}Comp.exe"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}Comp\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}Comp\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0500;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_lib) $(coil_lib)"
- OutputFile="$(OutDir)${yen}${rtcParam.name}Comp.exe"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if NOT EXIST "$(SolutionDir)\\components" mkdir "$(SolutionDir)\\components"
copy "$(OutDir)\\\\${rtcParam.name}Comp.exe" "$(SolutionDir)\\components"
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{${cXXConv.getCompSourceUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.cpp"
- >
- </File>
- <File
- RelativePath="${rtcParam.name}Comp.cpp"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp"
- >
- </File>
-#end#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.cpp"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
-#end
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{${cXXConv.getCompHeaderUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.h"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h"
- >
- </File>
-#end#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
-#end
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc9.vcproj.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc9.vcproj.vsl 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_Comp_vc9.vcproj.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="${rtcParam.name}Comp"
- ProjectGUID="{${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}"
- RootNamespace="${rtcParam.name}Comp"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}Comp\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}Comp\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0500;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_libd) $(coil_libd)"
- OutputFile="$(OutDir)${yen}${rtcParam.name}Comp.exe"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}Comp\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}Comp\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0500;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_lib) $(coil_lib)"
- OutputFile="$(OutDir)${yen}${rtcParam.name}Comp.exe"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if NOT EXIST "$(SolutionDir)\\components" mkdir "$(SolutionDir)\\components"
copy "$(OutDir)\\\\${rtcParam.name}Comp.exe" "$(SolutionDir)\\components"
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{${cXXConv.getCompSourceUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.cpp"
- >
- </File>
- <File
- RelativePath="${rtcParam.name}Comp.cpp"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.cpp"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
-#end
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{${cXXConv.getCompHeaderUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.h"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
-#end
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.sln.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.sln.vsl 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.sln.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,29 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{${cXXConv.getProjectGID(${rtcParam.isTest})}}") = "${rtcParam.name}Comp", "${rtcParam.name}Comp_vc8.vcproj", "{${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{${cXXConv.getProjectGID(${rtcParam.isTest})}}") = "${rtcParam.name}", "${rtcParam.name}_vc8.vcproj", "{${cXXConv.getProjectUUID(${rtcParam.isTest})}}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Release|Win32 = Release|Win32
- Debug|Win32 = Debug|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Release|Win32.ActiveCfg = Release|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Release|Win32.Build.0 = Release|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Debug|Win32.ActiveCfg = Debug|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Debug|Win32.Build.0 = Debug|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Release|Win32.ActiveCfg = Release|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Release|Win32.Build.0 = Release|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Debug|Win32.ActiveCfg = Debug|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Debug|Win32.Build.0 = Debug|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.vcproj.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.vcproj.vsl 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc8.vcproj.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="${rtcParam.name}"
- ProjectGUID="{${cXXConv.getProjectUUID(${rtcParam.isTest})}}"
- RootNamespace="${rtcParam.name}"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
-
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_libd) $(coil_libd)"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_lib) $(coil_lib)"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if NOT EXIST "$(SolutionDir)\\components" mkdir "$(SolutionDir)\\components"
copy "$(OutDir)\\\\${rtcParam.name}.dll" "$(SolutionDir)\\components"
"
- />
- </Configuration>
- </Configurations>
-
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{${cXXConv.getSourceUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.cpp"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.cpp"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
-#end
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{${cXXConv.getHeaderUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.h"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
-#end
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.sln.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.sln.vsl 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.sln.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,29 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "${rtcParam.name}Comp", "${rtcParam.name}Comp_vc9.vcproj", "{${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "${rtcParam.name}", "${rtcParam.name}_vc9.vcproj", "{${cXXConv.getProjectUUID(${rtcParam.isTest})}}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Release|Win32 = Release|Win32
- Debug|Win32 = Debug|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Release|Win32.ActiveCfg = Release|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Release|Win32.Build.0 = Release|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Debug|Win32.ActiveCfg = Debug|Win32
- {${cXXConv.getCompProjectUUID(${rtcParam.isTest})}}.Debug|Win32.Build.0 = Debug|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Release|Win32.ActiveCfg = Release|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Release|Win32.Build.0 = Release|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Debug|Win32.ActiveCfg = Debug|Win32
- {${cXXConv.getProjectUUID(${rtcParam.isTest})}}.Debug|Win32.Build.0 = Debug|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.vcproj.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.vcproj.vsl 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_vc9.vcproj.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="${rtcParam.name}"
- ProjectGUID="{${cXXConv.getProjectUUID(${rtcParam.isTest})}}"
- RootNamespace="${rtcParam.name}"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_libd) $(coil_libd)"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ProjectDir)${rtcParam.name}\$(ConfigurationName)"
- IntermediateDirectory="${rtcParam.name}\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="0"
- InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="."
- PreprocessorDefinitions="USE_stub_in_nt_dll;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="$(rtm_lib) $(coil_lib)"
- LinkIncremental="1"
- GenerateDebugInformation="false"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if NOT EXIST "$(SolutionDir)\\components" mkdir "$(SolutionDir)\\components"
copy "$(OutDir)\\\\${rtcParam.name}.dll" "$(SolutionDir)\\components"
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{${cXXConv.getSourceUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.cpp"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.cpp"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp"
- >
- </File>
-#end
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{${cXXConv.getHeaderUUID(${rtcParam.isTest})}}"
- >
- <File
- RelativePath="${rtcParam.name}.h"
- >
- </File>
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h"
- >
- </File>
-#end
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h"
- >
- </File>
-#end
-#foreach($idlFile in ${rtcParam.includedIdlPathes})
- <File
- RelativePath="${tmpltHelper.getFilenameNoExt(${idlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h"
- >
- </File>
-#end
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/Makefile.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/Makefile.vsl 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/Makefile.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,97 +0,0 @@
-# -*- Makefile -*-
-#
-# @file Makefile.${rtcParam.name}
-# @brief RTComponent makefile for "${rtcParam.name} component"
-# @date ${dol}Date${dol}
-#
-# This file is generated by rtc-template with the following argments.
-#
-#parse("${template}/common/_commandline.vsl")
-#
-#
-#set( $Id$ = "dummy" )
-# \$Id$
-#
-CXXFLAGS = `rtm-config --cflags` -I.
-LDFLAGS = `rtm-config --libs`#foreach($libraryPath in ${rtcParam.libraryPathes}) -l${libraryPath}#end
-
-SHFLAGS = -shared
-
-IDLC = `rtm-config --idlc`
-IDLFLAGS = `rtm-config --idlflags` -I`rtm-config --prefix`/include/rtm/idl
-WRAPPER = rtm-skelwrapper
-WRAPPER_FLAGS = --include-dir="" --skel-suffix=${tmpltHelper.serviceSkelSuffix} --stub-suffix=${tmpltHelper.serviceStubSuffix}
-
-SKEL_OBJ = #foreach($providerIdlFile in ${rtcParam.providerIdlPathes})${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.o #end
-
-STUB_OBJ = #foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.o #end
-
-IMPL_OBJ = #foreach($providerIdlFile in ${rtcParam.providerIdlPathes})${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.o #end
-
-OBJS = ${rtcParam.name}.o $(SKEL_OBJ) $(STUB_OBJ) $(IMPL_OBJ)
-
-.SUFFIXES : .so
-
-all: ${rtcParam.name}.so ${rtcParam.name}Comp
-
-.cpp.o:
- rm -f $@
- $(CXX) $(CXXFLAGS) -c -o $@ $<
-
-.o.so:
- rm -f $@
- $(CXX) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
-
-${rtcParam.name}Comp: ${rtcParam.name}Comp.o $(OBJS)
- $(CXX) -o $@ $(OBJS) ${rtcParam.name}Comp.o $(LDFLAGS)
-
-
-clean: clean_objs clean_skelstub
- rm -f *~
-
-clean_objs:
- rm -f $(OBJS) ${rtcParam.name}Comp.o ${rtcParam.name}.so ${rtcParam.name}Comp
-
-clean_skelstub:
- rm -f *${tmpltHelper.serviceSkelSuffix}.h *${tmpltHelper.serviceSkelSuffix}.cpp
- rm -f *${tmpltHelper.serviceStubSuffix}.h *${tmpltHelper.serviceStubSuffix}.cpp
-
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
-${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp : ${tmpltHelper.getFileName(${providerIdlFile.idlFile})}
- $(IDLC) $(IDLFLAGS) #foreach($idlSearchPath in ${providerIdlFile.idlSearchPathes})-I${idlSearchPath} #end${tmpltHelper.getFileName(${providerIdlFile.idlFile})}
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=${tmpltHelper.getFileName(${providerIdlFile.idlFile})}
-${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h : ${tmpltHelper.getFileName(${providerIdlFile.idlFile})}
- $(IDLC) $(IDLFLAGS) #foreach($idlSearchPath in ${providerIdlFile.idlSearchPathes})-I${idlSearchPath} #end${tmpltHelper.getFileName(${providerIdlFile.idlFile})}
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=${tmpltHelper.getFileName(${providerIdlFile.idlFile})}
-
-#end
-
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
-${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.cpp : ${tmpltHelper.getFileName(${consumerIdlFile.idlFile})}
- $(IDLC) $(IDLFLAGS) #foreach($idlSearchPath in ${providerIdlFile.idlSearchPathes})-I${idlSearchPath} #end${tmpltHelper.getFileName(${consumerIdlFile.idlFile})}
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=${tmpltHelper.getFileName(${consumerIdlFile.idlFile})}
-${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h : ${tmpltHelper.getFileName(${consumerIdlFile.idlFile})}
- $(IDLC) $(IDLFLAGS) #foreach($idlSearchPath in ${providerIdlFile.idlSearchPathes})-I${idlSearchPath} #end${tmpltHelper.getFileName(${consumerIdlFile.idlFile})}
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=${tmpltHelper.getFileName(${consumerIdlFile.idlFile})}
-
-#end
-
-${rtcParam.name}.so: $(OBJS)
-${rtcParam.name}.o: ${rtcParam.name}.h #foreach($providerIdlFile in ${rtcParam.providerIdlPathes})${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h #end #foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h #end
-
-${rtcParam.name}Comp.o: ${rtcParam.name}Comp.cpp ${rtcParam.name}.cpp ${rtcParam.name}.h #foreach($providerIdlFile in ${rtcParam.providerIdlPathes})${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h #end
-
-
-#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
-${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.o: ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h
-${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.o: ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h
-${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.o: ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.cpp ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h
-
-#end
-
-#foreach($consumerIdlFile in ${rtcParam.consumerIdlPathes})
-${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.o: ${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.cpp ${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceSkelSuffix}.h ${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h
-${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.o: ${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.cpp ${tmpltHelper.getFilenameNoExt(${consumerIdlFile.idlFile})}${tmpltHelper.serviceStubSuffix}.h
-#end
-
-${sharp} end of Makefile
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/copyprops.bat.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/copyprops.bat.vsl 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/copyprops.bat.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,3 +0,0 @@
-
-copy "%RTM_ROOT%\etc\rtm_config.vsprops" .
-
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/user_config.vsprops.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/user_config.vsprops.vsl 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/user_config.vsprops.vsl 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="User property"
- >
- <UserMacro
- Name="user_lib"
- Value=""
- />
- <UserMacro
- Name="user_libd"
- Value=""
- />
-</VisualStudioPropertySheet>
-
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/LanguageEditorFormPage.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/LanguageEditorFormPage.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/LanguageEditorFormPage.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -36,7 +36,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -47,8 +46,6 @@
*/
public class LanguageEditorFormPage extends AbstractEditorFormPage {
- static final String LABEL_USE_OLD_BUILD = IMessageConstants.LANGUAGE_USE_OLD_BUILD;
-
private static final int LANGUAGE_VERSION = 0;
private static final int LANGUAGE_OS = 1;
//
@@ -59,9 +56,7 @@
private List<GenerateManager> managerList = null;
private Group LangGroup;
private Button cppRadio;
- private Button rubyRadio;
private List<Button> buttonList = new ArrayList<Button>();
- Button oldBuildEnvButton;
//
private Composite envSection;
private TableViewer langVersionViewer;
@@ -102,9 +97,6 @@
buttonList.add(extRadio);
}
}
- rubyRadio = createRadioCheckButton(toolkit, LangGroup, "Ruby",
- SWT.RADIO);
- rubyRadio.setEnabled(false);
load();
}
@@ -173,24 +165,6 @@
//
cppRadio = createRadioCheckButton(toolkit, LangGroup, "C++", SWT.RADIO);
cppRadio.addSelectionListener(createLanguageRadioListner());
-
- // 旧バージョンのビルド環境の指定
- Composite c = new Composite(composite, SWT.NONE);
- GridLayout gl = new GridLayout(2, false);
- c.setLayout(gl);
- gd = new GridData();
- gd.horizontalAlignment = GridData.END;
- gd.verticalAlignment = GridData.END;
- c.setLayoutData(gd);
- oldBuildEnvButton = new Button(c, SWT.CHECK);
- Label l = new Label(c, SWT.NONE);
- l.setText(LABEL_USE_OLD_BUILD);
- oldBuildEnvButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- update();
- }
- });
}
private void createHintSection(FormToolkit toolkit, ScrolledForm form) {
@@ -486,7 +460,6 @@
rtcParam.getLangArgList().addAll(langArgList);
rtcParam.setRtmVersion(rtmVersion);
}
- rtcParam.setEnableOldBuildEnv(oldBuildEnvButton.getSelection());
//
StructuredSelection selection = (StructuredSelection) langVersionViewer.getSelection();
TargetEnvParam selectParam = (TargetEnvParam) selection.getFirstElement();
@@ -537,7 +510,6 @@
}
}
}
- oldBuildEnvButton.setSelection(rtcParam.enableOldBuildEnv());
//
langVersionViewer.setInput(rtcParam.getTargetEnvs());
//
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -42,7 +42,7 @@
int resultindex = -1;
for( int intIdx=0; intIdx<targetList.size(); intIdx++ ) {
- if( targetList.get(intIdx).getName().equals(targetName) ) {
+ if( targetList.get(intIdx).getName().contains(targetName) ) {
return intIdx;
}
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -29,7 +29,6 @@
rtcParam.setMaxInstance(5);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -65,7 +64,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -39,7 +39,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
rtcParam.getPrivateAttributes().clear();
rtcParam.getPrivateAttributes().add("int private1");
@@ -63,7 +62,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/operation/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -79,7 +78,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
rtcParam.getPrivateAttributes().clear();
rtcParam.getPrivateAttributes().add("int private1");
@@ -98,7 +96,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/attribute/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -114,7 +112,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -152,7 +149,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/service2/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -170,7 +167,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -197,7 +193,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/service1/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -215,7 +211,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -231,7 +226,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/outport2/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -247,7 +242,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -262,7 +256,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/outport1/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -278,7 +272,6 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setMaxInstance(5);
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -290,7 +283,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/inport2/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -306,7 +299,6 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
- rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -317,7 +309,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/inport1/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "testComp.cpp");
checkCode(result, resourceDir, "test.h");
checkCode(result, resourceDir, "test.cpp");
@@ -333,14 +325,13 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
- rtcParam.setEnableOldBuildEnv(true);
Generator generator = new Generator();
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
String resourceDir = rootPath + "/resource/100/CXX/basic/name/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
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 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -40,171 +40,6 @@
return rootPath + "resource/100/CXX/" + name;
}
- public void testVc1() throws Exception {
- String name = "build/vc1";
-
- rtcParam.setName("foo");
- rtcParam.setDescription("test module");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("sample");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setMaxInstance(2);
-
- // 旧ビルド環境
- rtcParam.setEnableOldBuildEnv(true);
-
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
-
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedInt", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "acc", "", "", rootPath + "resource/MyService.idl",
- "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort", 0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(
- service2, "rate", "", "",
- rootPath + "resource/DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = fixturePath(name) + "/";
-
- assertEquals(17, result.size());
- checkCode(result, resourceDir, "fooComp.cpp");
- checkCode(result, resourceDir, "foo.h");
- checkCode(result, resourceDir, "foo.cpp");
- checkCode(result, resourceDir, "MyServiceSVC_impl.h");
- checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
- //
- // checkCode(result, resourceDir, "CMakeLists.txt");
- // 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, "cpack_resources/Description.txt");
- // checkCode(result, resourceDir, "cpack_resources/License.txt");
- // checkCode(result, resourceDir, "cpack_resources/License.rtf");
- // checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
- //
- checkCode(result, resourceDir, "Makefile.foo");
- checkCode(result, resourceDir, "foo_vc8.sln");
- checkCode(result, resourceDir, "foo_vc8.vcproj");
- checkCode(result, resourceDir, "fooComp_vc8.vcproj");
- checkCode(result, resourceDir, "foo_vc9.sln");
- checkCode(result, resourceDir, "foo_vc9.vcproj");
- checkCode(result, resourceDir, "fooComp_vc9.vcproj");
- checkCode(result, resourceDir, "copyprops.bat");
- checkCode(result, resourceDir, "user_config.vsprops");
- }
-
- public void testVc2() throws Exception {
- String name = "build/vc2";
-
- rtcParam.setName("foo");
- rtcParam.setDescription("test module");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("sample");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setMaxInstance(2);
-
- // 旧ビルド環境
- rtcParam.setEnableOldBuildEnv(true);
-
- List<ServicePortParam> svports = new ArrayList<ServicePortParam>();
-
- ServicePortParam sv1 = new ServicePortParam("MyServiceProvider", 0);
- List<ServicePortInterfaceParam> iflist = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam sif1 = new ServicePortInterfaceParam(sv1,
- "MyServiceProvider", "", "", fixturePath(name)
- + "/MyServiceChildMulti.idl", "MyServiceChild",
- fixturePath(name), 0);
- iflist.add(sif1);
- ServicePortInterfaceParam sif2 = new ServicePortInterfaceParam(sv1,
- "MyServiceProvider2", "", "", fixturePath(name)
- + "/MyServiceChildWithType.idl",
- "MyServiceWithTypeChild", fixturePath(name), 0);
- iflist.add(sif2);
- sv1.getServicePortInterfaces().addAll(iflist);
- svports.add(sv1);
-
- ServicePortParam sv2 = new ServicePortParam("MyServiceRequire", 0);
- iflist = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam sif3 = new ServicePortInterfaceParam(sv2,
- "MyServiceRequire", "", "", fixturePath(name)
- + "/MyServiceChildMulti.idl", "MyServiceChild",
- fixturePath(name), 1);
- iflist.add(sif3);
- ServicePortInterfaceParam sif4 = new ServicePortInterfaceParam(sv2,
- "MyServiceRequire2", "", "", fixturePath(name)
- + "/MyServiceChildWithType.idl",
- "MyServiceWithTypeChild", fixturePath(name), 1);
- iflist.add(sif4);
- sv2.getServicePortInterfaces().addAll(iflist);
- svports.add(sv2);
-
- rtcParam.getServicePorts().addAll(svports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = fixturePath(name) + "/";
-
- assertEquals(19, result.size());
- checkCode(result, resourceDir, "fooComp.cpp");
- checkCode(result, resourceDir, "foo.h");
- checkCode(result, resourceDir, "foo.cpp");
- checkCode(result, resourceDir, "MyServiceChildMultiSVC_impl.h");
- checkCode(result, resourceDir, "MyServiceChildMultiSVC_impl.cpp");
- checkCode(result, resourceDir, "MyServiceChildWithTypeSVC_impl.h");
- checkCode(result, resourceDir, "MyServiceChildWithTypeSVC_impl.cpp");
- //
- // checkCode(result, resourceDir, "CMakeLists.txt");
- // 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, "cpack_resources/Description.txt");
- // checkCode(result, resourceDir, "cpack_resources/License.txt");
- // checkCode(result, resourceDir, "cpack_resources/License.rtf");
- // checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
- //
- checkCode(result, resourceDir, "Makefile.foo");
- checkCode(result, resourceDir, "foo_vc8.sln");
- checkCode(result, resourceDir, "foo_vc8.vcproj");
- checkCode(result, resourceDir, "fooComp_vc8.vcproj");
- checkCode(result, resourceDir, "foo_vc9.sln");
- checkCode(result, resourceDir, "foo_vc9.vcproj");
- checkCode(result, resourceDir, "fooComp_vc9.vcproj");
- checkCode(result, resourceDir, "copyprops.bat");
- checkCode(result, resourceDir, "user_config.vsprops");
- }
-
public void testCMake1() throws Exception {
String name = "build/cmake1";
@@ -253,7 +88,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(30, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "src/fooComp.cpp");
checkCode(result, resourceDir, "include/foo/foo.h");
checkCode(result, resourceDir, "src/foo.cpp");
@@ -332,7 +167,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.cpp");
checkCode(result, resourceDir, "include/foo/foo.h");
checkCode(result, resourceDir, "src/foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -32,7 +32,6 @@
rtcParam.setMaxInstance(3);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -112,7 +111,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -32,7 +32,6 @@
rtcParam.setMaxInstance(3);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -77,7 +76,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -1,17 +1,13 @@
package jp.go.aist.rtm.rtcbuilder._test._100;
-import java.util.ArrayList;
import java.util.List;
import jp.go.aist.rtm.rtcbuilder.Generator;
import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
import jp.go.aist.rtm.rtcbuilder._test.TestBase;
import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
public class CXXContentTest extends TestBase {
@@ -39,7 +35,6 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
- rtcParam.setEnableOldBuildEnv(true);
//
rtcParam.setDetailContent(IRtcBuilderConstants.ACTIVITY_INITIALIZE, " init();");
rtcParam.setDetailContent(IRtcBuilderConstants.ACTIVITY_FINALIZE, " fin();");
@@ -59,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Content/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -24,7 +24,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -61,7 +60,7 @@
String resourceDir = rootPath + "/resource/100/CXX/DataPortIDL/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -28,7 +28,6 @@
rtcParam.setLanguageArg(LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -229,7 +228,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Doc/fullLong/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -24,7 +24,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -53,7 +52,7 @@
String resourceDir = rootPath + "/resource/100/CXX/ExecutionCxt/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -38,7 +38,6 @@
rtcParam.setMaxInstance(2);
rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
generator = new Generator();
@@ -79,7 +78,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -128,7 +127,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(19, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -25,7 +25,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -55,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceM/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -90,7 +89,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/idlmodule/serviceCon/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -125,7 +124,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArg/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -159,7 +158,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -26,7 +26,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -77,7 +76,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath3/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -132,7 +131,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath2/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -186,7 +185,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath1/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -7,7 +7,6 @@
import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
import jp.go.aist.rtm.rtcbuilder._test.TestBase;
import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
@@ -26,7 +25,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -58,7 +56,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlstruct/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "TestModuleComp.cpp");
checkCode(result, resourceDir, "TestModule.h");
checkCode(result, resourceDir, "TestModule.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -25,7 +25,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
}
public void testIDLStruct() throws Exception {
@@ -57,7 +56,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -93,7 +92,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/SeqString/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -164,7 +163,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct2/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -201,7 +200,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -22,7 +22,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -54,7 +53,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/all/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -81,7 +80,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/execute/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -107,7 +106,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/finalize/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -130,7 +129,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/initialize/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -23,7 +23,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -48,7 +47,7 @@
String resourceDir = rootPath + "/resource/100/CXX/library/library2/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -74,7 +73,7 @@
String resourceDir = rootPath + "/resource/100/CXX/library/library1/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -25,7 +25,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -55,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -85,14 +84,13 @@
srvports.add(service1);
rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
Generator generator = new Generator();
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
- assertEquals(34, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -128,7 +126,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Manip/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -35,7 +35,6 @@
rtcParam.setMaxInstance(2);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
@@ -88,7 +87,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProConMulti/";
- assertEquals(19, result.size());
+ assertEquals(31, result.size());
checkResults(result, resourceDir);
checkCode(result, resourceDir, "MyServiceSVC_impl.h");
checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -120,7 +119,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ConMulti/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkResults(result, resourceDir);
nonexist(result, resourceDir, "MyServiceSVC_impl.h");
nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -152,7 +151,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProMulti/";
- assertEquals(19, result.size());
+ assertEquals(31, result.size());
checkResults(result, resourceDir);
checkCode(result, resourceDir, "MyServiceSVC_impl.h");
checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -36,7 +36,6 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
//
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
@@ -220,7 +219,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -25,7 +25,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -59,7 +58,7 @@
String resourceDir = rootPath + "/resource/100/CXX/SystemConfig/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -25,7 +25,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -54,7 +53,7 @@
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
String targetDir = rootPath + "/resource/100/CXX/AIST2/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, targetDir, "ModuleNameComp.cpp");
checkCode(result, targetDir, "ModuleName.h");
checkCode(result, targetDir, "ModuleName.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2017-01-24 14:16:57 UTC (rev 661)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2017-01-24 14:17:45 UTC (rev 662)
@@ -26,7 +26,6 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -77,7 +76,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort2/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -132,7 +131,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort1/";
- assertEquals(17, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -168,7 +167,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Variable/DataPort/";
- assertEquals(15, result.size());
+ assertEquals(27, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
More information about the openrtm-commit
mailing list