[openrtm-commit:01015] r693 - trunk/jp.go.aist.rtm.RTC

[openrtm ＠ openrtm.org]

Author: ga
Date: 2013-02-18 23:54:35 +0900 (Mon, 18 Feb 2013)
New Revision: 693

Modified:
   trunk/jp.go.aist.rtm.RTC/build.xml
Log:
Fixed build.xml. refs #2591

Modified: trunk/jp.go.aist.rtm.RTC/build.xml
===================================================================
--- trunk/jp.go.aist.rtm.RTC/build.xml	2013-02-17 14:13:39 UTC (rev 692)
+++ trunk/jp.go.aist.rtm.RTC/build.xml	2013-02-18 14:54:35 UTC (rev 693)
@@ -626,10 +626,8 @@
 
 		<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/**"  />
-
-
 		<javac srcdir="${source.extension}:" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar"  encoding="UTF-8" />
 
 		<delete dir="${source.examplestemp}" />
@@ -660,48 +658,6 @@
 
 		<javac srcdir="${source.examples}:" destdir="${build.dir}" classpath="lib/commons-cli-1.1.jar"  encoding="UTF-8" />
 
-		<copy todir="${source.common}" overwrite="true">
-
-		    <fileset dir="${source.sunorb}" >
-
-		        <include name="**/*.java" />
-
-		    </fileset>
-
-		</copy>
-
-		<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}" />
-
-		<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>
 
 
@@ -791,7 +747,7 @@
 
 		</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/**" excludes="go/aist/ForSunOrb/**,go/aist/ForJacOrb/**" />
+		<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}" />
 
@@ -829,7 +785,7 @@
 
 		</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/**" excludes="go/aist/ForSunOrb/**,go/aist/ForJacOrb/**" />
+		<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>
 
@@ -870,7 +826,7 @@
 				</fileSet>
 			</batchtest>
 		</junit>
-		<echo>All Test complete!</echo>
+		<echo>All Test complete!</echo>
 	</target>
 
 	<target name="dist" description="ソースをエクスポートします">