[openrtm-commit:00270] r2209 - in branches/RELENG_1_1/OpenRTM-aist: . build etc src/lib/coil/common src/lib/coil/win32/coil src/lib/rtm utils/rtm-naming win32/OpenRTM-aist win32/OpenRTM-aist/installer win32/OpenRTM-aist/installer/OpenCV-RTC win32/OpenRTM-aist/installer/OpenCV2.1 win32/OpenRTM-aist/installer/OpenRTP win32/OpenRTM-aist/installer/omniORB
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 7月 27日 (水) 23:02:57 JST
Author: n-ando
Date: 2011-07-27 23:02:57 +0900 (Wed, 27 Jul 2011)
New Revision: 2209
Added:
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV22_inc.wxs.in
Modified:
branches/RELENG_1_1/OpenRTM-aist/
branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py
branches/RELENG_1_1/OpenRTM-aist/build/makewxs.py
branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/NonCopyable.h
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.h
branches/RELENG_1_1/OpenRTM-aist/utils/rtm-naming/rtm-naming.in
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCV-RTC_inc.wxs.in
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCVRTC_bin.yaml
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs.in
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/WixUI_ja-jp.wxl
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/omniORB/omniORB_inc.wxs.in
Log:
merged r2183:2208
Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
- /tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180
+ /tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2184-2208
Modified: branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py 2011-07-27 14:02:57 UTC (rev 2209)
@@ -143,14 +143,12 @@
"""
-def process_lib(libs):
+def process_lib(libs, type):
liblist = libs.split(" ")
results = ""
for l in liblist:
- if re.match(".*[dD].[lL][iI][bB]", l):
- results += "debug;" + re.sub(".[lL][iI][bB]", "", l) + ";"
- else:
- results += "optimized;" + re.sub(".[lL][iI][bB]", "", l) + ";"
+ if re.match(".*.[lL][iI][bB]", l):
+ results += type + ";" + re.sub(".[lL][iI][bB]", "", l) + ";"
return results[:-1]
@@ -202,10 +200,10 @@
rtm_cflags += ";-D_WIN32_WINNT=0x0400"
# libs
- omni_libs = process_lib(dict["omni_lib"])
- omni_libs += ";" + process_lib(dict["omni_libd"])
- rtm_libs = process_lib(dict["rtm_lib"])
- rtm_libs += ";" + process_lib(dict["rtm_libd"])
+ omni_libs = process_lib(dict["omni_lib"], "optimized")
+ omni_libs += ";" + process_lib(dict["omni_libd"], "debug")
+ rtm_libs = process_lib(dict["rtm_lib"], "optimized")
+ rtm_libs += ";" + process_lib(dict["rtm_libd"], "debug")
Modified: branches/RELENG_1_1/OpenRTM-aist/build/makewxs.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/makewxs.py 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/build/makewxs.py 2011-07-27 14:02:57 UTC (rev 2209)
@@ -52,6 +52,7 @@
ShortName: %s
Name: %s
Source: %s
+ Shortcut: %s
"""
self.count = -1
@@ -83,6 +84,18 @@
return short_name
return short_name + "." + short_ext
+ def is_ext_exe(self, fname):
+ try:
+ name, ext = fname.rsplit(".", 1)
+ except:
+ name = fname
+ ext = ""
+ if ext == "exe":
+ flag = "true"
+ else:
+ flag = "false"
+ return flag
+
def id(self):
self.count += 1
return self.comp + '%04d' % (self.count)
@@ -113,7 +126,8 @@
self.write(self.fitem % (self.escape(self.id()),
self.escape(self.to_shortname(fname)),
self.escape(fname),
- self.escape(self.path + fname)))
+ self.escape(self.path + fname),
+ self.is_ext_exe(fname)))
return self.output
Modified: branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample 2011-07-27 14:02:57 UTC (rev 2209)
@@ -45,6 +45,7 @@
# process will be shutdown in case no rtc exists on periodic check.
manager.shutdown_on_nortcs: YES
manager.shutdown_auto: YES
+manager.auto_shutdown_duration: 10.0
#============================================================
# CORBA configuration
@@ -117,6 +118,35 @@
#
corba.nameservice.replace_endpoint: NO
+#
+# IOR alternate IIOP addresses
+#
+# This option adds alternate IIOP addresses into the IOR Profiles.
+# IOR can include additional endpoints for a servant. It is almost
+# same as "corba.endpoints" option, but this option does not create
+# actual endpoint on the ORB. (corba.endpoints try to create actual
+# endpoint, and if it cannot be created, error will be returned.)
+# This option just add alternate IIOP endpoint address information to
+# an IOR.
+#
+# This option can be used when RTCs are located inside of NAT or
+# router. Generally speaking, RTCs in a private network cannot
+# connect to RTCs in the global network, because global client cannot
+# reach to private servants. However, if route (or NAT) is properly
+# configured for port forwarding, global RTCs can reach to RTCs in
+# private network.
+#
+# A setting example is as follows.
+# 1) Configure your router properly for port-forwarding.
+# ex. global 2810 port is forwarded to private 2810
+# 2) Set the following options in rtc.conf
+# corba.nameservers: my.global.nameserver.com <- name server in global network
+# corba.endpoints: :2810 <- actual port number
+# corba.additional_ior_addresses: w.x.y.z:2810 <- routers global IP addr/port
+# 3) Launch global RTCs and private RTC, and connect them.
+#
+corba.alternate_iiop_addresses: addr:port
+
#============================================================
# Naming configurations
#============================================================
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/NonCopyable.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/NonCopyable.h 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/NonCopyable.h 2011-07-27 14:02:57 UTC (rev 2209)
@@ -139,7 +139,7 @@
*
* @endif
*/
- NonCopyable () {}
+ NonCopyableCRTP() {}
/*!
* @if jp
@@ -156,9 +156,9 @@
*
* @endif
*/
- ~NonCopyable () {}
+ ~NonCopyableCRTP() {}
private:
- NonCopyable (const NonCopyable &);
- T & operator = (const T &);
+ NonCopyableCRTP(const NonCopyableCRTP &);
+ T & operator=(const T &);
};
};
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml 2011-07-27 14:02:57 UTC (rev 2209)
@@ -69,8 +69,8 @@
VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
+ - "$(SolutionDir)coil_distbuild.props"
- "$(SolutionDir)coil_config.props"
- - "$(SolutionDir)coil_distbuild.props"
VC10_LinkIncrementalCondition: "true"
VC10_VCCLCompilerTool:
- Key: Optimization
@@ -176,8 +176,8 @@
VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
+ - "$(SolutionDir)coil_distbuild.props"
- "$(SolutionDir)coil_config.props"
- - "$(SolutionDir)coil_distbuild.props"
VC10_LinkIncrementalCondition: "false"
VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h 2011-07-27 14:02:57 UTC (rev 2209)
@@ -81,6 +81,7 @@
"manager.corba_servant", "YES",
"manager.shutdown_on_nortcs", "YES",
"manager.shutdown_auto", "YES",
+ "manager.auto_shutdown_duration", "10.0",
"manager.name", "manager",
"manager.command", "rtcd",
"manager.supported_languages", "C++, Python, Java",
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp 2011-07-27 14:02:57 UTC (rev 2209)
@@ -909,12 +909,21 @@
if (coil::toBool(m_config["manager.shutdown_auto"], "YES", "NO", true) &&
!coil::toBool(m_config["manager.is_master"], "YES", "NO", false))
{
- coil::TimeValue tm(10, 0);
+ coil::TimeValue tm(10, 0);
+ if (m_config.findNode("manager.auto_shutdown_duration") != NULL)
+ {
+ double duration;
+ const char* s = m_config["manager.auto_shutdown_duration"].c_str();
+ if (coil::stringTo(duration, s))
+ {
+ tm = duration;
+ }
+ }
if (m_timer != NULL)
- {
- m_timer->registerListenerObj(this,
- &Manager::shutdownOnNoRtcs, tm);
- }
+ {
+ m_timer->registerListenerObj(this,
+ &Manager::shutdownOnNoRtcs, tm);
+ }
}
{
@@ -1086,6 +1095,29 @@
}
// Get the POAManager
m_pPOAManager = m_pPOA->the_POAManager();
+
+#ifdef ORB_IS_OMNIORB
+ const char* conf = "corba.alternate_iiop_addresses";
+ if (m_config.findNode(conf) != NULL)
+ {
+ coil::vstring addr_list;
+ addr_list = coil::split(m_config[conf], ",", true);
+
+ for (size_t i(0); i < addr_list.size(); ++i)
+ {
+ coil::vstring addr_port = coil::split(addr_list[i], ":");
+ if (addr_port.size() == 2)
+ {
+ IIOP::Address iiop_addr;
+ iiop_addr.host = addr_port[0].c_str();
+ CORBA::UShort port;
+ coil::stringTo(port, addr_port[1].c_str());
+ iiop_addr.port = port;
+ omniIOR::add_IIOP_ADDRESS(iiop_addr);
+ }
+ }
+ }
+#endif // ORB_IS_OMNIORB
}
catch (...)
{
@@ -1640,6 +1672,10 @@
name_prop.load(conff);
}
}
+ if (m_config.findNode(category + "." + inst_name) != NULL)
+ {
+ name_prop << m_config.getNode(category + "." + inst_name);
+ }
if (!m_config[type_conf].empty())
{
@@ -1649,6 +1685,11 @@
type_prop.load(conff);
}
}
+ if (m_config.findNode(category + "." + type_name) != NULL)
+ {
+ type_prop << m_config.getNode(category + "." + type_name);
+ }
+
// Merge Properties. type_prop is merged properties
comp->setProperties(prop);
type_prop << name_prop;
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp 2011-07-27 14:02:57 UTC (rev 2209)
@@ -374,14 +374,35 @@
CompItr it;
it = std::find_if(m_comps.begin(), m_comps.end(),
find_comp(comp));
- if (it == m_comps.end())
- return RTC::BAD_PARAMETER;
-
+ if (it == m_comps.end()) { return RTC::BAD_PARAMETER; }
if (!(it->_sm.m_sm.isIn(ACTIVE_STATE)))
- return RTC::PRECONDITION_NOT_MET;
+ {
+ return RTC::PRECONDITION_NOT_MET;
+ }
it->_sm.m_sm.goTo(INACTIVE_STATE);
- return RTC::RTC_OK;
+ int count(0);
+ const double usec_per_sec(1.0e6);
+ double sleeptime(10.0 * usec_per_sec / get_rate());
+ RTC_PARANOID(("Sleep time is %f [us]", sleeptime));
+ while (it->_sm.m_sm.isIn(ACTIVE_STATE))
+ {
+ RTC_TRACE(("Waiting to be the INACTIVE state %d %f", count, (double)coil::gettimeofday()));
+ coil::usleep(sleeptime);
+ if (count > 1000)
+ {
+ RTC_ERROR(("The component is not responding."));
+ break;
+ }
+ ++count;
+ }
+ if (it->_sm.m_sm.isIn(INACTIVE_STATE))
+ {
+ RTC_TRACE(("The component has been properly deactivated."));
+ return RTC::RTC_OK;
+ }
+ RTC_ERROR(("The component could not be deactivated."));
+ return RTC::RTC_ERROR;
#else // ORB_IS_RTORB
for (int i(0); i < (int)m_comps.size(); ++i)
{
@@ -392,7 +413,29 @@
return RTC::PRECONDITION_NOT_MET;
}
m_comps.at(i)._sm.m_sm.goTo(INACTIVE_STATE);
- return RTC::RTC_OK;
+ int count(0);
+ const double usec_per_sec(1.0e6);
+ double sleeptime(usec_per_sec / get_rate());
+ RTC_PARANOID(("Sleep time is %f [us]", sleeptime));
+ while (m_comps.at(i)._sm.m_sm.isIn(ACTIVE_STATE))
+ {
+ RTC_TRACE(("Waiting to be the INACTIVE state"));
+ coil::usleep(sleeptime);
+
+ if (count > 1000)
+ {
+ RTC_ERROR(("The component is not responding."));
+ break;
+ }
+ ++count;
+ }
+ if (m_comps.at(i)._sm.m_sm.isIn(INACTIVE_STATE))
+ {
+ RTC_TRACE(("The component has been properly deactivated."));
+ return RTC::RTC_OK;
+ }
+ RTC_ERROR(("The component could not be deactivated."));
+ return RTC::RTC_ERROR;
}
}
return RTC::BAD_PARAMETER;
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2011-07-27 14:02:57 UTC (rev 2209)
@@ -780,23 +780,23 @@
{
preOnInitialize(0);
ret = onInitialize();
- postOnInitialize(0, ret);
- std::string active_set;
- active_set = m_properties.getProperty("configuration.active_config",
- "default");
- if (m_configsets.haveConfig(active_set.c_str()))
- {
- m_configsets.update(active_set.c_str());
- }
- else
- {
- m_configsets.update("default");
- }
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ std::string active_set;
+ active_set = m_properties.getProperty("configuration.active_config",
+ "default");
+ if (m_configsets.haveConfig(active_set.c_str()))
+ {
+ m_configsets.update(active_set.c_str());
+ }
+ else
+ {
+ m_configsets.update("default");
+ }
+ postOnInitialize(0, ret);
return ret;
}
@@ -816,12 +816,12 @@
{
preOnFinalize(0);
ret = onFinalize();
- postOnFinalize(0, ret);
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ postOnFinalize(0, ret);
return ret;
}
@@ -841,12 +841,12 @@
{
preOnStartup(ec_id);
ret = onStartup(ec_id);
- postOnStartup(ec_id, ret);
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ postOnStartup(ec_id, ret);
return ret;
}
@@ -866,12 +866,12 @@
{
preOnShutdown(ec_id);
ret = onShutdown(ec_id);
- postOnShutdown(ec_id, ret);
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ postOnShutdown(ec_id, ret);
return ret;
}
@@ -893,12 +893,12 @@
m_configsets.update();
ret = onActivated(ec_id);
m_portAdmin.activatePorts();
- postOnActivated(ec_id, ret);
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ postOnActivated(ec_id, ret);
return ret;
}
@@ -919,12 +919,12 @@
preOnDeactivated(ec_id);
m_portAdmin.deactivatePorts();
ret = onDeactivated(ec_id);
- postOnDeactivated(ec_id, ret);
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ postOnDeactivated(ec_id, ret);
return ret;
}
@@ -944,12 +944,12 @@
{
preOnAborting(ec_id);
ret = onAborting(ec_id);
- postOnAborting(ec_id, ret);
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ postOnAborting(ec_id, ret);
return ret;
}
@@ -969,13 +969,13 @@
{
preOnError(ec_id);
ret = onError(ec_id);
- m_configsets.update();
- postOnError(ec_id, ret);
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ m_configsets.update();
+ postOnError(ec_id, ret);
return ret;
}
@@ -995,12 +995,12 @@
{
preOnReset(ec_id);
ret = onReset(ec_id);
- postOnReset(ec_id, ret);
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ postOnReset(ec_id, ret);
return ret;
}
@@ -1023,12 +1023,12 @@
if (m_readAll) {readAll(); }
ret = onExecute(ec_id);
if (m_writeAll) { writeAll();}
- postOnExecute(ec_id, ret);
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ postOnExecute(ec_id, ret);
return ret;
}
@@ -1050,12 +1050,12 @@
preOnStateUpdate(ec_id);
ret = onStateUpdate(ec_id);
m_configsets.update();
- postOnStateUpdate(ec_id, ret);
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ postOnStateUpdate(ec_id, ret);
return ret;
}
@@ -1075,12 +1075,12 @@
{
preOnRateChanged(ec_id);
ret = onRateChanged(ec_id);
- postOnRateChanged(ec_id, ret);
}
catch (...)
{
- return RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
+ postOnRateChanged(ec_id, ret);
return ret;
}
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.h 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.h 2011-07-27 14:02:57 UTC (rev 2209)
@@ -3385,7 +3385,7 @@
template <class Listener>
PreComponentActionListener*
- addPortComponentActionListener(PreCompActionListenerType listener_type,
+ addPreComponentActionListener(PreCompActionListenerType listener_type,
Listener& obj,
void (Listener::*memfunc)(UniqueId ec_id))
{
@@ -4883,7 +4883,9 @@
{
if (!::CORBA::is_nil(ec) && !ec->_non_existent())
{
+
ec->deactivate_component(RTC::LightweightRTObject::_duplicate(m_comp));
+ ec->stop();
}
}
LightweightRTObject_var m_comp;
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtm-naming/rtm-naming.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtm-naming/rtm-naming.in 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtm-naming/rtm-naming.in 2011-07-27 14:02:57 UTC (rev 2209)
@@ -4,8 +4,7 @@
# @date $Date: 2005-05-12 09:06:19 $
# @author Noriaki Ando <n-ando at aist.go.jp>
#
-# Copyright (C) 2003-2005
-# Task-intelligence Research Group,
+# Copyright (C) 2003-2011
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
@@ -14,10 +13,11 @@
# $Id$
#
+pname=`basename $cosnames`
hostname=`hostname`
currdir=`pwd`
+DEBUG=""
-
usage()
{
cat<<EOF
@@ -25,28 +25,301 @@
EOF
}
-omniname()
+
+#
+# debug <text>
+#
+# Debug print. If variable "DEBUG" is defined, text will be printed.
+#
+# @param text to be printed.
+#
+debug()
{
- if test -f $cosnames ; then
- rm -f ./omninames-$hostname.log
- rm -f ./omninames-$hostname.bak
- echo 'Starting omniORB omniNames: '$hostname':'$port
- $cosnames -start $port -logdir $currdir &
+ if test "x$DEBUG" != "x"; then
+ echo $*
+ fi
+}
+#
+# get_pid_of_nsport <port_number>
+#
+# @param pid_of_nsport: Process ID of a process which is using the port.
+# @param pname_of_nsport: Process name which is using the port is set
+# @param pid_of_nsport: Process ID which is using the port is set
+# @return 0 process that is using the port was found
+# 1 process not found
+#
+#
+get_pid_of_nsport()
+{
+ _port=$1
+ debug "netstat -tanp 2> /dev/null | grep $_port | awk '{print $7;}'"
+ netstat_tanp=`netstat -tanp`
+ _netstat=`netstat -tanp 2> /dev/null | grep $_port | awk '{if($7!="-"){print $7;}}'`
+ debug "A possible process that is using $port port:" $_netstat
+ if test "x$_netstat" = "x"; then
+ debug "No process using port number ${_port} on the system."
+ return 1
+ fi
+ if test "x$_netstat" = "x"; then
+ debug "Process information could not be identified."
+ return 1
+ fi
+
+ _pid=`echo $_netstat | awk 'BEGIN{FS="/";}{print $1;}'`
+ pname_of_nsport=`echo $_netstat | awk 'BEGIN{FS="/";}{print $2;}'`
+ pid_of_nsport=$_pid
+ debug "$_port port is used by $pname_of_nsport (pid = $_pid)."
+ return 0
+}
+
+
+#
+# is_launch_from_init <prog_name> (<pid>)
+#
+# @param prog_name The name of the program
+# @param pid The pid of the program
+# @param init_script A path to init script is set
+# @return 0: The program might be started from init script
+# 1: The program might not be started from init script
+#
+is_started_from_init()
+{
+ debug "number of args" $#
+ if test $# -eq 2; then
+ _pname=$1
+ _pid=$2
+ elif test $# -eq 1; then
+ debug "pid is not specified. It is obtained from pid file."
+ _pname=$1
+ _pid=`cat /var/run/$_pname.pid`
+ elif test $# -eq 0; then
+ debug "No program name specified."
+ fi
+
+ if test -f /var/run/$_pname.pid; then
+ debug "pid file: /var/run/$_pname.pid found"
+ _var_run_pid=`cat /var/run/$_pname.pid`
+
+ debug "specified pid: " $_pid
+ debug "/var/run/$_pname.pid: " $_var_run_pid
+
+ if test $_pid -eq $_var_run_pid; then
+ debug "The process $_pname ($_pid) might be started " \
+ "from init script."
+ debug "searching init script: $cosnames"
+ init_script=`grep $cosnames /etc/init.d/* | awk 'BEGIN{FS=":";}{if(FNR==1){print $1;}}'`
+
+ if test "x$init_script" = "x"; then
+
+ echo "Init script not found. Aborting"
+ exit 1
+ fi
+ debug "Init script found: $init_script"
+ return 0
fi
+
+ debug "The process $_pname ($_pid) might not be started " \
+ "from init script."
+ return 1
+ fi
+ debug "/var/run/$_pname.pid not found."
+ return 1
}
-taonames()
+
+#
+# check_cosname
+#
+# Checking if global variable "cosname" is set.
+#
+check_cosname()
{
- if test -f $cosnames ; then
- echo 'Starting TAO Naming_Service: '$hostname':'$port
- $cosnames -ORBEndPoint iiop://$hostname:$port &
+ if test ! -f $cosnames ; then
+ echo "Name service program ($cosnames) not found."
+ echo "Please install or chech rtm-naming script."
+ exit 1
+ fi
+}
+
+
+#
+# stop_existing_ns
+#
+# This function try to stop existing nameing service.
+#
+# 1. It tries to find a process which is using specified port. If the
+# process is not same as naming-service to be started by this
+# script, script will be aborted.
+#
+# 2. Next, it checks if the process is started from init script. If
+# the process is started from the init script, it tries to stop it
+# by the script.
+#
+# 3. The process is not started by init script, it tries to stop the
+# process by pkill command.
+#
+stop_existing_ns()
+{
+ get_pid_of_nsport $port
+ if test $? -eq 0; then
+ debug "The Process information using the port could be obtained."
+ # If "port" is used by other program -> abort
+
+ pids=`pgrep $pname`
+ matchflag=0
+ for p in $pids; do
+ if test "x$pid_of_nsport" = "x$p"; then
+ matchflag=1
+ fi
+ done
+ if test $matchflag -eq 0; then
+ echo "$pname_of_nsport (not $pname) is using the port."
+ echo "Starting $pname aborted. Please use the other port."
+ exit 1
fi
+ else
+ debug "The process information using the port could not be obtained."
+ pname_of_nsport=$pname
+ pid_of_nsport=`pgrep $pname`
+ fi
+
+
+ is_started_from_init $pname_of_nsport $pid_of_nsport
+
+ # omniNames is not started by init script
+ if test $? -ne 0; then
+ debug "$pname might not be started from init script."
+ if test "x$pid_of_nsport" != "x" ; then
+ echo "$pname (pid: $pid_of_nsport) is running"
+ read -p "Kill anyway and start $pname again? (y/N)" killns
+ if test "x$killns" = "xy" -o "x$killns" = "xY"; then
+ pkill -f $pname
+ echo "$pname (pid: $pid_of_nsport) are killed"
+ return 0
+ fi
+ echo "Aborting"
+ exit 1
+ fi
+ echo "No running $pname found. The process using the port $port "
+ echo "cannot be estimated. Arboting"
+ exit 1
+ fi
+
+ # omniNames is started by init script
+ echo "omniNames might be started $init_script."
+ echo "Stop it (password for sudo is required.)"
+ read -p "and start omniNames by rtm-naming? (y/N)" startns
+
+ if test "x$startns" != "xy" -a "x$startns" != "xY" ; then
+ echo "Aborted."
+ exit 1
+ fi
+ echo "Stopping omniNames by $init_script."
+ sudo $init_script stop
+ return 0
}
+#------------------------------------------------------------
+# omniNames specific functions
+#------------------------------------------------------------
+#
+# start_omninames
+#
+# This function starts omniNames and checks it is properly started.
+# If omniNames could not be started properly, this function returns 1.
+#
+start_omninames()
+{
+ echo 'Starting omniORB omniNames: '$hostname':'$port
+ rm -f ./omninames-$hostname.log
+ rm -f ./omninames-$hostname.bak
+ $cosnames -start $port -logdir $currdir &
+ ret=$!
+ sleep 1
+ debug "return code of omniNames:" $ret
+ omnip=`ps $! | wc -l`
+ if test $omnip -gt 1; then
+ echo "omniNames properly started"
+ exit 0
+ fi
+ return 1
+}
-port=$1
+omniname()
+{
+ # Check cosname variable is properly set
+ check_cosname
+ # Starting omniNames
+ start_omninames
+ echo "omniNames was not properly started."
+
+ # Stopping existing name service
+ stop_existing_ns
+
+ # Try to start omniNames again
+ start_omninames
+ echo "omniNames was not properly started."
+}
+
+#------------------------------------------------------------
+# TAO Naming_Service specific functions
+#------------------------------------------------------------
+#
+# start_taonames
+#
+# This function starts TAO Naming_Service and checks it is properly started.
+# If TAO Naming_Service could not be started properly, this function returns 1.
+#
+start_taonames()
+{
+ if test ! -f $cosnames ; then
+ echo "TAO Naming_Service not found. Aborting."
+ exit 1
+ fi
+ echo 'Starting TAO Naming_Service: '$hostname':'$port
+ $cosnames -m 0 -ORBListenEndpoints iiop://:$port &
+ ret=$!
+ sleep 1
+ debug "return code of TAO Naming_Service:" $ret
+ omnip=`ps $! | wc -l`
+ if test $omnip -gt 1; then
+ echo "TAO Naming_Service properly started"
+ exit 0
+ fi
+ return 1
+
+}
+
+taonames()
+{
+ # Check cosname variable is properly set
+ check_cosname
+
+ # Starting omniNames
+ start_taonames
+ echo "TAO Naming_Service was not properly started."
+
+ # Stopping existing name service
+ stop_existing_ns
+
+ # Try to start omniNames again
+ start_taonames
+ echo "TAO Naming_Service was not properly started."
+}
+
+
+
+#------------------------------------------------------------
+# main
+#------------------------------------------------------------
+if test $# -gt 0; then
+ port=$1
+else
+ port=2809
+fi
+
case $orb in
omniORB)
omniname
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat 2011-07-27 14:02:57 UTC (rev 2209)
@@ -20,7 +20,11 @@
@rem RTSE should be under the following OMNI_ROOT directory.
@rem ------------------------------------------------------------
@set RTM_ROOT=%~dp0
+<<<<<<< .working
@set PATH="C:\Program Files\Microsoft Visual Studio 10.0\VC\vcpackages";%PATH%
+=======
+ at set PATH="C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\";"C:\Program Files\Microsoft Visual Studio 10.0\VC\BIN";"c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319";"C:\Program Files\Microsoft Visual Studio 10.0\VC\vcpackages";%PATH%
+>>>>>>> .merge-right.r2208
@set OMNI_ROOT=C:\distribution\omniORB-4.1.4_vc10
@set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
@set VC_VERSION=Visual C++ 2010
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/Makefile.am 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/Makefile.am 2011-07-27 14:02:57 UTC (rev 2209)
@@ -43,7 +43,6 @@
OpenRTP/openrtpwxs.py \
OpenCV2.1/OpenCV_inc.wxs.in \
OpenCV2.1/opencvwxs.py \
- OpenCV-RTC/OpenCVRTC_bin.yaml \
OpenCV-RTC/OpenCV-RTC_inc.wxs.in \
OpenCV-RTC/opencvrtcwxs.py
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCV-RTC_inc.wxs.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCV-RTC_inc.wxs.in 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCV-RTC_inc.wxs.in 2011-07-27 14:02:57 UTC (rev 2209)
@@ -14,9 +14,6 @@
Icon="RTC.ico" IconIndex="0"
{% if-any file.Arguments %}
Arguments='{% file.Arguments %}'{% endif %}>
- {% if file.Name is AffineComp.exe %}
- <Icon Id="RTC.ico" SourceFile="Bitmaps\RTC.ico"/>
- {% endif %}
</Shortcut>
{% endif %}{% endif %}
</File>
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCVRTC_bin.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCVRTC_bin.yaml 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCVRTC_bin.yaml 2011-07-27 14:02:57 UTC (rev 2209)
@@ -225,3 +225,8 @@
Name: translateComp.exe
Source: C:\\distribution\\ImageProcessing\\opencv\\bin\\translateComp.exe
Shortcut: true
+ - Id: OpenCVRTCBin0050
+ ShortName: rtc.conf
+ Name: rtc.conf
+ Source: C:\\distribution\\ImageProcessing\\opencv\\bin\\rtc.conf
+ Shortcut: false
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py 2011-07-27 14:02:57 UTC (rev 2209)
@@ -15,7 +15,7 @@
#
data = [
- ("bin", "*.dll *.exe")
+ ("bin", "*.dll *.exe rtc.conf")
]
import os
@@ -62,13 +62,13 @@
for f in files.split(" "):
flist += glob.glob(full_path + "\\" + f)
- #cmd = ["flist",
- # "-c", comp_name,
- # "-o", dir_name + ".yaml",
- # "-p", base_dir + path]
- #cmd += flist
- #
- #makewxs.main(cmd)
+ cmd = ["flist",
+ "-c", comp_name,
+ "-o", dir_name + ".yaml",
+ "-p", base_dir + path]
+ cmd += flist
+
+ makewxs.main(cmd)
cmd = ["wxs",
Copied: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV22_inc.wxs.in (from rev 2208, trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV22_inc.wxs.in)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV22_inc.wxs.in (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV22_inc.wxs.in 2011-07-27 14:02:57 UTC (rev 2209)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <!-- root directory -->
+ <Directory Id="OpenCVRoot" Name="OpenCV2.2">
+ <Component Id="OpenCV" Guid="{% OpenCV.GUID %}">
+ <Environment Id="OPENCV_DIR" Name="OpenCV_DIR" Action="set"
+ System="yes" Value="[OpenCVRoot]" />
+ {% for file in OpenCV.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+
+ <!-- bin -->
+ <Directory Id="OpenCV_bin" Name="bin">
+ <Component Id="OpenCVBin" Guid="{% OpenCVBin.GUID %}">
+ <Environment Id="OpenCVUpdatePath" Name="PATH" Action="set"
+ System="yes" Part="last"
+ Value="[OpenCV_bin]" />
+ {% for file in OpenCVBin.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- include -->
+ <Directory Id="OpenCV_include" Name="include">
+ <Directory Id="OpenCV_include_opencv" Name="opencv">
+ <Component Id="OpenCVIncludeOpencv" Guid="{% OpenCVIncludeOpencv.GUID %}">
+ {% for file in OpenCVIncludeOpencv.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+ </Directory>
+
+ <!-- lib -->
+ <Directory Id="OpenCV_lib" Name="lib">
+ <Component Id="OpenCVLib" Guid="{% OpenCVLib.GUID %}">
+ {% for file in OpenCVLib.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+ <!-- end of lib -->
+
+ <!-- doc -->
+ <Directory Id="OpenCV_doc" Name="doc">
+ <Component Id="OpenCVDoc" Guid="{% OpenCVDoc.GUID %}">
+ {% for file in OpenCVDoc.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+ <!-- end of doc -->
+ </Directory>
+</Include>
+
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in 2011-07-27 14:02:57 UTC (rev 2209)
@@ -3,7 +3,7 @@
<!-- root directory -->
<Directory Id="OpenCVRoot" Name="OpenCV2.1">
<Component Id="OpenCV" Guid="{% OpenCV.GUID %}">
- <Environment Id="OPENCV_ROOT" Name="OPENCV_ROOT" Action="set"
+ <Environment Id="OPENCV_DIR" Name="OpenCV_DIR" Action="set"
System="yes" Value="[OpenCVRoot]" />
{% for file in OpenCV.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
@@ -17,7 +17,7 @@
<Component Id="OpenCVBin" Guid="{% OpenCVBin.GUID %}">
<Environment Id="OpenCVUpdatePath" Name="PATH" Action="set"
System="yes" Part="last"
- Value="%OPENCV_ROOT%\bin" />
+ Value="[OpenCV_bin]" />
{% for file in OpenCVBin.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py 2011-07-27 14:02:57 UTC (rev 2209)
@@ -14,7 +14,7 @@
# $Id$
#
-OpenCV_files = "README"
+OpenCV_files = "README OpenCVConfig.cmake"
data = [
("", OpenCV_files),
@@ -76,9 +76,15 @@
makewxs.main(cmd)
+import re
+if None != re.search('2\.2',base_dir):
+ cmd = ["wxs",
+ "-o", "OpenCV_inc.wxs",
+ "-i", "OpenCV22_inc.wxs.in"]
+else:
+ cmd = ["wxs",
+ "-o", "OpenCV_inc.wxs",
+ "-i", "OpenCV_inc.wxs.in"]
-cmd = ["wxs",
- "-o", "OpenCV_inc.wxs",
- "-i", "OpenCV_inc.wxs.in"]
cmd += glob.glob("*.yaml")
makewxs.main(cmd)
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in 2011-07-27 14:02:57 UTC (rev 2209)
@@ -54,7 +54,7 @@
System='yes' Part='all' Value='[Version]' />
<Environment Id='UpdatePath' Name='PATH' Action='set'
System='yes' Part='last'
- Value='%RTM_ROOT%\bin' />
+ Value='[bin]' />
{% for file in Bin.Files %}
<File Id="{% file.Id %}"
Name="{% file.Name %}" DiskId="1"
@@ -322,7 +322,7 @@
<!-- プログラムフォルダ -->
<Directory Id="ProgramMenuFolder">
<Directory Id="AppMenuFolder"
- Name="{% Product.Name %}">
+ Name="{% Product.Name %} {% Product.ShortVersion %}">
<Directory Id="CxxMenuFolder" Name="C++">
<Directory Id="ToolsMenuFolder" Name="tools">
</Directory>
@@ -341,7 +341,8 @@
<!-- OpenRTM-aist -->
- <Feature Id="OpenRTM" Level="1" Title="OpenRTM-aist (C++)">
+ <Feature Id="OpenRTM" Level="1" Title="OpenRTM-aist (C++)"
+ ConfigurableDirectory="INSTALLLOCATION">
<!-- runtime -->
<Feature Id="Runtime" Level="1" Title="Runtime Environment">
<ComponentRef Id="Bin"/>
@@ -459,7 +460,7 @@
<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
<WixVariable Id="WixUIBannerBmp" Value="Bitmaps/bannrbmp.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="Bitmaps/dlgbmp.bmp" />
- <WixVariable Id="WixUICostingPopupOptOut" Value="1" Overridable="yes" />
+ <WixVariable Id="WixUICostingPopupOptOut" Value="1" Overridable="no" />
<!-- <UIRef Id="WixUI_Mondo" /> -->
<!-- WixUI_Mondo にインストールの種類を選択するダイアログを追加したもの -->
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs 2011-07-27 14:02:57 UTC (rev 2209)
@@ -2,7 +2,7 @@
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- root directory -->
<Directory Id="OpenRTP" Name="OpenRTP">
- <Directory Id="OpenRTPVersion" Name="0.1">
+ <Directory Id="OpenRTPVersion" Name="1.1">
<Component Id="Openrtp" Guid="6C2EF40F-8300-11E0-B1B3-00059A3C7800">
<Environment Id="OPENRTP_ROOT" Name="OPENRTP_ROOT" Action="set"
System="yes" Value="[openrtpVersion]" />
@@ -10,7 +10,8 @@
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\RTSystemEditorRCP.exe">
<Shortcut Id="Openrtp0000" Directory="ToolsMenuFolder"
Name="RTSystemEditor"
- Show="normal" WorkingDirectory="tools"/>
+ Arguments="-data "%USERPROFILE%\workspace""
+ Show="normal" WorkingDirectory="OpenRTPVersion"/>
</File>
<File Id="Openrtp0001" Name=".eclipseproduct"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\.eclipseproduct">
@@ -35,38 +36,38 @@
<File Id="OpenrtpPlugins0001" Name="com.ibm.icu_3.8.1.v20080530.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\com.ibm.icu_3.8.1.v20080530.jar">
</File>
- <File Id="OpenrtpPlugins0002" Name="jp.go.aist.rtm.nameserviceview.nl1_1.1.0.v20110411.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.nameserviceview.nl1_1.1.0.v20110411.jar">
+ <File Id="OpenrtpPlugins0002" Name="jp.go.aist.rtm.nameserviceview.nl1_1.1.0.rc2v20110725.jar"
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.nameserviceview.nl1_1.1.0.rc2v20110725.jar">
</File>
- <File Id="OpenrtpPlugins0003" Name="jp.go.aist.rtm.nameserviceview_1.1.0.v20110411.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.nameserviceview_1.1.0.v20110411.jar">
+ <File Id="OpenrtpPlugins0003" Name="jp.go.aist.rtm.nameserviceview_1.1.0.rc2v20110725.jar"
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.nameserviceview_1.1.0.rc2v20110725.jar">
</File>
- <File Id="OpenrtpPlugins0004" Name="jp.go.aist.rtm.repositoryView.nl1_1.1.0.v20110411.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.repositoryView.nl1_1.1.0.v20110411.jar">
+ <File Id="OpenrtpPlugins0004" Name="jp.go.aist.rtm.repositoryView.nl1_1.1.0.rc2v20110725.jar"
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.repositoryView.nl1_1.1.0.rc2v20110725.jar">
</File>
- <File Id="OpenrtpPlugins0005" Name="jp.go.aist.rtm.repositoryView_1.1.0.v20110411.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.repositoryView_1.1.0.v20110411.jar">
+ <File Id="OpenrtpPlugins0005" Name="jp.go.aist.rtm.repositoryView_1.1.0.rc2v20110725.jar"
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.repositoryView_1.1.0.rc2v20110725.jar">
</File>
- <File Id="OpenrtpPlugins0006" Name="jp.go.aist.rtm.systemeditor.nl1_1.1.0.v20110509.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.systemeditor.nl1_1.1.0.v20110509.jar">
+ <File Id="OpenrtpPlugins0006" Name="jp.go.aist.rtm.systemeditor.nl1_1.1.0.rc2v20110725.jar"
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.systemeditor.nl1_1.1.0.rc2v20110725.jar">
</File>
<File Id="OpenrtpPlugins0007" Name="jp.go.aist.rtm.systemeditor.RCP_1.0.0.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.systemeditor.RCP_1.0.0.jar">
</File>
- <File Id="OpenrtpPlugins0008" Name="jp.go.aist.rtm.systemeditor_1.1.0.v20110520.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.systemeditor_1.1.0.v20110520.jar">
+ <File Id="OpenrtpPlugins0008" Name="jp.go.aist.rtm.systemeditor_1.1.0.rc2v20110725.jar"
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.systemeditor_1.1.0.rc2v20110725.jar">
</File>
- <File Id="OpenrtpPlugins0009" Name="jp.go.aist.rtm.toolscommon.nl1_1.1.0.v20110428.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.toolscommon.nl1_1.1.0.v20110428.jar">
+ <File Id="OpenrtpPlugins0009" Name="jp.go.aist.rtm.toolscommon.nl1_1.1.0.rc2v20110725.jar"
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.toolscommon.nl1_1.1.0.rc2v20110725.jar">
</File>
- <File Id="OpenrtpPlugins0010" Name="jp.go.aist.rtm.toolscommon.profiles.nl1_1.1.0.v20110411.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.toolscommon.profiles.nl1_1.1.0.v20110411.jar">
+ <File Id="OpenrtpPlugins0010" Name="jp.go.aist.rtm.toolscommon.profiles.nl1_1.1.0.rc2v20110725.jar"
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.toolscommon.profiles.nl1_1.1.0.rc2v20110725.jar">
</File>
- <File Id="OpenrtpPlugins0011" Name="jp.go.aist.rtm.toolscommon.profiles_1.1.0.v20110411.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.toolscommon.profiles_1.1.0.v20110411.jar">
+ <File Id="OpenrtpPlugins0011" Name="jp.go.aist.rtm.toolscommon.profiles_1.1.0.rc2v20110725.jar"
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.toolscommon.profiles_1.1.0.rc2v20110725.jar">
</File>
- <File Id="OpenrtpPlugins0012" Name="jp.go.aist.rtm.toolscommon_1.1.0.v20110519.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.toolscommon_1.1.0.v20110519.jar">
+ <File Id="OpenrtpPlugins0012" Name="jp.go.aist.rtm.toolscommon_1.1.0.rc2v20110725.jar"
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\jp.go.aist.rtm.toolscommon_1.1.0.rc2v20110725.jar">
</File>
<File Id="OpenrtpPlugins0013" Name="org.eclipse.core.commands.nl_ja_3.4.0.I20080509-2000.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.core.commands.nl_ja_3.4.0.I20080509-2000.jar">
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs.in 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs.in 2011-07-27 14:02:57 UTC (rev 2209)
@@ -2,7 +2,7 @@
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- root directory -->
<Directory Id="OpenRTP" Name="OpenRTP">
- <Directory Id="OpenRTPVersion" Name="0.1">
+ <Directory Id="OpenRTPVersion" Name="1.1">
<Component Id="Openrtp" Guid="{% Openrtp.GUID %}">
<Environment Id="OPENRTP_ROOT" Name="OPENRTP_ROOT" Action="set"
System="yes" Value="[openrtpVersion]" />
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/WixUI_ja-jp.wxl
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/WixUI_ja-jp.wxl 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/WixUI_ja-jp.wxl 2011-07-27 14:02:57 UTC (rev 2209)
@@ -202,7 +202,7 @@
<String Id="SetupTypeDlgTypicalButtonTooltip" Overridable="yes">標準インストール</String>
<String Id="SetupTypeDlgCustomButton" Overridable="yes">カスタム(&U)</String>
<String Id="SetupTypeDlgCustomButtonTooltip" Overridable="yes">カスタム インストール</String>
- <String Id="SetupTypeDlgCompleteButton" Overridable="yes">完了(&O)</String>
+ <String Id="SetupTypeDlgCompleteButton" Overridable="yes">完全(&O)</String>
<String Id="SetupTypeDlgCompleteButtonTooltip" Overridable="yes">完全インストール</String>
<String Id="SetupTypeDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
<String Id="SetupTypeDlgTitle" Overridable="yes">{\WixUI_Font_Title}セットアップの種類の選択</String>
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/omniORB/omniORB_inc.wxs.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/omniORB/omniORB_inc.wxs.in 2011-07-23 22:42:32 UTC (rev 2208)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/installer/omniORB/omniORB_inc.wxs.in 2011-07-27 14:02:57 UTC (rev 2209)
@@ -19,7 +19,7 @@
<Component Id="OmniBinScripts" Guid="{% OmniBinScripts.GUID %}">
<Environment Id="OmniUpdatePath" Name="PATH" Action="set"
System="yes" Part="last"
- Value="%OMNI_ROOT%\bin\x86_win32" />
+ Value="[omni_bin]x86_win32" />
{% for file in OmniBinScripts.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
openrtm-commit メーリングリストの案内