[openrtm-commit:01648] r749 - in trunk/jp.go.aist.rtm.RTC: . Source/examples installer/resources/Source/examples installer/win32
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2015年 11月 4日 (水) 16:29:49 JST
Author: kawauchi
Date: 2015-11-04 16:29:49 +0900 (Wed, 04 Nov 2015)
New Revision: 749
Added:
trunk/jp.go.aist.rtm.RTC/Source/examples/set_classpath.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/search_classpath.func
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/set_classpath.bat
Modified:
trunk/jp.go.aist.rtm.RTC/Source/examples/ConfigSample.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/Connector.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/ConsoleIn.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/ConsoleOut.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConnector.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConsoleIn.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConsoleOut.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/GUIIn.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/MyServiceConsumer.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/MyServiceProvider.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/SeqIn.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/SeqOut.bat
trunk/jp.go.aist.rtm.RTC/Source/examples/SinCosOut.bat
trunk/jp.go.aist.rtm.RTC/build.xml
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestIn.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestIn.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestOut.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestOut.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Composite.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Composite.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConfigSample.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConfigSample.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Connector.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Connector.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleIn.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleIn.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleOut.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleOut.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConnector.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConnector.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleIn.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleIn.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleOut.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleOut.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/GUIIn.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/GUIIn.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceConsumer.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceConsumer.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceProvider.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceProvider.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqIn.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqIn.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqOut.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqOut.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SinCosOut.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SinCosOut.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcd_java.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcd_java.sh
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcprof_java.bat
trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcprof_java.sh
trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.yaml.in
trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py
trunk/jp.go.aist.rtm.RTC/installer/win32/build.cmd
Log:
[compat,installer,->RELENG_1_1] Version number has been updated to 1.1.1. Sample component startup script has been modified.
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/ConfigSample.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/ConfigSample.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/ConfigSample.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.ConfigSample.ConfigSampleComp -f RTMExamples/ConfigSample/rtc.conf
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/Connector.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/Connector.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/Connector.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SimpleIO.ConnectorComp
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/ConsoleIn.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/ConsoleIn.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/ConsoleIn.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SimpleIO.ConsoleInComp -f RTMExamples/SimpleIO/rtc.conf
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/ConsoleOut.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/ConsoleOut.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/ConsoleOut.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SimpleIO.ConsoleOutComp -f RTMExamples/SimpleIO/rtc.conf
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConnector.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConnector.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConnector.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.ExtTrigger.ConnectorComp
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConsoleIn.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConsoleIn.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConsoleIn.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.ExtTrigger.ConsoleInComp -f RTMExamples/ExtTrigger/rtc.conf
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConsoleOut.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConsoleOut.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/ExtConsoleOut.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.ExtTrigger.ConsoleOutComp -f RTMExamples/ExtTrigger/rtc.conf
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/GUIIn.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/GUIIn.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/GUIIn.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.GUIIn.GUIInComp -f RTMExamples/GUIIn/rtc.conf
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/MyServiceConsumer.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/MyServiceConsumer.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/MyServiceConsumer.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SimpleService.MyServiceConsumerComp -f RTMExamples/SimpleService/rtc.conf
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/MyServiceProvider.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/MyServiceProvider.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/MyServiceProvider.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SimpleService.MyServiceProviderComp -f RTMExamples/SimpleService/rtc.conf
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/SeqIn.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/SeqIn.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/SeqIn.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SeqIO.SeqInComp -f RTMExamples/SeqIO/rtc.conf
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/SeqOut.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/SeqOut.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/SeqOut.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SeqIO.SeqOutComp -f RTMExamples/SeqIO/rtc.conf
pause;
Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/SinCosOut.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/SinCosOut.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/SinCosOut.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SinCosOut.SinCosOutComp -f RTMExamples/SinCosOut/rtc.conf
pause;
Added: trunk/jp.go.aist.rtm.RTC/Source/examples/set_classpath.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/set_classpath.bat (rev 0)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/set_classpath.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -0,0 +1,5 @@
+ at echo off
+set JAR_BASE=%RTM_JAVA_ROOT%\jar\
+for /F %%A in ('dir "%JAR_BASE%OpenRTM*" /B') do (set FILE1=%%A)
+for /F %%A in ('dir "%JAR_BASE%commons-cli*" /B') do (set FILE2=%%A)
+set CLASSPATH=.;%JAR_BASE%%FILE1%;%JAR_BASE%%FILE2%
\ No newline at end of file
Modified: trunk/jp.go.aist.rtm.RTC/build.xml
===================================================================
--- trunk/jp.go.aist.rtm.RTC/build.xml 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/build.xml 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,242 +1,242 @@
-<project name="OpenRTM-aist-1.1.0" default="jar">
-
- <property name="version" value="1.1.0"/>
-
- <property name="target.name" value="OpenRTM-aist-1.1.0"/>
-
+<project name="OpenRTM-aist-1.1.1" default="jar">
-
+ <property name="version" value="1.1.1"/>
+
+ <property name="target.name" value="OpenRTM-aist-1.1.1"/>
+
+
+
<property name="source" value="src"/>
-
+
<property name="source.sdo" value="src/_SDOPackage"/>
-
+
<property name="source.sdotemp" value="src/_SDOPackageTemp"/>
-
+
<property name="source.rtc" value="src/RTC"/>
-
+
<property name="source.rtctemp" value="src/RTCTemp"/>
-
+
<property name="source.rtm" value="src/RTM"/>
-
+
<property name="source.rtmtemp" value="src/RTMTemp"/>
-
+
<property name="source.openrtm" value="src/OpenRTM"/>
-
+
<property name="source.openrtmtemp" value="src/OpenRTMTemp"/>
-
+
<property name="source.examples" value="src/RTMExamples"/>
-
+
<property name="source.extension" value="src/Extension"/>
-
+
<property name="source.examplestemp" value="src/RTMExamplesTemp"/>
-
+
<property name="source.main" value="src/jp"/>
-
+
<property name="source.common" value="src/jp/go/aist/rtm"/>
-
+
<property name="source.sunorb" value="src/jp/go/aist/ForSunOrb"/>
-
+
<property name="source.jacorb" value="src/jp/go/aist/ForJacOrb"/>
-
+
<property name="source.samples.class" value="bin/RTMExamples"/>
-
+
<property name="source.samples.java" value="src/RTMExamples"/>
-
+
<property name="source.samples.java.SimpleService" value="${source.samples.java}/SimpleService"/>
-
+
<property name="source.samples.java.AutoTest" value="${source.samples.java}/AutoTest"/>
-
+
<property name="source.test" value="tests/src"/>
-
+
<property name="source.tests.bind" value="${source.test}/jp/go/aist/rtm/bind"/>
-
+
<property name="source.rtcd" value="src/rtcd"/>
-
+
<property name="source.rtcprof" value="src/rtcprof"/>
-
-
+
+
<property name="dist.dir" value="jar" />
-
+
<property name="dist.samples" value="installer/resources/Source/examples/RTMExamples"/>
-
+
<property name="dist.bat" value="installer/resources/Source/examples/"/>
-
+
-
- <property name="distribution.dir" value="C:/distribution/" />
+
+ <property name="distribution.dir" value="C:/distribution/" />
<property name="build.dir" value="bin"/>
-
+
<property name="build.dir.test" value="tests/bin"/>
-
+
<property name="build.doc" value="installer/resources/Source/JavaDoc"/>
-
+
<property name="build.doc.us" value="installer/resources/Source/JavaDocEn"/>
-
+
<property name="build.doc.jp" value="installer/resources/Source/JavaDocJa"/>
-
+
<property name="build.dir.jar" value="installer/resources/Source/jar" />
-
+
<property name="build.dir.rtcd" value="bin/rtcd" />
-
+
<property name="build.dir.prof" value="bin/rtcprof" />
-
-
+
+
<property name="installer.dir" value="installer/resources" />
-
+
<property name="installer.script" value="installer/commands/genwxs.vbs" />
-
+
<property environment="env"/>
-
+
<!--
-
+
<property name="wix.dir" value="C:/Wix" />
-
+
-->
-
+
<property name="wix.dir" value="${env.WIX_HOME}" />
-
-
+
+
<property name="idl.path" value="idl" />
-
+
<property name="idl.path.tests" value="tests/idl" />
-
+
<property name="idl.Manager" value="${idl.path}/Manager.idl" />
-
+
<property name="idl.OpenRTM" value="${idl.path}/OpenRTM.idl" />
-
+
<property name="idl.DataPort" value="${idl.path}/DataPort.idl" />
-
+
<property name="idl.BasicDataType" value="${idl.path}/BasicDataType.idl" />
-
+
<property name="idl.ExtendedDataTypes" value="${idl.path}/ExtendedDataTypes.idl" />
-
+
<property name="idl.InterfaceDataTypes" value="${idl.path}/InterfaceDataTypes.idl" />
-
+
<property name="idl.ComponentObserver" value="${idl.path}/ComponentObserver.idl" />
-
+
<property name="idl.Logger" value="${idl.path}/Logger.idl" />
-
+
<property name="idl.LogicalTimeTriggeredEC" value="${idl.path}/LogicalTimeTriggeredEC.idl" />
<property name="idl.test.CorbaConsumer" value="${idl.path.tests}/CorbaConsumer/Hello.idl" />
-
+
<property name="idl.test.CorbaPort" value="${idl.path.tests}/CorbaPort/MyService.idl" />
-
- <property name="idl.test.TypeCast" value="${idl.path.tests}/TypeCast/Mock.idl" />
+
+ <property name="idl.test.TypeCast" value="${idl.path.tests}/TypeCast/Mock.idl" />
<property name="idl.sample" value="${source.samples.java}/MyService.idl" />
-
+
<property name="idl.autotest" value="${source.samples.java}/AutoTestService.idl" />
-
+
-
- <property name="dir.jsmooth" value="${env.JSMOOTH_HOME}"/>
+
+ <property name="dir.jsmooth" value="${env.JSMOOTH_HOME}"/>
<property name="util.source" value="util"/>
-
-
-
+
+
+
<target name="buildAll">
-
- <taskdef name="jsmoothgen"
- classname="net.charabia.jsmoothgen.ant.JSmoothGen"
- classpath="${dir.jsmooth}/lib/jsmoothgen-ant.jar"/>
+
+ <taskdef name="jsmoothgen"
+ classname="net.charabia.jsmoothgen.ant.JSmoothGen"
+ classpath="${dir.jsmooth}/lib/jsmoothgen-ant.jar"/>
<antcall target="idlCompile" />
-
+
<antcall target="idlCompileEtc" />
-
+
<antcall target="clean" />
-
+
<antcall target="compile" />
-
+
<antcall target="jar" />
-
+
<antcall target="javaExamples" />
-
+
<antcall target="createExe" />
-
+
<antcall target="javaDoc" />
-
+
<antcall target="javaInstaller" />
-
+
<antcall target="dist" />
-
+
</target>
-
-
+
+
<target name="buildInstaller">
-
- <taskdef name="jsmoothgen"
- classname="net.charabia.jsmoothgen.ant.JSmoothGen"
- classpath="${dir.jsmooth}/lib/jsmoothgen-ant.jar"/>
+
+ <taskdef name="jsmoothgen"
+ classname="net.charabia.jsmoothgen.ant.JSmoothGen"
+ classpath="${dir.jsmooth}/lib/jsmoothgen-ant.jar"/>
<antcall target="createExe" />
-
+
<antcall target="javaInstaller" />
-
+
</target>
-
-
+
+
<target name="buildAllLinux">
-
+
<antcall target="idlCompile" />
-
+
<antcall target="idlCompileEtc" />
-
+
<antcall target="clean" />
-
+
<antcall target="compile" />
-
+
<antcall target="jar" />
-
+
<antcall target="javaExamples" />
-
+
<antcall target="javaDoc" />
-
+
</target>
-
-
+
+
<target name="buildAllAndroid">
-
+
<antcall target="idlCompile" />
-
+
<antcall target="idlCompileEtc" />
-
+
<antcall target="clean" />
-
+
<antcall target="compile_android" />
-
+
<antcall target="jar" />
-
+
<antcall target="javaExamples" />
-
+
<antcall target="javaDoc" />
-
+
</target>
-
-
+
+
<target name="buildTests">
-
+
<antcall target="idlCompile" />
-
+
<antcall target="idlCompileEtc" />
-
+
<antcall target="clean" />
-
+
<antcall target="compile" />
-
+
<antcall target="jar" />
-
+
<antcall target="javaExamples" />
-
+
<antcall target="compile_tests" />
-
+
<antcall target="junit" />
-
+
</target>
-
-
+
+
<target name="jar" description="jarファイルを作成します">
<mkdir dir="${dist.dir}" />
<delete file="${dist.dir}/${target.name}.jar" />
@@ -271,9 +271,9 @@
<delete file="${build.dir.jar}/NameserviceFile.jar" />
<copy file="${dist.dir}/NameserviceFile.jar" todir="${build.dir.jar}" />
</target>
-
-
+
+
<target name="javaExamples" description="Sampleをコピーします">
<delete dir="${dist.samples}" />
<copy todir="${dist.samples}">
@@ -281,638 +281,640 @@
<fileset dir="${source.samples.java}" />
</copy>
</target>
-
-
+
+
<target name="createExe" description="exeファイルを作成します">
-
+
<delete file="rtcd.jsmooth" />
-
+
<copy file="rtcd.jsmooth.in" tofile="rtcd.jsmooth"/>
-
- <replace file="rtcd.jsmooth" token="@version@"
+
+ <replace file="rtcd.jsmooth" token="@version@"
value="${version}" />
-
- <taskdef name="jsmoothgen"
- classname="net.charabia.jsmoothgen.ant.JSmoothGen"
- classpath="${dir.jsmooth}/lib/jsmoothgen-ant.jar"/>
- <jsmoothgen project="rtcd.jsmooth"
- skeletonroot="${dir.jsmooth}/skeletons"/>
+
+ <taskdef name="jsmoothgen"
+ classname="net.charabia.jsmoothgen.ant.JSmoothGen"
+ classpath="${dir.jsmooth}/lib/jsmoothgen-ant.jar"/>
+ <jsmoothgen project="rtcd.jsmooth"
+ skeletonroot="${dir.jsmooth}/skeletons"/>
<copy file="rtcd_java.exe" todir="${dist.bat}" />
-
+
<delete file="rtcd_java.exe" />
-
+
</target>
-
+
<target name="javaDoc" description="JavaDocを作成します">
-
+
<delete dir="${build.doc}" />
-
+
<delete dir="${build.doc.jp}" />
-
+
<delete dir="${build.doc.us}" />
-
- <delete>
+
+ <delete>
<fileset dir="${util.source}" includes="*.class" />
-
- </delete>
- <javac srcdir="${util.source}" destdir="${util.source}"
+
+ </delete>
+ <javac srcdir="${util.source}" destdir="${util.source}"
encoding="Shift-JIS" />
-
+
<mkdir dir="${build.doc}" />
-
- <javadoc
- Locale="ja_JP"
- packagenames="jp.go.aist.rtm.*,jp.go.aist.rtm.RTC.*,_SDOPackage.*,RTC.*,OpenRTM.*,RTM.*"
+
+ <javadoc
+ Locale="ja_JP"
+ packagenames="jp.go.aist.rtm.*,jp.go.aist.rtm.RTC.*,_SDOPackage.*,RTC.*,OpenRTM.*,RTM.*"
sourcepath="${source}" destdir="${build.doc}"
-
+
encoding="UTF-8"
-
+
docencoding="UTF-8"
-
+
author="true" doctitle="OpenRTM-aist Java"
-
- nodeprecated="false" nodeprecatedlist="false"
+
+ nodeprecated="false" nodeprecatedlist="false"
noindex="false" nonavbar="false" notree="false"
-
- package="yes" source="1.5" splitindex="true"
- use="true" version="true" charset="UTF-8"
- classpath="lib/commons-cli-1.1.jar"
+
+ package="yes" source="1.5" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ classpath="lib/commons-cli-1.1.jar"
>
-
- <taglet name="JaOnTaglet" path="./util"/>
- <taglet name="EnOffTaglet" path="./util"/>
- </javadoc>
+
+ <taglet name="JaOnTaglet" path="./util"/>
+ <taglet name="EnOffTaglet" path="./util"/>
+ </javadoc>
<mkdir dir="${build.doc.us}" />
-
- <javadoc
- Locale="en_US"
- packagenames="jp.go.aist.rtm.*,jp.go.aist.rtm.RTC.*,_SDOPackage.*,RTC.*,OpenRTM.*,RTM.*"
+
+ <javadoc
+ Locale="en_US"
+ packagenames="jp.go.aist.rtm.*,jp.go.aist.rtm.RTC.*,_SDOPackage.*,RTC.*,OpenRTM.*,RTM.*"
sourcepath="${source}" destdir="${build.doc.us}"
-
+
encoding="UTF-8"
-
+
docencoding="UTF-8"
-
+
author="true" doctitle="OpenRTM-aist Java"
-
- nodeprecated="false" nodeprecatedlist="false"
+
+ nodeprecated="false" nodeprecatedlist="false"
noindex="false" nonavbar="false" notree="false"
-
- package="yes" source="1.5" splitindex="true"
- use="true" version="true" charset="UTF-8"
- classpath="lib/commons-cli-1.1.jar"
- >
- <taglet name="EnOnTaglet" path="./util"/>
- <taglet name="JaOffTaglet" path="./util"/>
- </javadoc>
+
+ package="yes" source="1.5" splitindex="true"
+ use="true" version="true" charset="UTF-8"
+ classpath="lib/commons-cli-1.1.jar"
+ >
+ <taglet name="EnOnTaglet" path="./util"/>
+ <taglet name="JaOffTaglet" path="./util"/>
+ </javadoc>
</target>
-
-
+
+
<target name="javaInstaller" description="インストーラを作成します">
-
- <!-- copy idl files -->
+
+ <!-- copy idl files -->
<mkdir dir="installer/resources/Source/rtm_java/idl" />
-
+
<mkdir dir="installer/resources/Source/rtm_java/idl/device_interfaces" />
-
+
<copy todir="installer/resources/Source/rtm_java/idl">
-
- <fileset dir="idl" />
+
+ <fileset dir="idl" />
</copy>
-
+
<copy todir="installer/resources/Source/rtm_java/idl/device_interfaces">
-
- <fileset dir="idl/device_interfaces" />
+
+ <fileset dir="idl/device_interfaces" />
</copy>
-
- <!-- コマンド実行 -->
+
+ <!-- コマンド実行 -->
<exec dir="installer/win32" executable="cmd">
-
+
<arg value="/c cleanup.cmd"/>
-
+
</exec>
-
- <!-- フォルダ削除 -->
+
+ <!-- フォルダ削除 -->
<delete dir="${distribution.dir}/OpenRTM-aist-Java-${version}" />
-
- <!-- フォルダ生成 -->
+
+ <!-- フォルダ生成 -->
<mkdir dir="${distribution.dir}/OpenRTM-aist-Java-${version}" />
-
+
<mkdir dir="${distribution.dir}/OpenRTM-aist-Java-${version}/Source" />
-
- <!-- 情報コピー -->
+
+ <!-- 情報コピー -->
<copy todir="${distribution.dir}/OpenRTM-aist-Java-${version}/Source">
-
- <fileset dir="installer/resources/Source" />
+
+ <fileset dir="installer/resources/Source" />
</copy>
-
-
- <!-- コマンド実行 -->
+
+
+ <!-- コマンド実行 -->
<exec dir="installer/win32" executable="cmd">
-
+
<arg value="/c build.cmd"/>
-
+
</exec>
-
+
</target>
-
-
+
+
<target name="idlCompile" description="IDLファイルをコンパイルします">
<delete dir="src/_SDOPackage" />
<delete dir="src/RTC" />
<delete dir="src/OpenRTM" />
<delete dir="src/RTM" />
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source} -i ${idl.path} -emitAll ${idl.Manager}"/>
</exec>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source} -i ${idl.path} -emitAll ${idl.OpenRTM}"/>
</exec>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source} -i ${idl.path} -emitAll ${idl.DataPort}"/>
</exec>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source} -i ${idl.path} -emitAll ${idl.BasicDataType}"/>
</exec>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source} -i ${idl.path} -emitAll ${idl.ExtendedDataTypes}"/>
</exec>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source} -i ${idl.path} -emitAll ${idl.InterfaceDataTypes}"/>
</exec>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source} -i ${idl.path} -emitAll ${idl.ComponentObserver}"/>
</exec>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source} -i ${idl.path} -emitAll ${idl.Logger}"/>
</exec>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source} -i ${idl.path} -emitAll ${idl.LogicalTimeTriggeredEC}"/>
</exec>
</target>
-
+
<target name="idlCompileEtc" description="IDLファイル(追加分)をコンパイルします">
<delete dir="${source.tests.bind}" />
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source.test} -pkgPrefix CorbaConsumer jp.go.aist.rtm.bind ${idl.test.CorbaConsumer}"/>
</exec>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source.test} -pkgPrefix CorbaPort jp.go.aist.rtm.bind ${idl.test.CorbaPort}"/>
</exec>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source.test} -pkgPrefix TypeCast jp.go.aist.rtm.bind ${idl.test.TypeCast}"/>
</exec>
-
+
<delete includeEmptyDirs="true">
<fileset dir="${source.samples.java.SimpleService}" excludes="**.idl,MyServiceConsumer**.java,MyServiceProvider**.java,MyServiceSVC_impl.java,rtc.conf" />
</delete>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source} -pkgPrefix SimpleService RTMExamples ${idl.sample}"/>
</exec>
-
+
<delete includeEmptyDirs="true">
<fileset dir="${source.samples.java.AutoTest}" excludes="**.idl,AutoTest**.java,MyServiceSVC_impl.java,**.conf" />
</delete>
-
+
<exec executable="${java.home}\..\bin\idlj">
<arg line="-v -fall -td ${source} -pkgPrefix AutoTest RTMExamples ${idl.autotest}"/>
</exec>
</target>
-
-
+
+
<target name="clean" description="ビルドで生成されたファイルを削除します">
<delete includeEmptyDirs="true">
<fileset dir="${build.dir}" includes="**/*.class" />
<fileset dir="${build.dir.test}" includes="**/*.class" />
</delete>
</target>
-
-
+
+
<target name="compile" description="ソースをコンパイルします">
-
+
<native2ascii encoding="UTF-8" src="${source.sdo}" dest="${source.sdotemp}" >
-
+
<include name="**/*.java" />
-
+
</native2ascii>
-
+
<copy todir="${source.sdo}">
-
+
<fileset dir="${source.sdotemp}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<delete dir="${source.sdotemp}" />
-
+
<native2ascii encoding="UTF-8" src="${source.rtc}" dest="${source.rtctemp}" >
-
+
<include name="**/*.java" />
-
+
</native2ascii>
-
+
<copy todir="${source.rtc}">
-
+
<fileset dir="${source.rtctemp}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<delete dir="${source.rtctemp}" />
-
+
<native2ascii encoding="UTF-8" src="${source.rtm}" dest="${source.rtmtemp}" >
-
+
<include name="**/*.java" />
-
+
</native2ascii>
-
+
<copy todir="${source.rtm}">
-
+
<fileset dir="${source.rtmtemp}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<delete dir="${source.rtmtemp}" />
-
+
<native2ascii encoding="UTF-8" src="${source.openrtm}" dest="${source.openrtmtemp}" >
-
+
<include name="**/*.java" />
-
+
</native2ascii>
-
+
<copy todir="${source.openrtm}">
-
+
<fileset dir="${source.openrtmtemp}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<delete dir="${source.openrtmtemp}" />
-
+
<javac srcdir="${source.sdo}:${source.rtc}:${source.rtm}:${source.openrtm}" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar" encoding="UTF-8" />
-
+
<javac srcdir="${source.main}" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar" encoding="UTF-8" includes="go/aist/**" excludes="go/aist/ForSunOrb/**,go/aist/ForJacOrb/**"/>
-
+
<javac srcdir="${source.rtcd}:${source.rtcprof}" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar" encoding="UTF-8"/>
-
+
<javac srcdir="${source.extension}:" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar" encoding="UTF-8" />
-
+
<delete dir="${source.examplestemp}" />
-
+
<native2ascii encoding="UTF-8" src="${source.examples}" dest="${source.examplestemp}" >
-
+
<include name="**/*.java" />
-
+
</native2ascii>
-
+
<fixcrlf srcdir="${source.examplestemp}" eol="crlf" >
-
+
<include name="**/*.java" />
-
+
</fixcrlf>
-
+
<copy todir="${source.examples}">
-
+
<fileset dir="${source.examplestemp}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<delete dir="${source.examplestemp}" />
-
+
<javac srcdir="${source.examples}:" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar" encoding="UTF-8" />
-
+
</target>
-
-
+
+
<target name="compile_android" description="ソースをコンパイルします">
-
+
<native2ascii encoding="UTF-8" src="${source.sdo}" dest="${source.sdotemp}" >
-
+
<include name="**/*.java" />
-
+
</native2ascii>
-
+
<copy todir="${source.sdo}">
-
+
<fileset dir="${source.sdotemp}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<delete dir="${source.sdotemp}" />
-
+
<native2ascii encoding="UTF-8" src="${source.rtc}" dest="${source.rtctemp}" >
-
+
<include name="**/*.java" />
-
+
</native2ascii>
-
+
<copy todir="${source.rtc}">
-
+
<fileset dir="${source.rtctemp}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<delete dir="${source.rtctemp}" />
-
+
<native2ascii encoding="UTF-8" src="${source.rtm}" dest="${source.rtmtemp}" >
-
+
<include name="**/*.java" />
-
+
</native2ascii>
-
+
<copy todir="${source.rtm}">
-
+
<fileset dir="${source.rtmtemp}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<delete dir="${source.rtmtemp}" />
-
+
<native2ascii encoding="UTF-8" src="${source.openrtm}" dest="${source.openrtmtemp}" >
-
+
<include name="**/*.java" />
-
+
</native2ascii>
-
+
<copy todir="${source.openrtm}">
-
+
<fileset dir="${source.openrtmtemp}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<delete dir="${source.openrtmtemp}" />
-
+
<javac srcdir="${source.sdo}:${source.rtc}:${source.rtm}:${source.openrtm}" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar:/usr/local/JacORB/lib/jacorb.jar:" encoding="UTF-8" />
-
+
<copy todir="${source.common}" overwrite="true" >
-
+
<fileset dir="${source.jacorb}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<javac srcdir="${source.main}:${source.rtcd}:${source.rtcprof}" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar:/usr/local/JacORB/lib/jacorb.jar:" encoding="UTF-8" includes="go/aist/**" />
-
+
<delete dir="${source.examplestemp}" />
-
+
<native2ascii encoding="UTF-8" src="${source.examples}" dest="${source.examplestemp}" >
-
+
<include name="**/*.java" />
-
+
</native2ascii>
-
+
<fixcrlf srcdir="${source.examplestemp}" eol="crlf" >
-
+
<include name="**/*.java" />
-
+
</fixcrlf>
-
+
<copy todir="${source.examples}">
-
+
<fileset dir="${source.examplestemp}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<delete dir="${source.examplestemp}" />
-
+
<copy todir="${source.common}" overwrite="true">
-
+
<fileset dir="${source.jacorb}" >
-
+
<include name="**/*.java" />
-
+
</fileset>
-
+
</copy>
-
+
<javac srcdir="${source.examples}:" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar:/usr/local/JacORB/lib/jacorb.jar:" encoding="UTF-8" includes="go/aist/**" />
-
+
</target>
-
-
+
+
<target name="compile_tests" description="ソースをコンパイルします">
-
+
<javac srcdir="${source.sdo}:${source.rtc}:${source.rtm}:${source.openrtm}" destdir="${build.dir.test}" classpath="lib/commons-cli-1.1.jar" encoding="UTF-8" />
-
+
<javac srcdir="${source.main}" destdir="${build.dir.test}" classpath="lib/commons-cli-1.1.jar" encoding="UTF-8" includes="go/aist/**" excludes="go/aist/ForSunOrb/**,go/aist/ForJacOrb/**"/>
-
+
<javac srcdir="${source.examples}:${source.extension}:${source.test}:${source.tests.bind}" destdir="${build.dir.test}" classpath="lib/commons-cli-1.1.jar:${env.JUNIT_HOME}/junit.jar" encoding="UTF-8" debug="on"/>
-
+
</target>
-
-
- <target name="junit" description="junit ソースをコンパイルします">
+
+
+ <target name="junit" description="junit ソースをコンパイルします">
<mkdir dir="${build.dir.test}/reports" />
-
+
<delete dir="${build.dir.test}/reports/*.xml" />
-
+
<delete dir="${build.dir.test}/reports/*.txt" />
-
- <junit haltonfailure="Yes" >
- <formatter type="xml" usefile="true" />
- <classpath>
- <pathelement path="bin:${env.JUNIT_HOME}/junit:${env.JUNIT_HOME}/junit/samples:${env.JUNIT_HOME}:${env.ANT_HOME}:${build.dir.test}:lib/commons-cli-1.1.jar"/>
- <pathelement location="${env.JUNIT_HOME}/junit.jar"/>
- <pathelement location="${env.ANT_HOME}/lib/ant-junit.jar"/>
- </classpath>
- <test name="jp.go.aist.rtm.AllTest110"/>
- <!--
- <test name="jp.go.aist.rtm.RTC.FactoryTest"/>
- <test name="jp.go.aist.rtm.RTC.StateMachineTests"/>
- -->
- <!--
- <batchtest todir="${build.dir.test}/reports">
- <fileSet dir="${build.dir.test}">
- <include name="jp/go/aist/rtm/RTC/*Tests.class" />
- <include name="jp/go/aist/rtm/RTC/**/*Test.class" />
- <include name="jp/go/aist/rtm/RTC/**/*Tests.class" />
- <exclude name="jp/go/aist/rtm/RTC/SampleTest.class" />
- </fileSet>
- </batchtest>
- -->
- </junit>
+
+ <junit haltonfailure="Yes" >
+ <formatter type="xml" usefile="true" />
+ <classpath>
+ <pathelement path="bin:${env.JUNIT_HOME}/junit:${env.JUNIT_HOME}/junit/samples:${env.JUNIT_HOME}:${env.ANT_HOME}:${build.dir.test}:lib/commons-cli-1.1.jar"/>
+ <pathelement location="${env.JUNIT_HOME}/junit.jar"/>
+ <pathelement location="${env.ANT_HOME}/lib/ant-junit.jar"/>
+ </classpath>
+ <test name="jp.go.aist.rtm.AllTest110"/>
+ <!--
+ <test name="jp.go.aist.rtm.RTC.FactoryTest"/>
+ <test name="jp.go.aist.rtm.RTC.StateMachineTests"/>
+ -->
+ <!--
+ <batchtest todir="${build.dir.test}/reports">
+ <fileSet dir="${build.dir.test}">
+ <include name="jp/go/aist/rtm/RTC/*Tests.class" />
+ <include name="jp/go/aist/rtm/RTC/**/*Test.class" />
+ <include name="jp/go/aist/rtm/RTC/**/*Tests.class" />
+ <exclude name="jp/go/aist/rtm/RTC/SampleTest.class" />
+ </fileSet>
+ </batchtest>
+ -->
+ </junit>
<echo>All Test complete!</echo>
</target>
-
+
<target name="dist" description="ソースをエクスポートします">
-
+
<delete dir="${dist.dir}/source/OpenRTM-aist-Java-${version}" />
-
+
<mkdir dir="${dist.dir}/source/OpenRTM-aist-Java-${version}" />
-
+
<delete file="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE.zip" />
-
+
<copy todir="${dist.dir}/source/OpenRTM-aist-Java-${version}/src" >
-
+
<fileset dir="src" />
-
+
</copy>
-
-<!--
+
+<!--
<copy todir="${dist.dir}/source/OpenRTM-aist-Java-${version}/tests" >
-
+
<fileset dir="tests" />
-
+
</copy>
-
--->
+
+-->
<copy todir="${dist.dir}/source/OpenRTM-aist-Java-${version}/idl" >
-
+
<fileset dir="idl" />
-
+
</copy>
-
+
<copy file=".project" todir="${dist.dir}/source/OpenRTM-aist-Java-${version}" />
-
+
<copy file=".classpath" todir="${dist.dir}/source/OpenRTM-aist-Java-${version}" />
-
+
<zip destfile="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE.zip" basedir="${dist.dir}/source/OpenRTM-aist-Java-${version}" />
-
-
-
-
+
+
+
+
<delete dir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/0.4" />
-
+
<delete dir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/1.0" />
-
+
<delete dir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/1.1" />
-
+
<mkdir dir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/1.1" />
-
+
<delete file="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE-jar.zip" />
-
+
<copy todir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/1.1/jar" >
-
+
<fileset dir="installer/resources/Source/jar">
-
+
<include name="rtcd.jar" />
-
+
<include name="rtcprof.jar" />
-
+
<include name="*${version}.jar" />
-
+
<include name="commons-cli-1.1.jar" />
-
+
</fileset>
-
+
<fileset dir="installer/win32">
-
+
<include name="License.txt" />
-
+
</fileset>
-
+
</copy>
-
+
<copy todir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/1.1/examples" >
-
+
<fileset dir="installer/resources/Source/examples">
-
+
<include name="*.exe" />
-
+
<include name="*.bat" />
-
+
<include name="*.sh" />
-
+
<include name="*.vbs" />
-
+
+ <include name="*.func" />
+
</fileset>
-
+
</copy>
-
+
<copy todir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/1.1/examples/RTMExamples" >
-
+
<fileset dir="installer/resources/Source/examples/RTMExamples" />
-
+
</copy>
-
+
<copy todir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/1.1/JavaDoc" >
-
+
<fileset dir="installer/resources/Source/JavaDoc" />
-
+
</copy>
-
+
<copy todir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/1.1/JavaDocEn" >
-
+
<fileset dir="installer/resources/Source/JavaDocEn" />
-
+
</copy>
-
+
<zip destfile="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE-jar.zip" basedir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar" />
-
+
<delete file="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE.tar.gz" />
-
- <tar destfile="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE.tar.gz"
- basedir="../"
- compression="gzip"
- excludes="jp.go.aist.rtm.RTC/installer/**,
- jp.go.aist.rtm.RTC/jar/source/**,
- jp.go.aist.rtm.RTC/Source/**,
- jp.go.aist.rtm.RTC/build_org.xml,
- jp.go.aist.rtm.RTC/jcoverage.ser,
- buildRTC.bat, buildRTC.sh, clean.bat,
+
+ <tar destfile="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE.tar.gz"
+ basedir="../"
+ compression="gzip"
+ excludes="jp.go.aist.rtm.RTC/installer/**,
+ jp.go.aist.rtm.RTC/jar/source/**,
+ jp.go.aist.rtm.RTC/Source/**,
+ jp.go.aist.rtm.RTC/build_org.xml,
+ jp.go.aist.rtm.RTC/jcoverage.ser,
+ buildRTC.bat, buildRTC.sh, clean.bat,
clean.sh, cmd.bat, **/*.swp" />
-
-
+
+
</target>
-
+
</project>
-
+
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestIn.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestIn.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestIn.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.AutoTest.AutoTestInComp -f RTMExamples\AutoTest\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestIn.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestIn.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestIn.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.AutoTest.AutoTestInComp -f RTMExamples/AutoTest/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestOut.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestOut.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestOut.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.AutoTest.AutoTestOutComp -f RTMExamples\AutoTest\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestOut.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestOut.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/AutoTestOut.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.AutoTest.AutoTestOutComp -f RTMExamples/AutoTest/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Composite.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Composite.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Composite.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.Composite.Composite -f RTMExamples\Composite\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Composite.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Composite.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Composite.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.Composite.Composite -f RTMExamples/Composite/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConfigSample.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConfigSample.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConfigSample.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.ConfigSample.ConfigSampleComp -f RTMExamples\ConfigSample\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConfigSample.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConfigSample.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConfigSample.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.ConfigSample.ConfigSampleComp -f RTMExamples/ConfigSample/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Connector.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Connector.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Connector.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SimpleIO.ConnectorComp %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Connector.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Connector.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/Connector.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.SimpleIO.ConnectorComp ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleIn.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleIn.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleIn.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SimpleIO.ConsoleInComp -f RTMExamples\SimpleIO\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleIn.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleIn.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleIn.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.SimpleIO.ConsoleInComp -f RTMExamples/SimpleIO/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleOut.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleOut.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleOut.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SimpleIO.ConsoleOutComp -f RTMExamples\SimpleIO\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleOut.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleOut.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ConsoleOut.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -8,6 +8,7 @@
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.SimpleIO.ConsoleOutComp -f RTMExamples/SimpleIO/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConnector.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConnector.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConnector.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.ExtTrigger.ConnectorComp %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConnector.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConnector.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConnector.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.ExtTrigger.ConnectorComp ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleIn.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleIn.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleIn.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.ExtTrigger.ConsoleInComp -f RTMExamples\ExtTrigger\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleIn.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleIn.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleIn.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.ExtTrigger.ConsoleInComp -f RTMExamples/ExtTrigger/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleOut.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleOut.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleOut.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.ExtTrigger.ConsoleOutComp -f RTMExamples\ExtTrigger\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleOut.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleOut.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/ExtConsoleOut.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.ExtTrigger.ConsoleOutComp -f RTMExamples/ExtTrigger/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/GUIIn.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/GUIIn.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/GUIIn.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.GUIIn.GUIInComp -f RTMExamples\GUIIn\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/GUIIn.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/GUIIn.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/GUIIn.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.GUIIn.GUIInComp -f RTMExamples/GUIIn/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceConsumer.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceConsumer.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceConsumer.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SimpleService.MyServiceConsumerComp -f RTMExamples\SimpleService\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceConsumer.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceConsumer.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceConsumer.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.SimpleService.MyServiceConsumerComp -f RTMExamples/SimpleService/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceProvider.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceProvider.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceProvider.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SimpleService.MyServiceProviderComp -f RTMExamples\SimpleService\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceProvider.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceProvider.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/MyServiceProvider.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.SimpleService.MyServiceProviderComp -f RTMExamples/SimpleService/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqIn.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqIn.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqIn.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SeqIO.SeqInComp -f RTMExamples\SeqIO\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqIn.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqIn.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqIn.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.SeqIO.SeqInComp -f RTMExamples/SeqIO/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqOut.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqOut.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqOut.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SeqIO.SeqOutComp -f RTMExamples\SeqIO\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqOut.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqOut.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SeqOut.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.SeqIO.SeqOutComp -f RTMExamples/SeqIO/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SinCosOut.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SinCosOut.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SinCosOut.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,3 +1,3 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+ at call set_classpath.bat
java RTMExamples.SinCosOut.SinCosOutComp -f RTMExamples\SinCosOut\rtc.conf %*
pause;
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SinCosOut.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SinCosOut.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/SinCosOut.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,5 +7,6 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java RTMExamples.SinCosOut.SinCosOutComp -f RTMExamples/SinCosOut/rtc.conf ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcd_java.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcd_java.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcd_java.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -1,6 +1,7 @@
@echo off
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar;%RTM_JAVA_ROOT%\jar\rtcd.jar;
+call set_classpath.bat
+set CLASSPATH=%CLASSPATH%;%RTM_JAVA_ROOT%\jar\rtcd.jar;
rem java -jar "%RTM_JAVA_ROOT%\jar\rtcd.jar" -f "%RTM_JAVA_ROOT%\bin\rtcd_java.conf" %*
java rtcd.rtcd -f "%RTM_JAVA_ROOT%\bin\rtcd_java.conf" %*
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcd_java.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcd_java.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcd_java.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -7,7 +7,8 @@
exit 1
fi
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`
java -jar $RTM_JAVA_ROOT/jar/rtcd.jar ${1+"$@"}
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcprof_java.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcprof_java.bat 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcprof_java.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -10,6 +10,7 @@
set _cpath_=%~f1
:exec
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar;%RTM_JAVA_ROOT%\jar\rtcprof.jar;%_cpath_%
+call set_classpath.bat
+set CLASSPATH=%CLASSPATH%;%RTM_JAVA_ROOT%\jar\rtcprof.jar;%_cpath_%
java -cp "%CLASSPATH%;" rtcprof.rtcprof %1
Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcprof_java.sh
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcprof_java.sh 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/rtcprof_java.sh 2015-11-04 07:29:49 UTC (rev 749)
@@ -17,8 +17,7 @@
;;
esac
-#export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.0.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar:$(dirname $1)
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.1.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar:$class_path
-#java -cp $CLASSPATH -jar $RTM_JAVA_ROOT/jar/rtcprof.jar ${1+"$@"}
+. ./search_classpath.func
+export CLASSPATH=`get_classpath`:$class_path
java -cp $CLASSPATH:$RTM_JAVA_ROOT/jar/rtcprof.jar rtcprof.rtcprof ${1+"$@"}
Added: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/search_classpath.func
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/search_classpath.func (rev 0)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/search_classpath.func 2015-11-04 07:29:49 UTC (rev 749)
@@ -0,0 +1,7 @@
+get_classpath()
+{
+ FILE1=`ls ${RTM_JAVA_ROOT}/jar/OpenRTM*`
+ FILE2=`ls ${RTM_JAVA_ROOT}/jar/commons-cli*`
+ CLASSPATH=.:$FILE1:$FILE2
+ echo ${CLASSPATH}
+}
Added: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/set_classpath.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/set_classpath.bat (rev 0)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/set_classpath.bat 2015-11-04 07:29:49 UTC (rev 749)
@@ -0,0 +1,5 @@
+ at echo off
+set JAR_BASE=%RTM_JAVA_ROOT%\jar\
+for /F %%A in ('dir "%JAR_BASE%OpenRTM*" /B') do (set FILE1=%%A)
+for /F %%A in ('dir "%JAR_BASE%commons-cli*" /B') do (set FILE2=%%A)
+set CLASSPATH=.;%JAR_BASE%%FILE1%;%JAR_BASE%%FILE2%
\ No newline at end of file
Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.yaml.in
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.yaml.in 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.yaml.in 2015-11-04 07:29:49 UTC (rev 749)
@@ -4,7 +4,7 @@
Id: __GUID__
Language: "1041"
Codepage: "932"
- Version: 1.1.0
+ Version: 1.1.1
ShortVersion: 1.1
Manufacturer: AIST
UpgradeCode: A8C8006F-E9D8-4528-AF4F-B8AE2D25AB47
Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py 2015-11-04 07:29:49 UTC (rev 749)
@@ -155,7 +155,7 @@
bat_dir = base_dir + "Source\\examples\\"
bat_list = ["Composite.bat", "ConfigSample.bat", "ConsoleIn.bat", "ConsoleOut.bat",
"GUIIn.bat", "MyServiceConsumer.bat", "MyServiceProvider.bat",
- "SeqIn.bat", "SeqOut.bat", "SinCosOut.bat"]
+ "SeqIn.bat", "SeqOut.bat", "SinCosOut.bat", "set_classpath.bat"]
bin_cnt = len(bat_list)
bin_list = []
for i in range(bin_cnt):
Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/build.cmd
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/build.cmd 2015-10-29 09:56:43 UTC (rev 748)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/build.cmd 2015-11-04 07:29:49 UTC (rev 749)
@@ -5,13 +5,14 @@
@rem ------------------------------------------------------------
if not DEFINED ARCH set ARCH=x86_64
if not DEFINED INCLUDE_JRE set INCLUDE_JRE=YES
+if not DEFINED RTM_JAVA_VER set RTM_JAVA_VER=1.1.1
+
@set PATH_OLD=%PATH%
@set INCLUDE_OPENRTP=YES
- at set VERSION=1.1.0
@set TARGET=OpenRTM-aist-Java
@set TARGET_WXS=%TARGET%.wxs
@set TARGET_WIXOBJ=%TARGET%.wixobj
- at set TARGET_FULL=%TARGET%_%VERSION%-RELEASE_%ARCH%
+ at set TARGET_FULL=%TARGET%_%RTM_JAVA_VER%-RELEASE_%ARCH%
if "x%ARCH%" == "xx86_64" (
@set PYTHON_DIR=C:\Python27_x64
@set OS_ARCH=64-bit OS
@@ -20,7 +21,7 @@
@set OS_ARCH=32-bit OS
)
@set PATH=%WIX%bin;%PYTHON_DIR%;%PATH%
- at set PRODUCT_NAME=OpenRTM-aist-%VERSION%-RELEASE (%OS_ARCH%) for Java
+ at set PRODUCT_NAME=OpenRTM-aist-%RTM_JAVA_VER%-RELEASE (%OS_ARCH%) for Java
@rem ------------------------------------------------------------
@rem WixUI Customization Settings
@@ -34,8 +35,7 @@
@rem default distribution package folder
@rem ------------------------------------------------------------
@set DISTRIBUTION=C:\distribution
- at set OPENRTM_JAVA=%DISTRIBUTION%\OpenRTM-aist-Java-1.1.0
- at set RTSE_ROOT=%DISTRIBUTION%\OpenRTP\RTSystemEditor
+ at set OPENRTM_JAVA=%DISTRIBUTION%\OpenRTM-aist-Java-%RTM_JAVA_VER%
@rem ------------------------------------------------------------
@rem Supported languages
@@ -54,38 +54,6 @@
)
@rem ------------------------------------------------------------
- at rem Generate RTSystemEditor wxs file
- at rem
- at rem RTSystemEditorRCP.exe should be under %RTSE_ROOT%
- at rem
- at rem ------------------------------------------------------------
- at rem *** RTSystemEditorRCP has been changed to use the merge module.
- at rem *** So this process has been deleted.
- at rem if "x%RTSE_ROOT%" == "x" (
- at rem echo Envrionment variable "RTSE_ROOT" is not set. Abort.
- at rem goto END
- at rem )
- at rem if not exist "%RTSE_ROOT%\RTSystemEditorRCP.exe" (
- at rem echo RTSystemEditorRCP.exe does not found. Abort
- at rem goto END
- at rem )
- at rem set INCLUDE_RTSE=YES
- at rem set INCLUDE_OPENRTP=YES
- at rem
- at rem if not exist OpenRTP_inc.wxs (
- at rem cd OpenRTP
- at rem rem set TMP_PYTHONPATH=%PYTHONPATH%
- at rem rem set PYTHONPATH=../;../../bin;%PYTHONPATH%
- at rem rem echo Generating OpenRTP_inc.wxs......
- at rem rem openrtpwxs.py
- at rem rem set PYTHONPATH=%TMP_PYTHONPATH%
- at rem copy OpenRTP_inc.wxs ..
- at rem cd ..
- at rem )
-
-
-
- at rem ------------------------------------------------------------
@rem Import Language-Country, Language codes, Codepages
@rem from langs.txt
@rem http://www.tramontana.co.hu/wix/lesson2.php#2.4
More information about the openrtm-commit
mailing list