[openrtm-commit:03230] r811 - in trunk/rtmtools: . jp.go.aist.rtm.nameserviceview jp.go.aist.rtm.nameserviceview.nl1 jp.go.aist.rtm.repositoryView jp.go.aist.rtm.repositoryView.nl1 jp.go.aist.rtm.rtcbuilder jp.go.aist.rtm.rtcbuilder.java jp.go.aist.rtm.rtcbuilder.lua jp.go.aist.rtm.rtcbuilder.python jp.go.aist.rtm.systemeditor jp.go.aist.rtm.systemeditor.nl1 jp.go.aist.rtm.toolscommon jp.go.aist.rtm.toolscommon.profiles jp.go.aist.rtm.toolscommon.profiles.nl1
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 3月 8日 (木) 17:14:45 JST
Author: t-katami
Date: 2018-03-08 17:14:45 +0900 (Thu, 08 Mar 2018)
New Revision: 811
Modified:
trunk/rtmtools/install_plugins
trunk/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/build.xml
trunk/rtmtools/jp.go.aist.rtm.nameserviceview/build.xml
trunk/rtmtools/jp.go.aist.rtm.repositoryView.nl1/build.xml
trunk/rtmtools/jp.go.aist.rtm.repositoryView/build.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/build.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/build.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/build.xml
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/build.xml
trunk/rtmtools/jp.go.aist.rtm.systemeditor.nl1/build.xml
trunk/rtmtools/jp.go.aist.rtm.systemeditor/build.xml
trunk/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/build.xml
trunk/rtmtools/jp.go.aist.rtm.toolscommon.profiles/build.xml
trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.xml
trunk/rtmtools/make_packages
Log:
Made it correspond to Eclipse4.7.2. refs 4481
Modified: trunk/rtmtools/install_plugins
===================================================================
--- trunk/rtmtools/install_plugins 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/install_plugins 2018-03-08 08:14:45 UTC (rev 811)
@@ -19,7 +19,7 @@
# Eclipse plugins information
-true ${REPOSITORY:="http://download.eclipse.org/releases/juno/"}
+true ${REPOSITORY:="file:///home/openrtm/public_html/pub/eclipse/projects/oxygen,http://download.eclipse.org/releases/oxygen"}
true ${PLUGINS:="org.eclipse.emf.sdk.feature.group
org.eclipse.emf.ecore.xcore.sdk.feature.group
org.eclipse.gef.sdk.feature.group
Modified: trunk/rtmtools/jp.go.aist.rtm.nameserviceview/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.nameserviceview/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.nameserviceview/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -60,7 +60,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -58,7 +58,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.repositoryView/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.repositoryView/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.repositoryView/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -58,7 +58,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.repositoryView.nl1/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.repositoryView.nl1/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.repositoryView.nl1/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -58,7 +58,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -59,7 +59,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -54,7 +54,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -54,7 +54,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -54,7 +54,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -59,7 +59,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor.nl1/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor.nl1/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor.nl1/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -58,7 +58,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -102,7 +102,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon.profiles/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon.profiles/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon.profiles/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -63,12 +63,11 @@
projectname="${project.name}"
/>
-->
-
<ant4eclipse:targetPlatform id="eclipse-3.8">
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/build.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/build.xml 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon.profiles.nl1/build.xml 2018-03-08 08:14:45 UTC (rev 811)
@@ -50,7 +50,7 @@
<location dir="${targetPlatformLocation}" />
</ant4eclipse:targetPlatform>
<ant4eclipse:jdtClassPathLibrary name="org.eclipse.jdt.junit.JUNIT_CONTAINER/3">
- <fileset dir="${eclipse.home}/plugins/org.junit_4.11.0.v201303080030" />
+ <fileset dir="${eclipse.home}/plugins/" includes="**/*junit4*.jar" />
</ant4eclipse:jdtClassPathLibrary>
<ant4eclipse:getJdtClassPath
Modified: trunk/rtmtools/make_packages
===================================================================
--- trunk/rtmtools/make_packages 2018-03-07 04:14:29 UTC (rev 810)
+++ trunk/rtmtools/make_packages 2018-03-08 08:14:45 UTC (rev 811)
@@ -90,8 +90,8 @@
# Eclipse SDK package information
#ECLIPSE_VERSION="R-3.8-201206081200"
-#true ${ECLIPSE_VERSION:="R-3.8.1-201209141540"}
-true ${ECLIPSE_VERSION:="R-4.4.2-201502041700"}
+#true ${ECLIPSE_VERSION:="R-4.4.2-201502041700"}
+true ${ECLIPSE_VERSION:="R-4.7.2-201711300510"}
#true ${DOWNLOAD_SITE:="http://ftp.jaist.ac.jp/pub/eclipse/eclipse/downloads/drops/${ECLIPSE_VERSION}"}
true ${DOWNLOAD_SITE:="file:///home/openrtm/public_html/pub/eclipse/packages/"}
ECLIPSE_SHORTVER=`echo $ECLIPSE_VERSION | awk 'BEGIN{FS="-";}{print $2;}'`
@@ -103,8 +103,8 @@
ECLIPSE_MACOS_64="${DOWNLOAD_SITE}/eclipse-SDK-${ECLIPSE_SHORTVER}-macosx-cocoa-x86_64.tar.gz"
# Eclipse plugins information
-#true ${REPOSITORY:="http://download.eclipse.org/releases/juno/"}
-true ${REPOSITORY:="file:///home/openrtm/public_html/pub/eclipse/projects/luna,http://download.eclipse.org/releases/luna"}
+#true ${REPOSITORY:="file:///home/openrtm/public_html/pub/eclipse/projects/luna,http://download.eclipse.org/releases/luna"}
+true ${REPOSITORY:="file:///home/openrtm/public_html/pub/eclipse/projects/oxygen,http://download.eclipse.org/releases/oxygen"}
PLUGINS="org.eclipse.emf.sdk.feature.group
org.eclipse.emf.ecore.xcore.sdk.feature.group
org.eclipse.gef.sdk.feature.group
@@ -116,7 +116,8 @@
#true ${LANGPACK_URL:="http://eclipse.stu.edu.tw/technology/babel/babel_language_packs/R0.13.1/luna/BabelLanguagePack-eclipse-ja_4.4.0.v20151128080334.zip"}
#true ${LANGPACK_FILE_NAME:="pleiades.zip"}
#true ${LANGPACK_FILE_NAME:="NLpackja-eclipse-SDK-3.8.0-blancofw20120628.zip"}
-true ${LANGPACK_FILE_NAME:="BabelLanguagePack-eclipse-ja_4.4.0.v20151128080334.zip"}
+#true ${LANGPACK_FILE_NAME:="BabelLanguagePack-eclipse-ja_4.4.0.v20151128080334.zip"}
+true ${LANGPACK_FILE_NAME:="BabelLanguagePack-eclipse-ja_4.7.0.v20171231020002.zip"}
true ${LANGPACK_URL:="${DOWNLOAD_SITE}/${LANGPACK_FILE_NAME}"}
#true ${PLEIADES:="YES"}
# openrtp tool information
openrtm-commit メーリングリストの案内