[openrtm-commit:02138] r877 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-11-24 16:57:05 +0900 (Thu, 24 Nov 2016)
New Revision: 877

Removed:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/Source/
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/bat/
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/bin/
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build_org.xml
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/installer/
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/jar/
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/sample/
Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml
Log:
[compat,->RELENG_1_2] Unnecessary directories and files have been deleted. refs #3715

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml	2016-11-22 10:29:17 UTC (rev 876)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build.xml	2016-11-24 07:57:05 UTC (rev 877)
@@ -25,6 +25,7 @@
 	<property name="source.openrtmtemp" value="src/OpenRTMTemp"/>
 
 	<property name="source.examples" value="src/RTMExamples"/>
+	<property name="source.examples.scripts" value="src/RTMExamples_scripts"/>
 
 	<property name="source.extension" value="src/Extension"/>
 
@@ -55,13 +56,8 @@
 	<property name="source.rtcprof" value="src/rtcprof"/>
 
 
-
 	<property name="dist.dir" value="jar" />
 
-	<property name="dist.bat" value="installer/resources/Source/examples/"/>
-
-	
-
 	<property name="build.dir" value="bin"/>
 
 	<property name="build.dir.test" value="tests/bin"/>
@@ -241,7 +237,7 @@
 		classpath="${dir.jsmooth}/lib/jsmoothgen-ant.jar"/>
 		<jsmoothgen project="rtcd.jsmooth"
 			skeletonroot="${dir.jsmooth}/skeletons"/>
-		<copy file="rtcd_java.exe" todir="${dist.bat}" />
+		<copy file="rtcd_java.exe" todir="${source.examples.scripts}" />
 
 		<delete file="rtcd_java.exe" />
 
@@ -405,8 +401,10 @@
 
 
 	<target name="clean" description="ビルドで生成されたファイルを削除します">
+		<delete dir="${build.dir}" />
+		<delete dir="${dist.dir}" />
+		<delete dir="docs" />
 		<delete includeEmptyDirs="true">
-			<fileset dir="${build.dir}" includes="**/*.class" />
 			<fileset dir="${build.dir.test}" includes="**/*.class" />
 		</delete>
 	</target>
@@ -414,6 +412,7 @@
 
 
 	<target name="compile" description="ソースをコンパイルします">
+		<mkdir dir="${build.dir}" />
 
 		<native2ascii encoding="UTF-8" src="${source.sdo}" dest="${source.sdotemp}" >
 
@@ -787,7 +786,7 @@
 
 		<copy todir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/${short_ver}/examples" >
 
-			<fileset dir="installer/resources/Source/examples">
+			<fileset dir="${source.examples.scripts}">
 
 				<include name="*.exe" />
 

Deleted: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build_org.xml
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build_org.xml	2016-11-22 10:29:17 UTC (rev 876)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/build_org.xml	2016-11-24 07:57:05 UTC (rev 877)
@@ -1,14 +0,0 @@
-<project name="OpenRTM-aist-0.4.0" default="jar">
-	<property name="jar.name" value="OpenRTM-aist-0.4.0"/>
-	<property name="dist.dir" value="jar" />
-	<property name="build.dir"   value="bin"/>
-
-	<target name="jar">
-		<mkdir dir="${dist.dir}" />
-		<delete file="${dist.dir}/${jar.name}.jar" />
-
-		<jar destfile="${dist.dir}/${jar.name}.jar"
-			 basedir="${build.dir}"
-			 excludes="RTMExamples/**" />
-	</target>
-</project>