[openrtm-commit:00894] r355 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java: 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/idlinherit/inherit1 resource/100/idlinherit/inherit2 resource/100/idltype/type1 resource/100/idltype/type2 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/java
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 9月 30日 (日) 02:32:22 JST
Author:
Date: 2012-09-30 02:32:22 +0900 (Sun, 30 Sep 2012)
New Revision: 355
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/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/.classpath
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath
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.bat
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/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit1/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit2/build_foo.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type1/build_test.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type2/build_test.xml
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/JavaGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/classpath.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.bat.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl
Log:
Update OpenRTM Jar file version
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ConMulti/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -10,20 +10,17 @@
<property name="source" value="src" />
<property name="dest" value="bin" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'MyService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/MyService.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'DAQService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/DAQService.idl'"/>
</exec>
</target>
-
<target name="compile" depends="idlcompile">
<javac srcdir="${source}" destdir="${dest}">
<classpath>
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProConMulti/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -10,23 +10,20 @@
<property name="source" value="src" />
<property name="dest" value="bin" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'MyService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/MyService.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'MyService2.idl'"/>
+ <arg line="-td 'src' -fall 'idl/MyService2.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'DAQService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/DAQService.idl'"/>
</exec>
</target>
-
<target name="compile" depends="idlcompile">
<javac srcdir="${source}" destdir="${dest}">
<classpath>
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/Multi/ProMulti/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -10,20 +10,17 @@
<property name="source" value="src" />
<property name="dest" value="bin" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'MyService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/MyService.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'DAQService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/DAQService.idl'"/>
</exec>
</target>
-
<target name="compile" depends="idlcompile">
<javac srcdir="${source}" destdir="${dest}">
<classpath>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/.classpath 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/.classpath 2012-09-29 17:32:22 UTC (rev 355)
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.0.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files (x86)/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.1.0.jar"/>
<classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath 2012-09-29 17:32:22 UTC (rev 355)
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.0.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files (x86)/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.1.0.jar"/>
<classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath 2012-09-29 17:32:22 UTC (rev 355)
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.0.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files (x86)/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.1.0.jar"/>
<classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath 2012-09-29 17:32:22 UTC (rev 355)
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.0.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files (x86)/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.1.0.jar"/>
<classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath 2012-09-29 17:32:22 UTC (rev 355)
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.0.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files (x86)/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.1.0.jar"/>
<classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
+</classpath>
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service1/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -10,17 +10,14 @@
<property name="source" value="src" />
<property name="dest" value="bin" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'MyService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/MyService.idl'"/>
</exec>
</target>
-
<target name="compile" depends="idlcompile">
<javac srcdir="${source}" destdir="${dest}">
<classpath>
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/service2/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -10,20 +10,17 @@
<property name="source" value="src" />
<property name="dest" value="bin" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'MyService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/MyService.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'DAQService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/DAQService.idl'"/>
</exec>
</target>
-
<target name="compile" depends="idlcompile">
<javac srcdir="${source}" destdir="${dest}">
<classpath>
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -15,10 +15,10 @@
</target>
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'MyService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/MyService.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'DAQService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/DAQService.idl'"/>
</exec>
</target>
<target name="compile" depends="idlcompile">
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.bat 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.bat 2012-09-29 17:32:22 UTC (rev 355)
@@ -1,4 +1,4 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.0.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
cd /d %~dp0
cd bin
java fooComp -f rtc.conf %*
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh 2012-09-29 17:32:22 UTC (rev 355)
@@ -5,6 +5,6 @@
echo "Abort."
exit 1
fi
-export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.0.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
+export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.1.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
cd `dirname $0`/bin
java fooComp -f rtc.conf $*
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/build_foo.xml 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -15,19 +15,19 @@
</target>
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/build/cmake2' -i '__ROOT_PATH__resource/100/build/cmake2' -fall 'MyServiceChildMulti.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -fall 'idl/MyServiceChildMulti.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/build/cmake2' -i '__ROOT_PATH__resource/100/build/cmake2' -fall 'MyServiceParent1.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -fall 'idl/MyServiceParent1.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/build/cmake2' -i '__ROOT_PATH__resource/100/build/cmake2' -fall 'MyServiceParent2.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -fall 'idl/MyServiceParent2.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/build/cmake2' -i '__ROOT_PATH__resource/100/build/cmake2' -fall 'MyServiceChildWithType.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -fall 'idl/MyServiceChildWithType.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/build/cmake2' -i '__ROOT_PATH__resource/100/build/cmake2' -fall 'MyServiceParentWithType.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/build/cmake2' -fall 'idl/MyServiceParentWithType.idl'"/>
</exec>
</target>
<target name="compile" depends="idlcompile">
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat 2012-09-29 17:32:22 UTC (rev 355)
@@ -1,4 +1,4 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.0.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
cd /d %~dp0
cd bin
java fooComp -f rtc.conf %*
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh 2012-09-29 17:32:22 UTC (rev 355)
@@ -5,6 +5,6 @@
echo "Abort."
exit 1
fi
-export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.0.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
+export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.1.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
cd `dirname $0`/bin
java fooComp -f rtc.conf $*
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit1/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit1/build_foo.xml 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit1/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -10,19 +10,18 @@
<property name="source" value="src" />
<property name="dest" value="bin" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -fall 'MyServiceChildMulti.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -fall 'idl/MyServiceChildMulti.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -fall 'MyServiceParent1.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -fall 'idl/MyServiceParent1.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -i '__ROOT_PATH__resource/100/idlinherit/inherit1' -fall 'MyServiceParent2.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit1' -fall 'idl/MyServiceParent2.idl'"/>
</exec>
</target>
<target name="compile" depends="idlcompile">
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit2/build_foo.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit2/build_foo.xml 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idlinherit/inherit2/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -10,25 +10,24 @@
<property name="source" value="src" />
<property name="dest" value="bin" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -fall 'MyServiceChildMulti.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -fall 'idl/MyServiceChildMulti.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -fall 'MyServiceParent1.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -fall 'idl/MyServiceParent1.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -fall 'MyServiceParent2.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -fall 'idl/MyServiceParent2.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -fall 'MyServiceChildWithType.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -fall 'idl/MyServiceChildWithType.idl'"/>
</exec>
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -i '__ROOT_PATH__resource/100/idlinherit/inherit2' -fall 'MyServiceParentWithType.idl'"/>
+ <arg line="-td 'src' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -i 'D:\GlobalAssist\EclipseAISTRep\jp.go.aist.rtm.rtcbuilder.java\resource/100/idlinherit/inherit2' -fall 'idl/MyServiceParentWithType.idl'"/>
</exec>
</target>
<target name="compile" depends="idlcompile">
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type1/build_test.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type1/build_test.xml 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type1/build_test.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -15,7 +15,7 @@
</target>
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'TestIDL.idl'"/>
+ <arg line="-td 'src' -fall 'idl/TestIDL.idl'"/>
</exec>
</target>
<target name="compile" depends="idlcompile">
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type2/build_test.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type2/build_test.xml 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/idltype/type2/build_test.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -10,17 +10,14 @@
<property name="source" value="src" />
<property name="dest" value="bin" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'MyService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/MyService.idl'"/>
</exec>
</target>
-
<target name="compile" depends="idlcompile">
<javac srcdir="${source}" destdir="${dest}">
<classpath>
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceCon/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -10,17 +10,14 @@
<property name="source" value="src" />
<property name="dest" value="bin" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'MyService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/MyService.idl'"/>
</exec>
</target>
-
<target name="compile" depends="idlcompile">
<javac srcdir="${source}" destdir="${dest}">
<classpath>
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceM/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -10,17 +10,14 @@
<property name="source" value="src" />
<property name="dest" value="bin" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'MyService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/MyService.idl'"/>
</exec>
</target>
-
<target name="compile" depends="idlcompile">
<javac srcdir="${source}" destdir="${dest}">
<classpath>
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/module/serviceMC/build_foo.xml 2012-09-29 17:32:22 UTC (rev 355)
@@ -10,17 +10,14 @@
<property name="source" value="src" />
<property name="dest" value="bin" />
<property environment="env" />
-
<target name="mkdir">
<mkdir dir="${dest}" />
</target>
-
<target name="idlcompile" depends="mkdir">
<exec executable="${java.home}/../bin/idlj">
- <arg line="-td 'src' -fall 'MyService.idl'"/>
+ <arg line="-td 'src' -fall 'idl/MyService.idl'"/>
</exec>
</target>
-
<target name="compile" depends="idlcompile">
<javac srcdir="${source}" destdir="${dest}">
<classpath>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java 2012-09-29 17:32:22 UTC (rev 355)
@@ -1,5 +1,6 @@
package jp.go.aist.rtm.rtcbuilder.java.manager;
+import java.io.File;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -69,6 +70,24 @@
if (!rtcParam.isLanguageExist(LANG_JAVA) || rtcParam.getName() == null) {
return result;
}
+ String rootPath = System.getenv("RTM_JAVA_ROOT") + File.separator + "jar";
+ File targetDir = new File(rootPath);
+ File[] targetFiles = targetDir.listFiles();
+ long lastDate = 0;
+ File targetJar = null;
+ for(File target : targetFiles) {
+ if( target.getName().startsWith("OpenRTM-aist") ) {
+ if( lastDate<target.lastModified() ) {
+ targetJar = target;
+ }
+ }
+ }
+ //
+ if( targetJar!=null ) {
+ String javaVersion = targetJar.getName().substring(13,18);
+ rtcParam.setRtmJavaVersion(javaVersion);
+ }
+
Map<String, Object> contextMap = new HashMap<String, Object>();
contextMap.put("template", TEMPLATE_PATH);
contextMap.put("rtcParam", rtcParam);
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/classpath.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/classpath.vsl 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/classpath.vsl 2012-09-29 17:32:22 UTC (rev 355)
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
#if( ${tmpltHelperJava.notNullRTMRoot()} )
- <classpathentry kind="lib" path="${javaRoot}jar/OpenRTM-aist-${rtcParam.rtmVersion}.jar"/>
+ <classpathentry kind="lib" path="${javaRoot}jar/OpenRTM-aist-${rtcParam.rtmJavaVersion}.jar"/>
#end
<classpathentry kind="output" path="bin"/>
</classpath>
\ No newline at end of file
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.bat.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.bat.vsl 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.bat.vsl 2012-09-29 17:32:22 UTC (rev 355)
@@ -1,4 +1,4 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-${rtcParam.rtmVersion}.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-${rtcParam.rtmJavaVersion}.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
cd /d %~dp0
cd bin
java ${rtcParam.name}Comp -f rtc.conf %*
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 2012-09-29 17:20:53 UTC (rev 354)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl 2012-09-29 17:32:22 UTC (rev 355)
@@ -5,6 +5,6 @@
echo "Abort."
exit 1
fi
-export CLASSPATH=.:${dol}{RTM_JAVA_ROOT}/jar/OpenRTM-aist-${rtcParam.rtmVersion}.jar:${dol}{RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
+export CLASSPATH=.:${dol}{RTM_JAVA_ROOT}/jar/OpenRTM-aist-${rtcParam.rtmJavaVersion}.jar:${dol}{RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
cd `dirname ${dol}0`/bin
java ${rtcParam.name}Comp -f rtc.conf ${dol}*
More information about the openrtm-commit
mailing list