[openrtm-commit:01010] r429 - in branches/RELENG_1_1/rtmtools: . jp.go.aist.rtm.nameserviceview jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/nl jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/action jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/dialog jp.go.aist.rtm.nameserviceview.nl1 jp.go.aist.rtm.nameserviceview.nl1/src/jp/go/aist/rtm/nameserviceview/nl jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src jp.go.aist.rtm.systemeditor jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog jp.go.aist.rtm.systemeditor.nl1 jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl sitetool/openrtp_site
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2013年 2月 16日 (土) 03:59:38 JST
Author: n-ando
Date: 2013-02-16 03:59:38 +0900 (Sat, 16 Feb 2013)
New Revision: 429
Removed:
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/action/AboutAction.java
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/dialog/AboutDialog.java
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AboutAction.java
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/AboutDialog.java
Modified:
branches/RELENG_1_1/rtmtools/
branches/RELENG_1_1/rtmtools/build_all
branches/RELENG_1_1/rtmtools/build_features
branches/RELENG_1_1/rtmtools/build_plugins
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/plugin_ja.properties
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/plugin.properties
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/plugin.xml
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.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/plugin_ja.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/plugin.properties
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.xml
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties
branches/RELENG_1_1/rtmtools/make_packages
branches/RELENG_1_1/rtmtools/openrtp
branches/RELENG_1_1/rtmtools/sitetool/openrtp_site/site.xml
Log:
merged r421-428
Property changes on: branches/RELENG_1_1/rtmtools
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/rtmtools:166-393,395-396,398,400,402,404,406-407,409-411,413-417,419
+ /trunk/rtmtools:166-393,395-396,398,400,402,404,406-407,409-411,413-417,419,421-428
Modified: branches/RELENG_1_1/rtmtools/build_all
===================================================================
--- branches/RELENG_1_1/rtmtools/build_all 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/build_all 2013-02-15 18:59:38 UTC (rev 429)
@@ -111,12 +111,8 @@
return 0
fi
if test "x$arg" = "xrevert" ; then
- echo "Reverting updated MANIFEST.MF..."
- mf=`svn status | grep '^M' | grep MANIFEST.MF | awk '{print $2;}'`
- for m in $mf; do
- rm $m
- svn update $m
- done
+ ./build_plugins revert
+ ./build_features revert
exit 0
fi
fi
Modified: branches/RELENG_1_1/rtmtools/build_features
===================================================================
--- branches/RELENG_1_1/rtmtools/build_features 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/build_features 2013-02-15 18:59:38 UTC (rev 429)
@@ -110,6 +110,12 @@
TARGET=$1
return 0
fi
+ if test "x$arg" = "xrevert" ; then
+ echo "Reverting updated site.xml"
+ rm sitetool/openrtp_site/site.xml
+ svn update sitetool/openrtp_site/site.xml
+ exit 0
+ fi
fi
}
Modified: branches/RELENG_1_1/rtmtools/build_plugins
===================================================================
--- branches/RELENG_1_1/rtmtools/build_plugins 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/build_plugins 2013-02-15 18:59:38 UTC (rev 429)
@@ -329,6 +329,7 @@
# cleanup jar directories
rm -rf $DISTDIR
rm -rf $JARDIR
+ rm -f version.txt
exit 0
elif test "x$TARGET" = "xbuildAll" ; then
check_plugins
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/plugin.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/plugin.properties 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/plugin.properties 2013-02-15 18:59:38 UTC (rev 429)
@@ -31,8 +31,6 @@
Delete_from_Name_Service =Delete from Name Service
Delete_from_View =Delete from View
RT_Name_Service_View_Actions =RT Name Service View Actions
-About_RT_Name_Service_View =&About RT Name Service View
-About_RT_Name_Service_View_Label =About RT Name Service View
RT_Name_Service_View =RT Name Service View
Connection =Connection
Synchronize =Synchronize
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/plugin.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/plugin.xml 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/plugin.xml 2013-02-15 18:59:38 UTC (rev 429)
@@ -151,20 +151,6 @@
</extension>
- <extension point = "org.eclipse.ui.actionSets">
- <actionSet
- id="jp.go.aist.rtm.nameserviceview.ui.actionSet"
- label="%RT_Name_Service_View_Actions">
- <action
- id="jp.go.aist.rtm.nameserviceview.ui.action.AboutAction"
- label="%About_RT_Name_Service_View"
- menubarPath="help/"
- icon="icons/RT.png"
- tooltip="%About_RT_Name_Service_View_Label"
- class="jp.go.aist.rtm.nameserviceview.ui.action.AboutAction">
- </action>
- </actionSet>
- </extension>
<!--
<extension point="org.eclipse.ui.perspectiveExtensions">
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-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/nl/messages.properties 2013-02-15 18:59:38 UTC (rev 429)
@@ -60,15 +60,6 @@
NameServerSectionsDialog.16=Retrieving objects from Name Server...
NameServerSectionsDialog.17=\uff08Address:Port)
NameServerSectionsDialog.18=Connect Name Server
-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>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-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
SynchronizationPreferencePage.1=Timeout waiting :
SynchronizationPreferencePage.2=ms (0 <= timeout <= 9999)
Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/action/AboutAction.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/action/AboutAction.java 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/action/AboutAction.java 2013-02-15 18:59:38 UTC (rev 429)
@@ -1,44 +0,0 @@
-package jp.go.aist.rtm.nameserviceview.ui.action;
-
-import jp.go.aist.rtm.nameserviceview.ui.dialog.AboutDialog;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * RT Name Service ViewのAboutを表示するアクション
- */
-public class AboutAction implements IWorkbenchWindowActionDelegate {
-
- private IWorkbenchWindow window;
-
- /**
- * {@inheritDoc}
- */
- public void dispose() {
- }
-
- /**
- * {@inheritDoc}
- */
- public void init(IWorkbenchWindow window) {
- this.window = window;
- }
-
- /**
- * {@inheritDoc}
- */
- public void run(IAction action) {
- AboutDialog dialog = new AboutDialog(window.getShell());
- dialog.open();
- }
-
- /**
- * {@inheritDoc}
- */
- public void selectionChanged(IAction action, ISelection selection) {
- }
-
-}
Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/dialog/AboutDialog.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/dialog/AboutDialog.java 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/dialog/AboutDialog.java 2013-02-15 18:59:38 UTC (rev 429)
@@ -1,94 +0,0 @@
-package jp.go.aist.rtm.nameserviceview.ui.dialog;
-
-import jp.go.aist.rtm.nameserviceview.nl.Messages;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * RT Name Service ViewのAboutダイアログ
- * <p>
- * HTMLにより作成する
- */
-public class AboutDialog extends Dialog {
- private static final String html = "<html>" //$NON-NLS-1$
- + "<body bgcolor=\"#eeeeee\">" //$NON-NLS-1$
- + "<center>" //$NON-NLS-1$
- + "<table bgcolor=\"#ffffff\" width=\"100%\" cellspacing=\"0\"cellpadding=\"0\" border=\"1\">" //$NON-NLS-1$
- + "<tr>" //$NON-NLS-1$
- + "<td align=\"center\">" //$NON-NLS-1$
- + Messages.getString("AboutDialog.6") //$NON-NLS-1$
- + "</td>" //$NON-NLS-1$
- + "</tr>" //$NON-NLS-1$
- + "</table>" //$NON-NLS-1$
- + Messages.getString("AboutDialog.10") //$NON-NLS-1$
- + Messages.getString("AboutDialog.11") //$NON-NLS-1$
- + Messages.getString("AboutDialog.12") //$NON-NLS-1$
- + Messages.getString("AboutDialog.13") //$NON-NLS-1$
- + Messages.getString("AboutDialog.14") //$NON-NLS-1$
- + Messages.getString("AboutDialog.15") //$NON-NLS-1$
- + "<p>" //$NON-NLS-1$
- + Messages.getString("AboutDialog.17") //$NON-NLS-1$
- + "</p>" + "</center>" + "</body>" + "</html>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
- /**
- * コンストラクタ
- *
- * @param shell
- */
- public AboutDialog(Shell shell) {
- super(shell);
- setShellStyle(getShellStyle() | SWT.CENTER | SWT.RESIZE);
- }
-
- @Override
- /**
- * {@inheritDoc}
- */
- protected Control createDialogArea(Composite parent) {
- GridLayout gridLayout = new GridLayout();
-
- Composite mainComposite = (Composite) super.createDialogArea(parent);
- mainComposite.setLayout(gridLayout);
- mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Browser browser = new Browser(mainComposite, SWT.NONE);
- browser.setText(html);
- browser.setLayoutData(new GridData(GridData.FILL_BOTH));
- browser.setSize(500, 390);
-
- return mainComposite;
- }
-
- @Override
- /**
- * {@inheritDoc}
- */
- protected void configureShell(Shell shell) {
- super.configureShell(shell);
- shell.setText(Messages.getString("AboutDialog.22")); //$NON-NLS-1$
- }
-
- @Override
- /**
- * {@inheritDoc}
- */
- protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
- true);
- }
-
- @Override
- protected Point getInitialSize() {
- return getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
- }
-
-}
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/plugin_ja.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/plugin_ja.properties 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/plugin_ja.properties 2013-02-15 18:59:38 UTC (rev 429)
@@ -31,8 +31,6 @@
Delete_from_Name_Service = \u30cd\u30fc\u30e0\u30b5\u30fc\u30d3\u30b9\u304b\u3089\u524a\u9664
Delete_from_View = \u30d3\u30e5\u30fc\u304b\u3089\u524a\u9664
RT_Name_Service_View_Actions = RT Name Service View Actions
-About_RT_Name_Service_View_Label = &About RT Name Service View
-About_RT_Name_Service_View = About RT Name Service View
RT_Name_Service_View = RT Name Service View
Connection = \u63a5\u7d9a
Synchronize = \u540c\u671f
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-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.nameserviceview.nl1/src/jp/go/aist/rtm/nameserviceview/nl/messages_ja.properties 2013-02-15 18:59:38 UTC (rev 429)
@@ -60,15 +60,6 @@
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.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>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-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
SynchronizationPreferencePage.1=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u5f85\u3061\u6642\u9593:
SynchronizationPreferencePage.2=ms (0\u2266\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u22669999)
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2013-02-15 18:59:38 UTC (rev 429)
@@ -45,10 +45,14 @@
"components/share/${dol}{PROJECT_NAME_LOWER}-${dol}{PROJECT_VERSION_MAJOR}")
${sharp} Get necessary dependency information
-if(NOT WIN32)
- list(APPEND CMAKE_MODULE_PATH ${dol}{PROJECT_SOURCE_DIR}/cmake/Modules)
-endif(NOT WIN32)
-find_package(OpenRTM REQUIRED)
+find_package(OpenRTM)
+if(${dol}{OpenRTM_FOUND})
+ MESSAGE(STATUS "OpenRTM configuration Found")
+else(${dol}{OpenRTM_FOUND})
+ message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
+ list(APPEND CMAKE_MODULE_PATH ${dol}{PROJECT_SOURCE_DIR}/cmake/Modules)
+ find_package(OpenRTM REQUIRED)
+endif(${dol}{OpenRTM_FOUND})
${sharp} Universal settings
${sharp}enable_testing()
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl 2013-02-15 18:59:38 UTC (rev 429)
@@ -33,7 +33,9 @@
pkg_check_modules(PC_OMNIORB4 omniORB4)
pkg_check_modules(PC_OMNITHREAD3 omnithread3)
pkg_check_modules(PC_OMNIDYNAMIC4 omniDynamic4)
-pkg_check_modules(PC_UUID uuid)
+if ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+ pkg_check_modules(PC_UUID uuid)
+endif ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
find_path(OPENRTM_INCLUDE_DIR rtm/RTC.h
HINTS ${dol}{OPENRTM_ROOT}/include ${dol}{OPENRTM_ROOT} ${dol}ENV{OPENRTM_ROOT}/include ${dol}{PC_OPENRTM_INCLUDE_DIRS})
@@ -56,8 +58,12 @@
HINTS ${dol}{PC_OMNITHREAD3_LIBRARY_DIRS})
find_library(OMNIDYNAMIC4_LIBRARY omniDynamic4
HINTS ${dol}{PC_OMNIDYNAMIC4_LIBRARY_DIRS})
-find_library(UUID_LIBRARY uuid
+if ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+ find_library(UUID_LIBRARY uuid
HINTS ${dol}{PC_UUID_LIBRARY_DIRS})
+else ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+ set(UUID_LIBRARY "")
+endif ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
set(OPENRTM_CFLAGS ${dol}{PC_OPENRTM_CFLAGS_OTHER} ${dol}{PC_COIL_CFLAGS_OTHER} ${dol}{PC_OMNIORB4_CFLAGS_OTHER})
set(OPENRTM_INCLUDE_DIRS ${dol}{OPENRTM_INCLUDE_DIR} ${dol}{OPENRTM_INCLUDE_DIR}/rtm/idl
@@ -74,6 +80,10 @@
set(OPENRTM_VERSION_REVISION ${dol}{CMAKE_MATCH_3})
set(OPENRTM_VERSION_CANDIDATE ${dol}{CMAKE_MATCH_4})
+execute_process(COMMAND rtm-config --libs-only-l OUTPUT_VARIABLE
+ OPENRTM_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND rtm-config --libs-only-L OUTPUT_VARIABLE
+ OPENRTM_LIBRARY_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDL_COMPILER
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDL_FLAGS
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2013-02-15 18:59:38 UTC (rev 429)
@@ -1,6 +1,27 @@
set(comp_srcs ${rtcParam.name}.cpp #foreach($providerIdlFile in ${rtcParam.providerIdlPathes})${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp #end)
set(standalone_srcs ${rtcParam.name}Comp.cpp)
+if (DEFINED OPENRTM_INCLUDE_DIRS)
+ string(REGEX REPLACE "-I" ";"
+ OPENRTM_INCLUDE_DIRS "${dol}{OPENRTM_INCLUDE_DIRS}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_INCLUDE_DIRS "${dol}{OPENRTM_INCLUDE_DIRS}")
+endif (DEFINED OPENRTM_INCLUDE_DIRS)
+
+if (DEFINED OPENRTM_LIBRARY_DIRS)
+ string(REGEX REPLACE "-L" ";"
+ OPENRTM_LIBRARY_DIRS "${dol}{OPENRTM_LIBRARY_DIRS}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_LIBRARY_DIRS "${dol}{OPENRTM_LIBRARY_DIRS}")
+endif (DEFINED OPENRTM_LIBRARY_DIRS)
+
+if (DEFINED OPENRTM_LIBRARIES)
+ string(REGEX REPLACE "-l" ";"
+ OPENRTM_LIBRARIES "${dol}{OPENRTM_LIBRARIES}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_LIBRARIES "${dol}{OPENRTM_LIBRARIES}")
+endif (DEFINED OPENRTM_LIBRARIES)
+
include_directories(${dol}{PROJECT_SOURCE_DIR}/include)
include_directories(${dol}{PROJECT_SOURCE_DIR}/include/${dol}{PROJECT_NAME})
include_directories(${dol}{PROJECT_BINARY_DIR})
@@ -15,14 +36,16 @@
link_directories(${dol}{OPENRTM_LIBRARY_DIRS})
link_directories(${dol}{OMNIORB_LIBRARY_DIRS})
-add_library(${dol}{PROJECT_NAME} ${dol}{LIB_TYPE} ${dol}{comp_srcs} ${dol}{comp_headers} ${dol}{ALL_IDL_SRCS})
+add_library(${dol}{PROJECT_NAME} ${dol}{LIB_TYPE} ${dol}{comp_srcs}
+ ${dol}{comp_headers} ${dol}{ALL_IDL_SRCS})
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
set_source_files_properties(${dol}{ALL_IDL_SRCS} PROPERTIES GENERATED 1)
add_dependencies(${dol}{PROJECT_NAME} ALL_IDL_TGT)
target_link_libraries(${dol}{PROJECT_NAME} ${dol}{OPENRTM_LIBRARIES})
-add_executable(${dol}{PROJECT_NAME}Comp ${dol}{standalone_srcs})
-target_link_libraries(${dol}{PROJECT_NAME}Comp ${dol}{PROJECT_NAME})
+add_executable(${dol}{PROJECT_NAME}Comp ${dol}{standalone_srcs}
+ ${dol}{comp_srcs} ${dol}{comp_headers} ${dol}{ALL_IDL_SRCS})
+target_link_libraries(${dol}{PROJECT_NAME}Comp ${dol}{OPENRTM_LIBRARIES})
install(TARGETS ${dol}{PROJECT_NAME} ${dol}{PROJECT_NAME}Comp
EXPORT ${dol}{PROJECT_NAME}
@@ -32,4 +55,3 @@
install(EXPORT ${dol}{PROJECT_NAME}
DESTINATION ${dol}{LIB_INSTALL_DIR}/${dol}{PROJECT_NAME}
FILE ${dol}{PROJECT_NAME}Depends.cmake)
-
\ No newline at end of file
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.properties 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.properties 2013-02-15 18:59:38 UTC (rev 429)
@@ -49,8 +49,6 @@
Open_New_Offline_System_Editor_Label =Open New Offline System Editor
Open_New_System_Editor =&Open New System Editor
Open_New_System_Editor_Label =Open New System Editor
-About_RT_System_Editor =&About RT System Editor
-About_RT_System_Editor_Label =About RT System Editor
# popupMenus
All_Stop =All Stop
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.xml 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/plugin.xml 2013-02-15 18:59:38 UTC (rev 429)
@@ -391,15 +391,6 @@
tooltip="%Open_New_System_Editor_Label"
class="jp.go.aist.rtm.systemeditor.ui.action.NewSystemDiagramEditorAction">
</action>
-
- <action
- id="jp.go.aist.rtm.systemeditor.ui.action.AboutAction"
- label="%About_RT_System_Editor"
- menubarPath="help/"
- icon="icons/RT.png"
- tooltip="%About_RT_System_Editor_Label"
- class="jp.go.aist.rtm.systemeditor.ui.action.AboutAction">
- </action>
</actionSet>
</extension>
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-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/nl/messages.properties 2013-02-15 18:59:38 UTC (rev 429)
@@ -95,14 +95,6 @@
CreateComponentDialog.2=Type :
CreateComponentDialog.3=Parameter :
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>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-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.
ServiceConnectorCreaterDialog.2=Error
ServiceConnectorCreaterDialog.3=No corresponding port interface.
Deleted: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AboutAction.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AboutAction.java 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/action/AboutAction.java 2013-02-15 18:59:38 UTC (rev 429)
@@ -1,44 +0,0 @@
-package jp.go.aist.rtm.systemeditor.ui.action;
-
-import jp.go.aist.rtm.systemeditor.ui.dialog.AboutDialog;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * RtcLinkのAboutを表示するアクション
- */
-public class AboutAction implements IWorkbenchWindowActionDelegate {
-
- private IWorkbenchWindow window;
-
- /**
- * {@inheritDoc}
- */
- public void dispose() {
- }
-
- /**
- * {@inheritDoc}
- */
- public void init(IWorkbenchWindow window) {
- this.window = window;
- }
-
- /**
- * {@inheritDoc}
- */
- public void run(IAction action) {
- AboutDialog dialog = new AboutDialog(window.getShell());
- dialog.open();
- }
-
- /**
- * {@inheritDoc}
- */
- public void selectionChanged(IAction action, ISelection selection) {
- }
-
-}
Deleted: 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-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/AboutDialog.java 2013-02-15 18:59:38 UTC (rev 429)
@@ -1,94 +0,0 @@
-package jp.go.aist.rtm.systemeditor.ui.dialog;
-
-import jp.go.aist.rtm.systemeditor.nl.Messages;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * RT System EditorのAboutダイアログ
- * <p>
- * HTMLにより作成する
- */
-public class AboutDialog extends Dialog {
- private static final String html = "<html>" //$NON-NLS-1$
- + "<body bgcolor=\"#eeeeee\">" //$NON-NLS-1$
- + "<center>" //$NON-NLS-1$
- + "<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.1.0.rc4</h1>" //$NON-NLS-1$
- + "</td>" //$NON-NLS-1$
- + "</tr>" //$NON-NLS-1$
- + "</table>" //$NON-NLS-1$
- + Messages.getString("AboutDialog.10") //$NON-NLS-1$
- + Messages.getString("AboutDialog.11") //$NON-NLS-1$
- + Messages.getString("AboutDialog.12") //$NON-NLS-1$
- + Messages.getString("AboutDialog.13") //$NON-NLS-1$
- + Messages.getString("AboutDialog.14") //$NON-NLS-1$
- + Messages.getString("AboutDialog.15") //$NON-NLS-1$
- + "<p>" //$NON-NLS-1$
- + Messages.getString("AboutDialog.17") //$NON-NLS-1$
- + "</p>" + "</center>" + "</body>" + "</html>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
- /**
- * コンストラクタ
- *
- * @param shell
- */
- public AboutDialog(Shell shell) {
- super(shell);
- setShellStyle(getShellStyle() | SWT.CENTER | SWT.RESIZE);
- }
-
- @Override
- /**
- * {@inheritDoc}
- */
- protected Control createDialogArea(Composite parent) {
- GridLayout gridLayout = new GridLayout();
-
- Composite mainComposite = (Composite) super.createDialogArea(parent);
- mainComposite.setLayout(gridLayout);
- mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Browser browser = new Browser(mainComposite, SWT.NONE);
- browser.setText(html);
- browser.setLayoutData(new GridData(GridData.FILL_BOTH));
- browser.setSize(500, 390);
-
- return mainComposite;
- }
-
- @Override
- /**
- * {@inheritDoc}
- */
- protected void configureShell(Shell shell) {
- super.configureShell(shell);
- shell.setText(Messages.getString("AboutDialog.22")); //$NON-NLS-1$
- }
-
- @Override
- /**
- * {@inheritDoc}
- */
- protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
- true);
- }
-
- @Override
- protected Point getInitialSize() {
- return getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
- }
-
-}
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/plugin_ja.properties
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/plugin_ja.properties 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/plugin_ja.properties 2013-02-15 18:59:38 UTC (rev 429)
@@ -49,8 +49,6 @@
Open_New_Offline_System_Editor_Label = Open New Offline System Editor
Open_New_System_Editor = &Open New System Editor
Open_New_System_Editor_Label = Open New System Editor
-About_RT_System_Editor = &About RT System Editor
-About_RT_System_Editor_Label = About RT System Editor
# popupMenus
All_Stop = All Stop (&N)
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-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor.nl1/src/jp/go/aist/rtm/systemeditor/nl/messages_ja.properties 2013-02-15 18:59:38 UTC (rev 429)
@@ -95,14 +95,6 @@
CreateComponentDialog.2=Type :
CreateComponentDialog.3=Parameter :
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>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-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
ServiceConnectorCreaterDialog.2=Error
ServiceConnectorCreaterDialog.3=\u4e00\u81f4\u3059\u308b\u30dd\u30fc\u30c8\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u304c\u3042\u308a\u307e\u305b\u3093\u3002
Modified: branches/RELENG_1_1/rtmtools/make_packages
===================================================================
--- branches/RELENG_1_1/rtmtools/make_packages 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/make_packages 2013-02-15 18:59:38 UTC (rev 429)
@@ -108,11 +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_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"}
+#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"}
@@ -335,6 +335,15 @@
return 0
fi
done
+
+ chmod 755 openrtp
+ if test "x$os" = "xLINUX" ; then
+ cp openrtp $WORK_DIR/eclipse/
+ elif test "x$os" = "xMACOS" ; then
+ cp openrtp $WORK_DIR/eclipse/Eclipse.app/Contents/MacOS/
+ info="$WORK_DIR/eclipse/Eclipse.app/Contents/Info.plist"
+ sed -i -e 's/<string>eclipse<\/string>/<string>openrtp<\/string>/g' $info
+ fi
}
#------------------------------------------------------------
@@ -377,20 +386,22 @@
echo $tar
if test ! "x$zip" = "x" ; then
echo "Creating zip file..."
+ basedir=`pwd`
cd $WORK_DIR
find eclipse > .zip_list
(cat .zip_list | zip -@ $pkg_name)
rm -f .zip_list
- cd ..
+ cd $basedir
if test $? -ne 0 ;then
echo "Failed to archive zip file: $pkg_name. Aborting..."
exit 1
fi
elif test ! "x$tar" = "x" ; then
echo "Creating tar.gz file..."
+ basedir=`pwd`
cd $WORK_DIR
tar cvzf $pkg_name eclipse
- cd ..
+ cd $basedir
if test $? -ne 0 ; then
echo "Failed to archive tar.gz file: $pkg_name. Aborting..."
exit 1
@@ -445,9 +456,9 @@
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
+ if test "x$os" = "xMACOS" ; then
+ echo "-javaagent:../../../$pleiades_jar" \
+ >> $WORK_DIR/eclipse/Eclipse.app/Contents/MacOS/eclipse.ini
else
echo "-javaagent:$pleiades_jar" \
>> $WORK_DIR/eclipse/eclipse.ini
Modified: branches/RELENG_1_1/rtmtools/openrtp
===================================================================
--- branches/RELENG_1_1/rtmtools/openrtp 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/openrtp 2013-02-15 18:59:38 UTC (rev 429)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# RTM_ROOT
#
@@ -19,7 +19,12 @@
# functions
#============================================================
SCRIPT_NAME=$(basename $0)
-SCRIPT_DIR=$(dirname $0)
+tmp=$(readlink $0)
+if test "x$tmp" = "x" ; then
+ SCRIPT_DIR=$(dirname $0)
+else
+ SCRIPT_DIR=$(dirname $tmp)
+fi
DEBUG=""
debug_echo () {
if test "x$DEBUG" = "xTRUE"; then
@@ -53,7 +58,7 @@
echo "Please install OpenRTM-aist (C++) and set RTM_ROOT"
echo " ex. export RTM_ROOT=/usr/include/openrtm-1.1/"
echo ""
- exit 1
+ return 1
fi
fi
@@ -67,7 +72,7 @@
echo " If /usr/include/openrtm-1.1/rtm/idl/BasicDataType.idl exists,"
echo " RTM_ROOT should be /usr/include/openrtm-1.1"
echo ""
- exit 1
+ return 1
fi
debug_echo "Result: RTM_ROOT = " $RTM_ROOT
export RTM_ROOT=$RTM_ROOT
@@ -143,7 +148,7 @@
echo "Please install OpenRTM-aist (Java) and set RTM_JAVA_ROOT"
echo " ex. export RTM_JAVA_ROOT=/usr/include/openrtm-1.1/"
echo ""
- exit 1
+ return 1
fi
fi
@@ -154,10 +159,11 @@
echo "Please set RTM_JAVA_ROOT correctly."
echo " ex. export RTM_JAVA_ROOT=/usr/include/openrtm-1.1/"
echo ""
- exit 1
+ return 1
fi
debug_echo "Result: RTM_JAVA_ROOT = " $RTM_JAVA_ROOT
export RTM_JAVA_ROOT=$RTM_JAVA_ROOT
+ return 0
}
#------------------------------------------------------------
@@ -196,14 +202,15 @@
if test "x$openrtm_jar" = "x" ; then
debug_echo "jar file not found"
- echo "No OpenRTM-aist installation found. Aborting."
- exit 1
+ echo "No OpenRTM-aist (Java)installation found."
+ return 1
fi
debug_echo "jar file found: " $openrtm_jar
RTM_JAVA_ROOT=`dirname $openrtm_jar | sed -e 's/\/jar$//'`
debug_echo "RTM_JAVA_ROOT: " $RTM_JAVA_ROOT
-
+ return 0
+
}
#------------------------------------------------------------
@@ -226,7 +233,7 @@
echo "If /usr/lib/OpenRTM-aist/1.0/jar/OpenRTM-1.0.0.jar exists,"
echo "RTM_JAVA_ROOT should be /usr/lib/OpenRTM-aist/1.0"
echo ""
- exit 1
+ return 1
fi
return 0
}
@@ -241,9 +248,10 @@
echo " RTM_ROOT : " $RTM_ROOT
echo " RTM_JAVA_ROOT: " $RTM_JAVA_ROOT
-if test ! -x $SCRIPT_DIR/eclipse ; then
+cd $SCRIPT_DIR
+if test ! -x eclipse ; then
echo "No eclipse executable found. Aborting."
exit 1
fi
export GDK_NATIVE_WINDOWS=1
-$SCRIPT_DIR/eclipse $*
+./eclipse $*
Modified: branches/RELENG_1_1/rtmtools/sitetool/openrtp_site/site.xml
===================================================================
--- branches/RELENG_1_1/rtmtools/sitetool/openrtp_site/site.xml 2013-02-15 18:13:41 UTC (rev 428)
+++ branches/RELENG_1_1/rtmtools/sitetool/openrtp_site/site.xml 2013-02-15 18:59:38 UTC (rev 429)
@@ -1,19 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <description url="http://www.openrtm.org/pub/OpenRTP/updates/">
- Open RT Platform tools update site.
- </description>
-<feature url="features/jp.go.aist.rtm.rtcbuilder.feature_1.1.0.rc4v20130123.jar" id="jp.go.aist.rtm.rtcbuilder.feature" version="1.1.0.rc4v20130123">
-<category name="OpenRTP 1.1.0"/>
-</feature>
-<feature url="features/jp.go.aist.rtm.rtsystemeditor.nl1.feature_1.1.0.rc4v20130123.jar" id="jp.go.aist.rtm.rtsystemeditor.nl1.feature" version="1.1.0.rc4v20130123">
-<category name="OpenRTP 1.1.0"/>
-</feature>
-<feature url="features/jp.go.aist.rtm.rtsystemeditor.feature_1.1.0.rc4v20130123.jar" id="jp.go.aist.rtm.rtsystemeditor.feature" version="1.1.0.rc4v20130123">
-<category name="OpenRTP 1.1.0"/>
-</feature>
-<feature url="features/jp.go.aist.rtm.rtcbuilder.nl1.feature_1.1.0.rc4v20130123.jar" id="jp.go.aist.rtm.rtcbuilder.nl1.feature" version="1.1.0.rc4v20130123">
-<category name="OpenRTP 1.1.0"/>
-</feature>
-<category-def name="OpenRTP 1.1.0" label="OpenRTP 1.1.0"/>
-</site>
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description url="http://www.openrtm.org/pub/OpenRTP/updates/">
+ Open RT Platform tools update site.
+ </description>
+<feature url="features/jp.go.aist.rtm.rtsystemeditor.nl1.feature_1.1.0.rc4v20130205.jar" id="jp.go.aist.rtm.rtsystemeditor.nl1.feature" version="1.1.0.rc4v20130205">
+<category name="OpenRTP 1.1.0"/>
+</feature>
+<feature url="features/jp.go.aist.rtm.rtsystemeditor.feature_1.1.0.rc4v20130205.jar" id="jp.go.aist.rtm.rtsystemeditor.feature" version="1.1.0.rc4v20130205">
+<category name="OpenRTP 1.1.0"/>
+</feature>
+<feature url="features/jp.go.aist.rtm.rtcbuilder.nl1.feature_1.1.0.rc4v20130205.jar" id="jp.go.aist.rtm.rtcbuilder.nl1.feature" version="1.1.0.rc4v20130205">
+<category name="OpenRTP 1.1.0"/>
+</feature>
+<feature url="features/jp.go.aist.rtm.rtcbuilder.feature_1.1.0.rc4v20130205.jar" id="jp.go.aist.rtm.rtcbuilder.feature" version="1.1.0.rc4v20130205">
+<category name="OpenRTP 1.1.0"/>
+</feature>
+<feature url="features/jp.go.aist.rtm.rtcbuilder.feature_1.1.0.rc4v20130123.jar" id="jp.go.aist.rtm.rtcbuilder.feature" version="1.1.0.rc4v20130123">
+<category name="OpenRTP 1.1.0"/>
+</feature>
+<feature url="features/jp.go.aist.rtm.rtsystemeditor.nl1.feature_1.1.0.rc4v20130123.jar" id="jp.go.aist.rtm.rtsystemeditor.nl1.feature" version="1.1.0.rc4v20130123">
+<category name="OpenRTP 1.1.0"/>
+</feature>
+<feature url="features/jp.go.aist.rtm.rtsystemeditor.feature_1.1.0.rc4v20130123.jar" id="jp.go.aist.rtm.rtsystemeditor.feature" version="1.1.0.rc4v20130123">
+<category name="OpenRTP 1.1.0"/>
+</feature>
+<feature url="features/jp.go.aist.rtm.rtcbuilder.nl1.feature_1.1.0.rc4v20130123.jar" id="jp.go.aist.rtm.rtcbuilder.nl1.feature" version="1.1.0.rc4v20130123">
+<category name="OpenRTP 1.1.0"/>
+</feature>
+<category-def name="OpenRTP 1.1.0" label="OpenRTP 1.1.0"/>
+</site>
More information about the openrtm-commit
mailing list