[openrtm-commit:02679] r747 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java: resource/100/build/cmake1 resource/100/build/cmake2 src/jp/go/aist/rtm/rtcbuilder/java/template/cmake test/jp/go/aist/rtm/rtcbuilder/java/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 7月 13日 (木) 11:07:42 JST
Author: ga
Date: 2017-07-13 11:07:42 +0900 (Thu, 13 Jul 2017)
New Revision: 747
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/CMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
Log:
Modified CMakeLists.txt #4133
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.bat 2017-07-13 02:07:19 UTC (rev 746)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.bat 2017-07-13 02:07:42 UTC (rev 747)
@@ -1,4 +1,4 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.2.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
cd /d %~dp0
cd bin
java fooComp -f rtc.conf %*
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh 2017-07-13 02:07:19 UTC (rev 746)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh 2017-07-13 02:07:42 UTC (rev 747)
@@ -5,6 +5,6 @@
echo "Abort."
exit 1
fi
-export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.1.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
+export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.2.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
cd `dirname $0`/bin
java fooComp -f rtc.conf $*
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat 2017-07-13 02:07:19 UTC (rev 746)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.bat 2017-07-13 02:07:42 UTC (rev 747)
@@ -1,4 +1,4 @@
-set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.1.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
+set CLASSPATH=.;%RTM_JAVA_ROOT%\jar\OpenRTM-aist-1.2.0.jar;%RTM_JAVA_ROOT%\jar\commons-cli-1.1.jar
cd /d %~dp0
cd bin
java fooComp -f rtc.conf %*
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh 2017-07-13 02:07:19 UTC (rev 746)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh 2017-07-13 02:07:42 UTC (rev 747)
@@ -5,6 +5,6 @@
echo "Abort."
exit 1
fi
-export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.1.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
+export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.2.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
cd `dirname $0`/bin
java fooComp -f rtc.conf $*
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/CMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/CMakeLists.txt.vsl 2017-07-13 02:07:19 UTC (rev 746)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/cmake/CMakeLists.txt.vsl 2017-07-13 02:07:42 UTC (rev 747)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.0.2)
project(${rtcParam.name} Java)
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java 2017-07-13 02:07:19 UTC (rev 746)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java 2017-07-13 02:07:42 UTC (rev 747)
@@ -165,7 +165,7 @@
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
//
- checkCode(result, resourceDir, ".classpath");
+// checkCode(result, resourceDir, ".classpath");
checkCode(result, resourceDir, "build_foo.xml");
}
@@ -197,7 +197,7 @@
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
//
- checkCode(result, resourceDir, ".classpath");
+// checkCode(result, resourceDir, ".classpath");
checkCode(result, resourceDir, "build_foo.xml");
}
@@ -226,7 +226,7 @@
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
//
- checkCode(result, resourceDir, ".classpath");
+// checkCode(result, resourceDir, ".classpath");
checkCode(result, resourceDir, "build_foo.xml");
}
@@ -254,7 +254,7 @@
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
//
- checkCode(result, resourceDir, ".classpath");
+// checkCode(result, resourceDir, ".classpath");
checkCode(result, resourceDir, "build_foo.xml");
}
@@ -278,7 +278,7 @@
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
//
- checkCode(result, resourceDir, ".classpath");
+ //checkCode(result, resourceDir, ".classpath");
checkCode(result, resourceDir, "build_foo.xml");
}
More information about the openrtm-commit
mailing list