[openrtm-commit:00510] r608 - in branches/work/ForLocalService: . jp.go.aist.rtm.RTC

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-12-22 10:02:00 +0900 (Thu, 22 Dec 2011)
New Revision: 608

Modified:
   branches/work/ForLocalService/
   branches/work/ForLocalService/jp.go.aist.rtm.RTC/build.xml
Log:
For JacORB.


Property changes on: branches/work/ForLocalService
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0_0:60-401
/branches/work/ForComponentActionListener:521-522
/branches/work/ForComponentObserverConsumer:534-543
/branches/work/ForConfigurationListener:524-526
/branches/work/ForLogFormat:518-519
/branches/work/ForPortConnectListener:528-532
/branches/work/ForSDOServiceAdminClass:505-507
/branches/work/SourceSharing:591-603
/branches/work/ToGetProperties:545-548
/branches/work/ToIFR_ID:509-514
   + /branches/RELENG_1_0_0:60-401
/branches/work/ForComponentActionListener:521-522
/branches/work/ForComponentObserverConsumer:534-543
/branches/work/ForConfigurationListener:524-526
/branches/work/ForLogFormat:518-519
/branches/work/ForPortConnectListener:528-532
/branches/work/ForSDOServiceAdminClass:505-507
/branches/work/SourceSharing:591-603
/branches/work/ToGetProperties:545-548
/branches/work/ToIFR_ID:509-514
/trunk:605-607

Modified: branches/work/ForLocalService/jp.go.aist.rtm.RTC/build.xml
===================================================================
--- branches/work/ForLocalService/jp.go.aist.rtm.RTC/build.xml	2011-12-22 00:58:33 UTC (rev 607)
+++ branches/work/ForLocalService/jp.go.aist.rtm.RTC/build.xml	2011-12-22 01:02:00 UTC (rev 608)
@@ -614,7 +614,7 @@
 
 		<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}:${source.rtcd}:${source.rtcprof}" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar"  encoding="UTF-8" />
+		<javac srcdir="${source.main}:${source.rtcd}:${source.rtcprof}" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar"  encoding="UTF-8"  includes="go/aist/**" excludes="go/aist/ForSunOrb/**,go/aist/ForJacOrb/**"  />
 
 		<delete dir="${source.examplestemp}" />
 
@@ -644,6 +644,12 @@
 
 		<javac srcdir="${source.examples}:" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar"  encoding="UTF-8" />
 
+		<native2ascii encoding="UTF-8" src="${source.sdo}" dest="${source.sdotemp}" >
+
+	            <include name="**/*.java" />
+
+	        </native2ascii>
+
 		<copy todir="${source.sdo}">
 
 		    <fileset dir="${source.sdotemp}" >