[openrtm-commit:00986] r412 - in branches/RELENG_1_1/rtmtools: . jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/nl jp.go.aist.rtm.nameserviceview.nl1/src/jp/go/aist/rtm/nameserviceview/nl jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2013年 2月 6日 (水) 01:46:18 JST
Author: n-ando
Date: 2013-02-06 01:46:18 +0900 (Wed, 06 Feb 2013)
New Revision: 412
Modified:
branches/RELENG_1_1/rtmtools/
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/src/jp/go/aist/rtm/nameserviceview/nl/messages_ja.properties
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/nl/messages.properties
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl/messages_ja.properties
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/AboutDialog.java
branches/RELENG_1_1/rtmtools/make_packages
Log:
merged r409-411
Property changes on: branches/RELENG_1_1/rtmtools
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/rtmtools:166-393,395-396,398,400,402,404,406-407
+ /trunk/rtmtools:166-393,395-396,398,400,402,404,406-407,409-411
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/nl/messages.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/nl/messages.properties 2013-02-05 16:03:04 UTC (rev 411)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/nl/messages.properties 2013-02-05 16:46:18 UTC (rev 412)
@@ -60,13 +60,13 @@
NameServerSectionsDialog.16=Retrieving objects from Name Server...
NameServerSectionsDialog.17=\uff08Address:Port)
NameServerSectionsDialog.18=Connect Name Server
-AboutDialog.6=<h1>RT Name Service View v1.0.0</h1>
+AboutDialog.6=<h1>RT Name Service View v1.1.0.rc4</h1>
AboutDialog.10=<p><b>RT Name Service View</b> is a RTComponent based system design tool that component connection, assembly, etc on GUI.</p>
AboutDialog.11=<p><b>RT Name Service View</b> is brought to you by <br>
-AboutDialog.12=<b>Task-Intelligence Research Group,</b><br>
+AboutDialog.12=<b>RT-Synthesis Research Group,</b><br>
AboutDialog.13=<b>Intelligent System Research Institute,</b><br>
AboutDialog.14=<b>National Institute of Advanced Industrial Science and Technology (AIST) Japan,</b><br>
-AboutDialog.15=Copyright (c) 2008.</p>
+AboutDialog.15=Copyright (c) 2008-2013.</p>
AboutDialog.17=<\!--font size=-1>Please see <i>license.txt</i> for licensing information.</font-->
AboutDialog.22=About RT Name Service View
SynchronizationPreferencePage.0=Synchronize
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/src/jp/go/aist/rtm/nameserviceview/nl/messages_ja.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/src/jp/go/aist/rtm/nameserviceview/nl/messages_ja.properties 2013-02-05 16:03:04 UTC (rev 411)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/src/jp/go/aist/rtm/nameserviceview/nl/messages_ja.properties 2013-02-05 16:46:18 UTC (rev 412)
@@ -60,13 +60,13 @@
NameServerSectionsDialog.16=\u30cd\u30fc\u30e0\u30b5\u30fc\u30d0\u304b\u3089\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u53d6\u5f97\u3057\u3066\u3044\u307e\u3059...
NameServerSectionsDialog.17=\uff08Address:Port)
NameServerSectionsDialog.18=\u30cd\u30fc\u30e0\u30b5\u30fc\u30d0\u3078\u63a5\u7d9a
-AboutDialog.6=<h1>RT Name Service View v1.0.0</h1>
+AboutDialog.6=<h1>RT Name Service View v1.1.0.rc4</h1>
AboutDialog.10=<p><b>RT Name Service View</b> is a RTComponent based system design tool that component connection, assembly, etc on GUI.</p>
AboutDialog.11=<p><b>RT Name Service View</b> is brought to you by <br>
-AboutDialog.12=<b>Task-Intelligence Research Group,</b><br>
+AboutDialog.12=<b>RT-Synthesis Research Group,</b><br>
AboutDialog.13=<b>Intelligent System Research Institute,</b><br>
AboutDialog.14=<b>National Institute of Advanced Industrial Science and Techonology (AIST) Japan,</b><br>
-AboutDialog.15=Copyright (c) 2008.</p>
+AboutDialog.15=Copyright (c) 2008-2013.</p>
AboutDialog.17=<\!--font size="-1">Please see <i>license.txt</i> for licensing information.</font-->
AboutDialog.22=About RT Name Service View
SynchronizationPreferencePage.0=\u540c\u671f
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties 2013-02-05 16:03:04 UTC (rev 411)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties 2013-02-05 16:46:18 UTC (rev 412)
@@ -97,10 +97,10 @@
CreateComponentDialog.6=Invalid parameter format.
AboutDialog.10=<p><b>RT System Editor</b> is a RTComponent based system design tool that component connection, assembly, etc on GUI.</p>
AboutDialog.11=<p><b>RT System Editor</b> is brought to you by <br>
-AboutDialog.12=<b>Task-Intelligence Research Group,</b><br>
+AboutDialog.12=<b>RT-Synthesis Research Group,</b><br>
AboutDialog.13=<b>Intelligent System Research Institute,</b><br>
AboutDialog.14=<b>National Institute of Advanced Industrial Science and Technology (AIST) Japan,</b><br>
-AboutDialog.15=Copyright (c) 2008.</p>
+AboutDialog.15=Copyright (c) 2008-2013.</p>
AboutDialog.17=<\!--font size=-1>Please see <i>license.txt</i> for licensing information.</font-->
AboutDialog.22=About RT System Editor
ServiceConnectorCreaterDialog.1=Please enter Port Profile.
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/AboutDialog.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/AboutDialog.java 2013-02-05 16:03:04 UTC (rev 411)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/AboutDialog.java 2013-02-05 16:46:18 UTC (rev 412)
@@ -25,7 +25,7 @@
+ "<table bgcolor=\"#ffffff\" width=\"100%\" cellspacing=\"0\"cellpadding=\"0\" border=\"1\">" //$NON-NLS-1$
+ "<tr>" //$NON-NLS-1$
+ "<td align=\"center\">" //$NON-NLS-1$
- + "<h1>RT System Editor v1.0.0</h1>" //$NON-NLS-1$
+ + "<h1>RT System Editor v1.1.0.rc4</h1>" //$NON-NLS-1$
+ "</td>" //$NON-NLS-1$
+ "</tr>" //$NON-NLS-1$
+ "</table>" //$NON-NLS-1$
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl/messages_ja.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl/messages_ja.properties 2013-02-05 16:03:04 UTC (rev 411)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl/messages_ja.properties 2013-02-05 16:46:18 UTC (rev 412)
@@ -97,10 +97,10 @@
CreateComponentDialog.6=\u30d1\u30e9\u30e1\u30fc\u30bf\u5f62\u5f0f\u306b\u8aa4\u308a\u304c\u3042\u308a\u307e\u3059
AboutDialog.10=<p><b>RT System Editor</b> is a RTComponent based system design tool that component connection, assembly, etc on GUI.</p>
AboutDialog.11=<p><b>RT System Editor</b> is brought to you by <br>
-AboutDialog.12=<b>Task-Intelligence Research Group,</b><br>
+AboutDialog.12=<b>RT-Synthesis Research Group,</b><br>
AboutDialog.13=<b>Intelligent System Research Institute,</b><br>
AboutDialog.14=<b>National Institute of Advanced Industrial Science and Techonology (AIST) Japan,</b><br>
-AboutDialog.15=Copyright (c) 2008.</p>
+AboutDialog.15=Copyright (c) 2008-2013.</p>
AboutDialog.17=<\!--font size="-1">Please see <i>license.txt</i> for licensing information.</font-->
AboutDialog.22=About RT System Editor
ServiceConnectorCreaterDialog.1=\u30dd\u30fc\u30c8\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
Modified: branches/RELENG_1_1/rtmtools/make_packages
===================================================================
--- branches/RELENG_1_1/rtmtools/make_packages 2013-02-05 16:03:04 UTC (rev 411)
+++ branches/RELENG_1_1/rtmtools/make_packages 2013-02-05 16:46:18 UTC (rev 412)
@@ -108,8 +108,11 @@
org.eclipse.xsd.sdk.feature.group"
# Language package information
-true ${LANGPACK_URL:="http://sourceforge.jp/projects/mergedoc/svn/view/trunk/Pleiades/build/pleiades.zip?view=co&root=mergedoc"}
-true ${LANGPACK_FILE_NAME:="pleiades.zip"}
+# true ${LANGPACK_URL:="http://sourceforge.jp/projects/mergedoc/svn/view/trunk/Pleiades/build/pleiades.zip?view=co&root=mergedoc"}
+true ${LANGPACK_URL:="http://jaist.dl.sourceforge.jp/blancofw/56316/NLpackja-eclipse-SDK-3.8.0-blancofw20120628.zip"}
+# true ${LANGPACK_FILE_NAME:="pleiades.zip"}
+true ${LANGPACK_FILE_NAME:="NLpackja-eclipse-SDK-3.8.0-blancofw20120628.zip"}
+#true ${PLEIADES:="YES"}
# openrtp tool information
HERE=`pwd`
true ${OPENRTP_SITE:="file:${HERE}/sitetool/openrtp_site"}
@@ -422,13 +425,36 @@
#------------------------------------------------------------
apply_langpack()
{
- unzip -o $WORK_DIR/$LANGPACK_FILE_NAME -d $WORK_DIR/eclipse
- if test $? -ne 0 ; then
- echo "Unzipping $LANGPACK_FILE_NAME failed. Aborting."
- exit 1
+ echo "Applying language package."
+ if test "x$PLEIADES" != "x"; then
+ unzip -o $WORK_DIR/$LANGPACK_FILE_NAME -d $WORK_DIR/eclipse
+ if test $? -ne 0 ; then
+ echo "Unzipping $LANGPACK_FILE_NAME failed. Aborting."
+ exit 1
+ fi
+ echo "Applying langpack: Activating pleiades plugin."
+ pleiades_jar="plugins/jp.sourceforge.mergedoc.pleiades/pleiades.jar"
+ if test "x$OS" = "xMACOS" ; then
+ echo "javaagent:../../../$pleiades_jar" \
+ >> $WORK_DIR/Eclipse.app/Contents/MacOS/eclipse.ini
+ else
+ echo "-javaagent:$pleiades_jar" \
+ >> $WORK_DIR/eclipse/eclipse.ini
+ fi
+ echo "Applying langpack: Modifying pleiades exclude properties."
+ pleiades_pkg="jp.sourceforge.mergedoc.pleiades"
+ pleiades_conf="${WORK_DIR}/eclipse/plugins/${pleiades_pkg}/conf"
+ exclude_prop="${pleiades_conf}/translation-exclude-package.properties"
+ echo "default=jp.go.aist.rtm.systemeditor
+" >> $exclude_prop
+ else
+ unzip -o $WORK_DIR/$LANGPACK_FILE_NAME -d $WORK_DIR
+ if test $? -ne 0 ; then
+ echo "Unzipping $LANGPACK_FILE_NAME failed. Aborting."
+ exit 1
+ fi
fi
- echo "-javaagent:plugins/jp.sourceforge.mergedoc.pleiades/pleiades.jar" \
- >> $WORK_DIR/eclipse/eclipse.ini
+ echo "done"
return 0
}
More information about the openrtm-commit
mailing list