[openrtm-commit:03212] r805 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java: resource/100/ConfigSet/AIST6 resource/100/ConfigSet/AIST7 resource/100/ConfigSet/ConfigSetType resource/100/ConfigSet/configset1 resource/100/ConfigSet/configset2 resource/100/ConfigSet/configset3 resource/100/Multi/ConMulti resource/100/Multi/ProConMulti resource/100/Multi/ProMulti resource/100/base/inport1 resource/100/base/inport2 resource/100/base/name resource/100/base/outport1 resource/100/base/outport2 resource/100/base/service1 resource/100/base/service2 resource/100/build/cmake1 resource/100/build/cmake2 resource/100/module/serviceCon resource/100/module/serviceM resource/100/module/serviceMC src/jp/go/aist/rtm/rtcbuilder/java/manager src/jp/go/aist/rtm/rtcbuilder/java/template/cmake src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/doc src/jp/go/aist/rtm/rtcbuilder/java/template/java test/jp/go/aist/rtm/rtcbuilder/java/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 3月 3日 (土) 22:28:34 JST
Author: ga
Date: 2018-03-03 22:28:34 +0900 (Sat, 03 Mar 2018)
New Revision: 805
Added:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/doc/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/doc/DocCMakeLists.txt.vsl
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/AIST6/build_ModuleName.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/AIST7/build_ModuleName.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/ConfigSetType/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset1/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset2/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset3/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ConMulti/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProConMulti/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProMulti/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service1/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceCon/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceM/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceMC/build_foo.xml
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/template/cmake/CMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/build.xml.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLTypeTest.java
Log:
Modified the CMakeList.txt Etc. #4471
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/AIST6/build_ModuleName.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/AIST6/build_ModuleName.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/AIST6/build_ModuleName.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,16 +6,14 @@
#
# $Id$
-->
-<project name="ModuleName" default="compile">
+<project name="ModuleName" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
-
<target name="compile" depends="mkdir">
<javac includeantruntime="false" srcdir="${source}" destdir="${dest}">
<classpath>
@@ -25,4 +23,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="ModuleName"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/AIST7/build_ModuleName.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/AIST7/build_ModuleName.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/AIST7/build_ModuleName.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,16 +6,14 @@
#
# $Id$
-->
-<project name="ModuleName" default="compile">
+<project name="ModuleName" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
-
<target name="compile" depends="mkdir">
<javac includeantruntime="false" srcdir="${source}" destdir="${dest}">
<classpath>
@@ -25,4 +23,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="ModuleName"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/ConfigSetType/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/ConfigSetType/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/ConfigSetType/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,16 +6,14 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
-
<target name="compile" depends="mkdir">
<javac includeantruntime="false" srcdir="${source}" destdir="${dest}">
<classpath>
@@ -25,4 +23,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset1/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset1/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset1/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,16 +6,14 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
-
<target name="compile" depends="mkdir">
<javac includeantruntime="false" srcdir="${source}" destdir="${dest}">
<classpath>
@@ -25,4 +23,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset2/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset2/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset2/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,16 +6,14 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
-
<target name="compile" depends="mkdir">
<javac includeantruntime="false" srcdir="${source}" destdir="${dest}">
<classpath>
@@ -25,4 +23,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset3/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset3/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/ConfigSet/configset3/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,16 +6,14 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
-
<target name="compile" depends="mkdir">
<javac includeantruntime="false" srcdir="${source}" destdir="${dest}">
<classpath>
@@ -25,4 +23,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ConMulti/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ConMulti/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ConMulti/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,9 +6,10 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
<target name="mkdir">
<mkdir dir="${dest}" />
@@ -30,4 +31,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProConMulti/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProConMulti/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProConMulti/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,9 +6,10 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
<target name="mkdir">
<mkdir dir="${dest}" />
@@ -33,4 +34,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProMulti/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProMulti/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProMulti/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,9 +6,10 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
<target name="mkdir">
<mkdir dir="${dest}" />
@@ -30,4 +31,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,16 +6,14 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
-
<target name="compile" depends="mkdir">
<javac includeantruntime="false" srcdir="${source}" destdir="${dest}">
<classpath>
@@ -25,4 +23,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,16 +6,14 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
-
<target name="compile" depends="mkdir">
<javac includeantruntime="false" srcdir="${source}" destdir="${dest}">
<classpath>
@@ -25,4 +23,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,16 +6,14 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
-
<target name="compile" depends="mkdir">
<javac includeantruntime="false" srcdir="${source}" destdir="${dest}">
<classpath>
@@ -25,4 +23,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,16 +6,14 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
-
<target name="compile" depends="mkdir">
<javac includeantruntime="false" srcdir="${source}" destdir="${dest}">
<classpath>
@@ -25,4 +23,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,16 +6,14 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
-
<target name="compile" depends="mkdir">
<javac includeantruntime="false" srcdir="${source}" destdir="${dest}">
<classpath>
@@ -25,4 +23,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service1/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service1/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service1/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,9 +6,10 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
<target name="mkdir">
<mkdir dir="${dest}" />
@@ -27,4 +28,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,9 +6,10 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
<target name="mkdir">
<mkdir dir="${dest}" />
@@ -30,4 +31,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,9 +6,10 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
<target name="mkdir">
<mkdir dir="${dest}" />
@@ -30,4 +31,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh 2018-03-03 13:28:34 UTC (rev 805)
@@ -5,7 +5,7 @@
FILE2=`ls ${RTM_JAVA_ROOT}/jar/commons-cli*`
FILE3=`ls ${RTM_JAVA_ROOT}/jar/jna-?.?.?.jar`
FILE4=`ls ${RTM_JAVA_ROOT}/jar/jna-platform-*.jar`
- CLASSPATH=.:$FILE1:$FILE2:$FILE3:$FILE4:${RTM_JAVA_ROOT}/bin:`dirname $0`/bin
+ CLASSPATH=.:$FILE1:$FILE2:$FILE3:$FILE4:${RTM_JAVA_ROOT}/bin:`dirname $0`/bin:`dirname $0`
echo ${CLASSPATH}
}
if test "x$RTM_JAVA_ROOT" = "x" ; then
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh 2018-03-03 13:28:34 UTC (rev 805)
@@ -5,7 +5,7 @@
FILE2=`ls ${RTM_JAVA_ROOT}/jar/commons-cli*`
FILE3=`ls ${RTM_JAVA_ROOT}/jar/jna-?.?.?.jar`
FILE4=`ls ${RTM_JAVA_ROOT}/jar/jna-platform-*.jar`
- CLASSPATH=.:$FILE1:$FILE2:$FILE3:$FILE4:${RTM_JAVA_ROOT}/bin:`dirname $0`/bin
+ CLASSPATH=.:$FILE1:$FILE2:$FILE3:$FILE4:${RTM_JAVA_ROOT}/bin:`dirname $0`/bin:`dirname $0`
echo ${CLASSPATH}
}
if test "x$RTM_JAVA_ROOT" = "x" ; then
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceCon/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceCon/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceCon/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,9 +6,10 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
<target name="mkdir">
<mkdir dir="${dest}" />
@@ -27,4 +28,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceM/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceM/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceM/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,9 +6,10 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
<target name="mkdir">
<mkdir dir="${dest}" />
@@ -27,4 +28,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceMC/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceMC/build_foo.xml 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceMC/build_foo.xml 2018-03-03 13:28:34 UTC (rev 805)
@@ -6,9 +6,10 @@
#
# $Id$
-->
-<project name="foo" default="compile">
+<project name="foo" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
<target name="mkdir">
<mkdir dir="${dest}" />
@@ -27,4 +28,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="foo"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaCMakeGenerateManager.java 2018-03-03 13:28:34 UTC (rev 805)
@@ -8,10 +8,8 @@
import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
import jp.go.aist.rtm.rtcbuilder.manager.CMakeGenerateManager;
import jp.go.aist.rtm.rtcbuilder.template.TemplateUtil;
-
import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
import static jp.go.aist.rtm.rtcbuilder.util.RTCUtil.form;
-
import static jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava.LANG_JAVA;
import static jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava.LANG_JAVA_ARG;
@@ -73,6 +71,15 @@
return generateJava(infile, outfile, contextMap);
}
+ // 1.0系 (CMake/doc)
+ public GeneratedResult generateDocCMakeLists(Map<String, Object> contextMap) {
+ String outfile = "doc/CMakeLists.txt";
+ String infile = "cmake/doc/DocCMakeLists.txt.vsl";
+ GeneratedResult result = generateJava(infile, outfile, contextMap);
+ result.setNotBom(true);
+ return result;
+ }
+
// 1.0系 (CMake/cpack_resources)
public GeneratedResult generateJava(String infile, String outfile,
Map<String, Object> contextMap) {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/CMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/CMakeLists.txt.vsl 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/CMakeLists.txt.vsl 2018-03-03 13:28:34 UTC (rev 805)
@@ -1,235 +1,163 @@
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 2.8)
+if(POLICY CMP0040)
+ cmake_policy(SET CMP0040 OLD)
+endif()
+if(POLICY CMP0053)
+ cmake_policy(SET CMP0053 OLD)
+endif()
-project(${rtcParam.name} Java)
+project(${rtcParam.name})
+string(TOLOWER ${dol}{PROJECT_NAME} PROJECT_NAME_LOWER)
+include("${dol}{PROJECT_SOURCE_DIR}/cmake/utils.cmake")
+set(PROJECT_VERSION ${rtcParam.version} CACHE STRING "${rtcParam.name} version")
+set(UPGRADE_GUID "")
+DISSECT_VERSION()
+set(PROJECT_SHORT_VER ${dol}{PROJECT_VERSION_MAJOR}${dol}{PROJECT_VERSION_MINOR}${dol}{PROJECT_VERSION_REVISION})
+set(PROJECT_DESCRIPTION "${rtcParam.description}")
+set(PROJECT_VENDOR "${rtcParam.vender}")
+#if( ${rtcParam.docCreator.length()} > 0 )
+set(PROJECT_MAINTAINER "${rtcParam.docCreator}")
+#else
+set(PROJECT_MAINTAINER "unknown")
+#end
+set(PROJECT_TYPE "java/${rtcParam.category}")
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-set(CMAKE_MODULE_PATH "${dol}{PROJECT_SOURCE_DIR}/cmake_modules")
+find_package(OpenRTM)
+set(RTM_VER ${dol}{OPENRTM_VERSION})
+set(RTM_SHORT_VER ${dol}{OPENRTM_VERSION_MAJOR}${dol}{OPENRTM_VERSION_MINOR}${dol}{OPENRTM_VERSION_PATCH})
-set(LINUX_PACKAGE_GENERATOR "DEB")
-${sharp}set(LINUX_PACKAGE_GENERATOR "RPM")
+function(get_dist ARG0)
+ if(NOT ${dol}{CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ set(${dol}{ARG0} ${dol}{CMAKE_SYSTEM_NAME} PARENT_SCOPE)
+ return()
+ endif()
+ foreach(dist Debian Ubuntu RedHat Fedora CentOS Raspbian)
+ execute_process(
+ COMMAND grep ${dol}{dist} -s /etc/issue /etc/os-release /etc/redhat-release /etc/system-release
+ OUTPUT_VARIABLE dist_name
+ )
+ if(${dol}{dist_name} MATCHES ${dol}{dist})
+ set(${dol}{ARG0} ${dol}{dist} PARENT_SCOPE)
+ return()
+ endif()
+ endforeach()
+endfunction(get_dist)
+function(get_pkgmgr ARG0)
+ get_dist(DIST_NAME)
+ if(${dol}{DIST_NAME} MATCHES "Debian" OR
+ ${dol}{DIST_NAME} MATCHES "Ubuntu" OR
+ ${dol}{DIST_NAME} MATCHES "Raspbian")
+ set(${dol}{ARG0} "DEB" PARENT_SCOPE)
+ return()
+ endif()
+ if(${dol}{DIST_NAME} MATCHES "RedHat" OR
+ ${dol}{DIST_NAME} MATCHES "Fedora" OR
+ ${dol}{DIST_NAME} MATCHES "CentOS")
+ set(${dol}{ARG0} "RPM" PARENT_SCOPE)
+ return()
+ endif()
+endfunction(get_pkgmgr)
-${sharp} component settings
-set(RTC_NAME "${dol}{PROJECT_NAME}")
-set(RTC_VERSION "${rtcParam.version}")
-set(RTC_VERSION_MAJOR "${helper.getVerMajor(${rtcParam.version})}")
-set(RTC_VERSION_MINOR "${helper.getVerMinor(${rtcParam.version})}")
-set(RTC_VERSION_PATCH "${helper.getVerPatch(${rtcParam.version})}")
-set(RTC_LANG "${helper.toLower(${rtcParam.language})}")
-set(RTC_DESCRIPTION "${rtcParam.description}")
-set(RTC_VENDOR "${rtcParam.vender}")
-set(RTC_MAINTAINER "unknown")
-set(PROJECT_TYPE "java/${rtcParam.category}")
+get_dist(DIST_NAME)
+MESSAGE(STATUS "Distribution is ${dol}{DIST_NAME}")
-string(TOLOWER ${dol}{RTC_NAME} PACKAGE_NAME)
-set(PACKAGE_VERSION "${dol}{RTC_VERSION_MAJOR}.${dol}{RTC_VERSION_MINOR}.${dol}{RTC_VERSION_PATCH}")
+get_pkgmgr(PKGMGR)
+if(PKGMGR AND NOT LINUX_PACKAGE_GENERATOR)
+ set(LINUX_PACKAGE_GENERATOR ${dol}{PKGMGR})
+ if(${dol}{PKGMGR} MATCHES "DEB")
+ execute_process(COMMAND dpkg --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "Package manager is ${dol}{PKGMGR}. Arch is ${dol}{CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.")
+ endif()
+ if(${dol}{PKGMGR} MATCHES "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "Package manager is ${dol}{PKGMGR}. Arch is ${dol}{CPACK_RPM_PACKAGE_ARCHITECTURE}.")
+ endif()
+endif()
-set(IDL_FILES ""
-#foreach($p in ${rtcParam.providerIdlPathes})
- ${p.idlFile}
-#end
-#foreach($p in ${rtcParam.consumerIdlPathes})
- ${p.idlFile}
-#end)
+option(BUILD_DOCUMENTATION "Build the documentation" OFF)
-set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml ${rtcParam.name}.conf rtc.conf)
+file(GLOB CLASS_FILES "${dol}{CMAKE_CURRENT_SOURCE_DIR}/bin/*.class")
+file(GLOB SUB_CLASS_DIRS "${dol}{CMAKE_CURRENT_SOURCE_DIR}/bin/*")
+list(REMOVE_ITEM SUB_CLASS_DIRS ${dol}{CLASS_FILES})
+message(STATUS "subdirectories are ${dol}{SUB_CLASS_DIRS}")
+set(EXEC_FILES ""
+ ${dol}{CLASS_FILES}
+)
-
-${sharp} check OpenRTM installed
-find_package(OpenRTMJava REQUIRED)
-
-${sharp} check doxygen installed
-find_package(Doxygen)
-if(DOXYGEN_FOUND STREQUAL "NO")
- message(FATAL_ERROR "Doxygen not found.")
+if(WIN32)
+ set(SCRIPT_FILE ""
+ ${dol}{CMAKE_CURRENT_SOURCE_DIR}/${dol}{PROJECT_NAME}.bat)
+else()
+ set(SCRIPT_FILE ""
+ ${dol}{CMAKE_CURRENT_SOURCE_DIR}/${dol}{PROJECT_NAME}.sh)
endif()
+${sharp}end
-${sharp} Java IDL settings
-get_filename_component(CMAKE_Java_HOME ${dol}{CMAKE_Java_COMPILER} PATH)
-set(CMAKE_Java_IDLJ ${dol}{CMAKE_Java_HOME}/idlj)
+set(OTHER_SRCS CMakeLists.txt
+ RTC.xml ${rtcParam.name}.conf rtc.conf)
+${sharp} check java installed
+find_package(Java)
if(WIN32)
- ${sharp} add command path
- set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OPENRTM_DIR}/bin")
- ${sharp} set install path prefix
- set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}")
- set(INSTALL_PREFIX "components/${dol}{RTC_LANG}/${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
+ set(OPENRTM_SHARE_PREFIX "OpenRTM-aist/${dol}{RTM_VER}/Components/${dol}{PROJECT_TYPE}")
+ set(INSTALL_PREFIX ${dol}{PROJECT_NAME})
+ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}Components/${dol}{PROJECT_TYPE}/${dol}{PROJECT_NAME}" CACHE PATH "..." FORCE)
+ endif()
else()
- ${sharp} add command path
- set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OPENRTM_DIR}/bin")
- ${sharp} set install path prefix
- set(CMAKE_INSTALL_PREFIX "/usr")
- ${sharp} set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}")
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}")
- set(INSTALL_PREFIX "${dol}{OPENRTM_SHARE_PREFIX}/components/${dol}{RTC_LANG}/${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}")
+ set(INSTALL_PREFIX "${dol}{OPENRTM_SHARE_PREFIX}/components/${dol}{PROJECT_TYPE}/${dol}{PROJECT_NAME}")
endif()
+foreach(target ${dol}{EXEC_FILES})
+ add_custom_command( TARGET ${dol}{PROJECT_NAME} POST_BUILD
+ COMMAND ${dol}{CMAKE_COMMAND} -E copy
+ ${dol}{PROJECT_SOURCE_DIR}/${dol}{target} ${dol}{PROJECT_BINARY_DIR}
+ )
+endforeach()
-${sharp} add uninstall target
-configure_file(
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/cmake_uninstall.cmake.in"
- "${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
- IMMEDIATE @ONLY)
-add_custom_target(uninstall COMMAND
- ${dol}{CMAKE_COMMAND} -P ${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+install(FILES ${dol}{EXEC_FILES} DESTINATION "${dol}{INSTALL_PREFIX}"
+ COMPONENT component)
+install(DIRECTORY ${dol}{SUB_CLASS_DIRS} DESTINATION "${dol}{INSTALL_PREFIX}"
+ FILES_MATCHING PATTERN "*.class")
-${sharp} add compile target
-set(JAVAC_SOURCE_DIRS ${dol}{PROJECT_SOURCE_DIR}/src ${dol}{PROJECT_BINARY_DIR}/src)
-set(JAVAC_DEST_DIR ${dol}{PROJECT_BINARY_DIR}/bin)
-set(JAVAC_CLASSPATH "${dol}{OPENRTM_CLASSPATH}")
-add_custom_target(idlcompile)
+install(PROGRAMS ${dol}{SCRIPT_FILE} DESTINATION "${dol}{INSTALL_PREFIX}"
+ COMPONENT component)
-foreach(idl ${dol}{IDL_FILES})
- add_custom_command(TARGET idlcompile PRE_BUILD
- COMMAND ${dol}{CMAKE_Java_IDLJ} -td src -fall "${dol}{PROJECT_SOURCE_DIR}/${dol}{idl}")
-endforeach()
+install(FILES ${dol}{OTHER_SRCS} DESTINATION ${dol}{INSTALL_PREFIX}
+ COMPONENT component)
+${sharp} add uninstall target
configure_file(
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/cmake_javacompile.cmake.in"
- "${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_javacompile.cmake"
+ "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cmake/uninstall_target.cmake.in"
+ "${dol}{CMAKE_CURRENT_BINARY_DIR}/uninstall_target.cmake"
IMMEDIATE @ONLY)
-add_custom_target(compile ALL
- COMMAND ${dol}{CMAKE_COMMAND} -E make_directory bin
- COMMAND ${dol}{CMAKE_COMMAND} -P ${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_javacompile.cmake)
-add_dependencies(compile idlcompile)
+add_custom_target(uninstall COMMAND
+ ${dol}{CMAKE_COMMAND} -P ${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-if(UNIX)
- add_custom_command(TARGET compile
- COMMAND ${dol}{CMAKE_COMMAND} -E copy ${dol}{CMAKE_CURRENT_SOURCE_DIR}/${dol}{RTC_NAME}.bat ${dol}{RTC_NAME}.bat
- COMMAND ${dol}{CMAKE_COMMAND} -E copy ${dol}{CMAKE_CURRENT_SOURCE_DIR}/${dol}{RTC_NAME}.sh ${dol}{RTC_NAME}.sh.dos
- COMMAND sed -e 's,\r,,' ${dol}{RTC_NAME}.sh.dos > ${dol}{RTC_NAME}.sh)
-else()
- add_custom_command(TARGET compile
- COMMAND ${dol}{CMAKE_COMMAND} -E copy ${dol}{CMAKE_CURRENT_SOURCE_DIR}/${dol}{RTC_NAME}.bat ${dol}{RTC_NAME}.bat
- COMMAND ${dol}{CMAKE_COMMAND} -E copy ${dol}{CMAKE_CURRENT_SOURCE_DIR}/${dol}{RTC_NAME}.sh ${dol}{RTC_NAME}.sh)
+if(WIN32)
+ ${sharp} start menu
+ set_property(INSTALL "${dol}{INSTALL_PREFIX}/${dol}{PROJECT_NAME}.bat"
+ PROPERTY CPACK_START_MENU_SHORTCUTS "${dol}{PROJECT_NAME}.bat")
endif()
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES bin)
-
-install(FILES RTC.xml DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "applications")
-
-install(PROGRAMS ${dol}{CMAKE_CURRENT_BINARY_DIR}/${dol}{RTC_NAME}.sh DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "applications")
-install(PROGRAMS ${dol}{CMAKE_CURRENT_BINARY_DIR}/${dol}{RTC_NAME}.bat DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "applications")
-
-install(DIRECTORY ${dol}{CMAKE_CURRENT_BINARY_DIR}/bin DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "applications")
-
-
${sharp} target settings for document
-configure_file("${dol}{CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
- "${dol}{CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
+if(BUILD_DOCUMENTATION)
+ add_subdirectory(doc)
+endif(BUILD_DOCUMENTATION)
-add_custom_target(doxygen COMMAND
- ${dol}{DOXYGEN_EXECUTABLE} ${dol}{CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+set(cpack_options "${dol}{PROJECT_BINARY_DIR}/cpack_options.cmake")
+configure_file("${dol}{PROJECT_SOURCE_DIR}/cmake/cpack_options.cmake.in"
+ ${dol}{cpack_options} @ONLY)
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
-
-install(DIRECTORY ${dol}{CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "documents")
-
-
-${sharp} install source files
-install(DIRECTORY src
- DESTINATION "${dol}{INSTALL_PREFIX}/src"
- COMPONENT "sources")
-
-install(FILES ${dol}{IDL_FILES} ${dol}{RTC_NAME}.sh ${dol}{RTC_NAME}.bat ${dol}{OTHER_SRCS}
- DESTINATION "${dol}{INSTALL_PREFIX}/src"
- COMPONENT "sources")
-
-install(DIRECTORY cmake_modules cpack_resources
- DESTINATION "${dol}{INSTALL_PREFIX}/src"
- COMPONENT "sources")
-
-
-${sharp} package settings
-set(CPACK_PACKAGE_NAME "${dol}{RTC_NAME}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${dol}{RTC_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${dol}{RTC_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${dol}{RTC_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${dol}{CPACK_PACKAGE_VERSION_MAJOR}.${dol}{CPACK_PACKAGE_VERSION_MINOR}.${dol}{CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_VENDOR "${dol}{RTC_VENDOR}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${dol}{RTC_DESCRIPTION}")
-set(CPACK_PACKAGE_CONTACT "${dol}{RTC_MAINTAINER}")
-
-set(CPACK_RESOURCE_FILE_LICENSE
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/License.txt")
-set(CPACK_PACKAGE_DESCRIPTION_FILE
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/Description.txt")
-
-set(CPACK_COMPONENTS_ALL applications documents sources)
-set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "RT-Component applications")
-set(CPACK_COMPONENT_APPLICATIONS_DISABLED FALSE)
-
-set(CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME "Documents")
-set(CPACK_COMPONENT_DOCUMENTS_DESCRIPTION "RT-Component documents")
-set(CPACK_COMPONENT_DOCUMENTS_DISABLED TRUE)
-
-set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
-set(CPACK_COMPONENT_SOURCES_DESCRIPTION "RT-Component source files")
-set(CPACK_COMPONENT_SOURCES_DISABLED TRUE)
-
-if(WIN32)
- set(CPACK_GENERATOR "WIX")
-
- ${sharp} Windows WiX package settings
-
- set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
- set(CPACK_WIX_LANG "ja-jp")
- set(CPACK_RESOURCE_FILE_LICENSE
- "@CMAKE_CURRENT_SOURCE_DIR@/cpack_resources/License.rtf")
- configure_file(
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/wix.xsl.in"
- "${dol}{CMAKE_CURRENT_BINARY_DIR}/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
-
-else()
- set(CPACK_GENERATOR "${dol}{LINUX_PACKAGE_GENERATOR}")
-
- if(CPACK_GENERATOR STREQUAL "DEB")
- ${sharp} Linux Debian package settings
-
- set(CPACK_DEBIAN_PACKAGE_VERSION "${dol}{CPACK_PACKAGE_VERSION}-1")
- set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
- set(CPACK_DEBIAN_PACKAGE_SECTION "main")
- set(CPACK_DEBIAN_PACKAGE_PRIORITY "extra")
- set(CPACK_DEBIAN_PACKAGE_DEPENDS "openrtm-aist (>= ${rtcParam.rtmVersion})")
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}_${dol}{CPACK_DEBIAN_PACKAGE_VERSION}_${dol}{CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-
- elseif(CPACK_GENERATOR STREQUAL "RPM")
- ${sharp} Linux RPM package settings
-
- set(CPACK_RPM_PACKAGE_RELEASE "1.fc10")
- set(CPACK_RPM_PACKAGE_ARCHITECTURE "i386")
- set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
- set(CPACK_RPM_PACKAGE_LICENSE "LGPL")
- set(CPACK_RPM_PACKAGE_REQUIRES "OpenRTM-aist >= ${rtcParam.rtmVersion}")
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}-${dol}{PACKAGE_VERSION}-${dol}{CPACK_RPM_PACKAGE_RELEASE}.${dol}{CPACK_RPM_PACKAGE_ARCHITECTURE}")
-
- endif()
-endif()
-
-message(STATUS "Package type: ${dol}{CPACK_GENERATOR}")
-message(STATUS "Package name: ${dol}{CPACK_PACKAGE_FILE_NAME}")
-
+set(CPACK_PROJECT_CONFIG_FILE ${dol}{cpack_options})
+include(${dol}{CPACK_PROJECT_CONFIG_FILE})
include(CPack)
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/doc/DocCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/doc/DocCMakeLists.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/doc/DocCMakeLists.txt.vsl 2018-03-03 13:28:34 UTC (rev 805)
@@ -0,0 +1,3 @@
+install(DIRECTORY "."
+ DESTINATION "${dol}{INSTALL_PREFIX}/html"
+ COMPONENT documentation)
\ No newline at end of file
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/build.xml.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/build.xml.vsl 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/build.xml.vsl 2018-03-03 13:28:34 UTC (rev 805)
@@ -7,9 +7,10 @@
#
# ${dollarStr}Id${dollarStr}
-->
-<project name="${rtcParam.name}" default="compile">
+<project name="${rtcParam.name}" default="generatedoc">
<property name="source" value="src" />
<property name="dest" value="bin" />
+ <property name="doc" value="doc" />
<property environment="env" />
<target name="mkdir">
@@ -59,4 +60,27 @@
</classpath>
</javac>
</target>
+ <target name="generatedoc" depends="compile">
+ <javadoc
+ Locale="ja_JP"
+ destdir="${dollarStr}{doc}"
+ docencoding="UTF-8"
+ author="true" doctitle="${rtcParam.name}"
+ nodeprecated="false" nodeprecatedlist="false"
+ noindex="false" nonavbar="false" notree="false"
+ package="yes" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ >
+ <classpath>
+ <fileset dir="${dollarStr}{env.RTM_JAVA_ROOT}/jar">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <sourcefiles>
+ <fileset dir="${dollarStr}{source}">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ </javadoc>
+ </target>
</project>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl 2018-03-03 13:28:34 UTC (rev 805)
@@ -5,7 +5,7 @@
FILE2=`ls ${dol}{RTM_JAVA_ROOT}/jar/commons-cli*`
FILE3=`ls ${dol}{RTM_JAVA_ROOT}/jar/jna-?.?.?.jar`
FILE4=`ls ${dol}{RTM_JAVA_ROOT}/jar/jna-platform-*.jar`
- CLASSPATH=.:${dol}FILE1:${dol}FILE2:${dol}FILE3:${dol}FILE4:${dol}{RTM_JAVA_ROOT}/bin:`dirname ${dol}0`/bin
+ CLASSPATH=.:${dol}FILE1:${dol}FILE2:${dol}FILE3:${dol}FILE4:${dol}{RTM_JAVA_ROOT}/bin:`dirname ${dol}0`/bin:`dirname ${dol}0`
echo ${dol}{CLASSPATH}
}
if test "x${dol}RTM_JAVA_ROOT" = "x" ; then
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLTypeTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLTypeTest.java 2018-03-03 13:27:28 UTC (rev 804)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLTypeTest.java 2018-03-03 13:28:34 UTC (rev 805)
@@ -66,8 +66,6 @@
checkCode(result, resourceDir, "src/test.java");
checkCode(result, resourceDir, "src/testImpl.java");
checkCode(result, resourceDir, "src/ComFkSVC_impl.java");
- //
- checkCode(result, resourceDir, "build_test.xml");
}
public void testBasicType() throws Exception {
@@ -100,8 +98,6 @@
checkCode(result, resourceDir, "src/test.java");
checkCode(result, resourceDir, "src/testImpl.java");
checkCode(result, resourceDir, "src/MyServiceSVC_impl.java");
- //
- checkCode(result, resourceDir, "build_test.xml");
}
}
More information about the openrtm-commit
mailing list