[openrtm-commit:00494] r600 - in branches/work/SourceSharing: . jp.go.aist.rtm.RTC

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-12-19 17:47:04 +0900 (Mon, 19 Dec 2011)
New Revision: 600

Modified:
   branches/work/SourceSharing/buildRTC.sh
   branches/work/SourceSharing/jp.go.aist.rtm.RTC/build.xml
Log:
Added the build for JacORB.  

Modified: branches/work/SourceSharing/buildRTC.sh
===================================================================
--- branches/work/SourceSharing/buildRTC.sh	2011-12-19 04:43:11 UTC (rev 599)
+++ branches/work/SourceSharing/buildRTC.sh	2011-12-19 08:47:04 UTC (rev 600)
@@ -2,21 +2,30 @@
 #
 #
 
-set DUMMY=$ANT_HOME
+DUMMY=$ANT_HOME
 export ANT_HOME=$ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/
 
+ 
+
+if test $# -eq 0 ; then
+    var_for="buildAllLinux"
+else
+    var_for=$1
+fi
+
 #
 #
 #
 cd jp.go.aist.rtm.RTC
-ant buildAllLinux -lib $ECLIPSE_HOME/plugins/net.sf.ant4eclipse.plugin_0.5.0.rc1/lib/
+#ant buildAllLinux -lib $ECLIPSE_HOME/plugins/net.sf.ant4eclipse.plugin_0.5.0.rc1/lib/
+ant $var_for -lib $ECLIPSE_HOME/plugins/net.sf.ant4eclipse.plugin_0.5.0.rc1/lib/
 if [ $? -ne 0 ];
 then 
- exit 1
+    exit 1
 fi
 echo "--"
 cd ..
 
-set ANT_HOME=$DUMMY
+export ANT_HOME=$DUMMY
 
 

Modified: branches/work/SourceSharing/jp.go.aist.rtm.RTC/build.xml
===================================================================
--- branches/work/SourceSharing/jp.go.aist.rtm.RTC/build.xml	2011-12-19 04:43:11 UTC (rev 599)
+++ branches/work/SourceSharing/jp.go.aist.rtm.RTC/build.xml	2011-12-19 08:47:04 UTC (rev 600)
@@ -172,6 +172,25 @@
 	</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" />
@@ -622,6 +641,115 @@
 	</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" />
+
+		<javac srcdir="${source.main}:${source.rtcd}:${source.rtcprof}" 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:/usr/local/JacORB/lib/jacorb.jar:"  encoding="UTF-8" />
+
+	</target>
+
+
 	<target name="compile_tests" description="ソースをコンパイルします">
 
 		<javac srcdir="${source.sdo}:${source.rtc}:${source.rtm}:${source.openrtm}:${source.main}:${source.examples}:${source.test}:${source.tests.bind}" destdir="${build.dir.test}" classpath="lib/commons-cli-1.1.jar:${env.JUNIT_HOME}/junit.jar:" encoding="UTF-8" />