[openrtm-commit:02511] r700 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java: src/jp/go/aist/rtm/rtcbuilder/java/manager src/jp/go/aist/rtm/rtcbuilder/java/template/cmake test/jp/go/aist/rtm/rtcbuilder/java/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 11日 (土) 13:31:29 JST
Author: ga
Date: 2017-03-11 13:31:29 +0900 (Sat, 11 Mar 2017)
New Revision: 700
Removed:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/wix.xsl.in.vsl
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java
Log:
Modified generated CMakeFile #3980
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java 2017-03-11 04:31:07 UTC (rev 699)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java 2017-03-11 04:31:29 UTC (rev 700)
@@ -75,14 +75,6 @@
}
// 1.0系 (CMake/cpack_resources)
-
- @Override
- public GeneratedResult generateResourceWixXSL(Map<String, Object> contextMap) {
- String outfile = "cpack_resources/wix.xsl.in";
- String infile = "cmake/wix.xsl.in.vsl";
- return generateJava(infile, outfile, contextMap);
- }
-
public GeneratedResult generateJava(String infile, String outfile,
Map<String, Object> contextMap) {
try {
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/wix.xsl.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/wix.xsl.in.vsl 2017-03-11 04:31:07 UTC (rev 699)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/wix.xsl.in.vsl 2017-03-11 04:31:29 UTC (rev 700)
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
- <xsl:output indent="yes" method="xml"/>
-
- <xsl:template match="/wix:Wix">
- <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product xmlns="http://schemas.microsoft.com/wix/2006/wi" Id="${WIX_PRODUCT_ID}" Name="@RTC_NAME@ @PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@PACKAGE_VERSION@" Manufacturer="@RTC_VENDOR@" UpgradeCode="${WIX_UPGRADECODE}">
- <Package InstallerVersion="300" Compressed="yes" Languages='1041' SummaryCodepage='932' />
- <Media Id="1" Cabinet="@RTC_NAME at .cab" EmbedCab="yes" />
- <Directory Id="TARGETDIR" Name="SourceDir" >
- <Directory Id="ProgramFilesFolder" Name="PFILE" >
- <Directory Id="OPENRTM_DIR" Name="OpenRTM-aist" >
- <Directory Id="INSTALLLOCATION" Name="@OPENRTM_VERSION_MAJOR at .@OPENRTM_VERSION_MINOR@" />
- </Directory>
- </Directory>
- </Directory>
-
- <Feature Id="APPLICATIONS" Title="@CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME@" Level="1" Description="@CPACK_COMPONENT_APPLICATIONS_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .bat')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .sh')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\bin')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\RTC.xml')]" />
- </Feature>
-
- <Feature Id="DOCUMENTS" Title="@CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_DOCUMENTS_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\doc')]" />
- </Feature>
-
- <Feature Id="SOURCES" Title="@CPACK_COMPONENT_SOURCES_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_SOURCES_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\src')]" />
- </Feature>
-
- <!--Tack on your specific wix options-->
- <UIRef Id="WixUI_FeatureTree" />
- <UIRef Id="WixUI_ErrorProgressText" />
- <WixVariable Id="WixUILicenseRtf" Value="@CPACK_RESOURCE_FILE_LICENSE@"/>
- <!-- TODO: Add Wix Specific Dialogs and features. -->
- <!-- TODO: Add artwork -->
- <!-- TODO: Add ... -->
-
- </Product>
-
- <!--Output the fragment info which heat generates-->
- <xsl:copy-of select="wix:Fragment[wix:DirectoryRef/wix:Component]" />
- <xsl:apply-templates select="wix:Fragment[wix:DirectoryRef/@Id!='TARGETDIR' and wix:DirectoryRef/wix:Directory]" />
-
- </Wix>
- </xsl:template>
-
- <xsl:template match="wix:Fragment[wix:DirectoryRef/wix:Directory]" >
- <xsl:copy>
- <xsl:apply-templates select="wix:DirectoryRef" />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:DirectoryRef" >
- <xsl:copy>
- <xsl:choose>
- <xsl:when test="wix:Directory[@Name='components']" >
- <xsl:attribute name="Id">INSTALLLOCATION</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:apply-templates />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Directory" >
- <xsl:copy>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- <xsl:attribute name="Name"><xsl:value-of select="@Name" /></xsl:attribute>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Component">
- <xsl:element name="ComponentRef" xmlns="http://schemas.microsoft.com/wix/2006/wi" >
- <xsl:attribute name="Id">
- <xsl:value-of select="@Id" />
- </xsl:attribute>
- </xsl:element>
- </xsl:template>
-
-</xsl:stylesheet>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java 2017-03-11 04:31:07 UTC (rev 699)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java 2017-03-11 04:31:29 UTC (rev 700)
@@ -83,7 +83,7 @@
String resourceDir = rootPath + "/resource/100/base/service2/";
- assertEquals(33, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -127,7 +127,7 @@
String resourceDir = rootPath + "/resource/100/base/service1/";
- assertEquals(33, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -160,7 +160,7 @@
String resourceDir = rootPath + "/resource/100/base/outport2/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -192,7 +192,7 @@
String resourceDir = rootPath + "/resource/100/base/outport1/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -221,7 +221,7 @@
String resourceDir = rootPath + "/resource/100/base/inport2/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -249,7 +249,7 @@
String resourceDir = rootPath + "/resource/100/base/inport1/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -273,7 +273,7 @@
String resourceDir = rootPath + "/resource/100/base/name/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java 2017-03-11 04:31:07 UTC (rev 699)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java 2017-03-11 04:31:29 UTC (rev 700)
@@ -89,7 +89,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(33, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -97,18 +97,6 @@
checkCode(result, resourceDir, "foo.sh");
checkCode(result, resourceDir, "foo.bat");
//
-// checkCode(result, resourceDir, "CMakeLists.txt");
-// checkCode(result, resourceDir, "Doxyfile.in");
-// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-// checkCode(result, resourceDir,
-// "cmake_modules/cmake_javacompile.cmake.in");
-// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-// checkCode(result, resourceDir, "cmake_modules/FindOpenRTMJava.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, "build_foo.xml");
}
@@ -163,7 +151,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(37, result.size());
+ assertEquals(36, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -171,18 +159,6 @@
checkCode(result, resourceDir, "foo.sh");
checkCode(result, resourceDir, "foo.bat");
//
-// checkCode(result, resourceDir, "CMakeLists.txt");
-// checkCode(result, resourceDir, "Doxyfile.in");
-// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-// checkCode(result, resourceDir,
-// "cmake_modules/cmake_javacompile.cmake.in");
-// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-// checkCode(result, resourceDir, "cmake_modules/FindOpenRTMJava.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, "build_foo.xml");
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java 2017-03-11 04:31:07 UTC (rev 699)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java 2017-03-11 04:31:29 UTC (rev 700)
@@ -58,7 +58,7 @@
String targetDir = rootPath + "/resource/100/ConfigSet/AIST7/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, targetDir, "src/ModuleNameComp.java");
checkCode(result, targetDir, "src/ModuleName.java");
checkCode(result, targetDir, "src/ModuleNameImpl.java");
@@ -87,7 +87,7 @@
String targetDir = rootPath + "/resource/100/ConfigSet/AIST6/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, targetDir, "src/ModuleNameComp.java");
checkCode(result, targetDir, "src/ModuleName.java");
checkCode(result, targetDir, "src/ModuleNameImpl.java");
@@ -114,7 +114,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset1/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -143,7 +143,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset2/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -175,7 +175,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset3/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -209,7 +209,7 @@
String resourceDir = rootPath
+ "/resource/100/ConfigSet/ConfigSetType/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java 2017-03-11 04:31:07 UTC (rev 699)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java 2017-03-11 04:31:29 UTC (rev 700)
@@ -81,7 +81,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(35, result.size());
+ assertEquals(34, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -133,7 +133,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(37, result.size());
+ assertEquals(36, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java 2017-03-11 04:31:07 UTC (rev 699)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java 2017-03-11 04:31:29 UTC (rev 700)
@@ -63,7 +63,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceM/";
- assertEquals(33, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -99,7 +99,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceCon/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -146,7 +146,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceMC/";
- assertEquals(33, result.size());
+ assertEquals(32, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java 2017-03-11 04:31:07 UTC (rev 699)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java 2017-03-11 04:31:29 UTC (rev 700)
@@ -102,7 +102,7 @@
String resourceDir = rootPath + "/resource/100/Multi/ProConMulti/";
- assertEquals(34, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -157,7 +157,7 @@
String resourceDir = rootPath + "/resource/100/Multi/ConMulti/";
- assertEquals(32, result.size());
+ assertEquals(31, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -210,7 +210,7 @@
String resourceDir = rootPath + "/resource/100/Multi/ProMulti/";
- assertEquals(34, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
openrtm-commit メーリングリストの案内