[openrtm-commit:02973] r3109 - in branches/RELENG_1_2/OpenRTM-aist: . build src/ext src/ext/ec/artlinux src/ext/ec/logical_time src/ext/ec/rtpreempt src/ext/logger/fluentbit_stream src/ext/sdo src/ext/sdo/logger src/lib/coil src/lib/coil/posix/coil src/lib/coil/tests/UUID src/lib/coil/win32/coil src/lib/rtm src/lib/rtm/idl src/lib/rtm/tests/CORBA_IORUtil src/lib/rtm/tests/ConnectorListener src/lib/rtm/tests/CorbaNaming src/lib/rtm/tests/CorbaPort src/lib/rtm/tests/DataInOutPort src/lib/rtm/tests/ECFactory src/lib/rtm/tests/ExtTrigExecutionContext src/lib/rtm/tests/Factory src/lib/rtm/tests/Manager src/lib/rtm/tests/ManagerServant src/lib/rtm/tests/ModuleManager src/lib/rtm/tests/NamingManager src/lib/rtm/tests/PeriodicECSharedComposite src/lib/rtm/tests/PeriodicExecutionContext src/lib/rtm/tests/PortAdmin src/lib/rtm/tests/PortBase src/lib/rtm/tests/RTObject src/lib/rtm/tests/SdoConfiguration src/lib/rtm/tests/SdoOrganization src/lib/rtm/tests/SystemLogger win32/OpenRTM-aist win32/OpenRTM-aist/ext win32/OpenRTM-aist/ext/ec win32/OpenRTM-aist/ext/sdo
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 12月 10日 (日) 15:37:02 JST
Author: n-ando
Date: 2017-12-10 15:37:02 +0900 (Sun, 10 Dec 2017)
New Revision: 3109
Added:
branches/RELENG_1_2/OpenRTM-aist/src/ext/CMakeLists.txt
branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/CMakeLists.txt
branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/SharedMemory.idl
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/artlinux/
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/rtpreempt/
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/logger/
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/logger/
Modified:
branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py
branches/RELENG_1_2/OpenRTM-aist/build/codegen.py
branches/RELENG_1_2/OpenRTM-aist/build/ezt.py
branches/RELENG_1_2/OpenRTM-aist/build/makedeffile.py
branches/RELENG_1_2/OpenRTM-aist/build/makevcproj.py
branches/RELENG_1_2/OpenRTM-aist/build/makewrapper.py
branches/RELENG_1_2/OpenRTM-aist/build/makewxs.py
branches/RELENG_1_2/OpenRTM-aist/build/pickupprojs.py
branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_debian.sh
branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_raspbian.sh
branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_ubuntu.sh
branches/RELENG_1_2/OpenRTM-aist/build/setuptest.py
branches/RELENG_1_2/OpenRTM-aist/build/slntool.py
branches/RELENG_1_2/OpenRTM-aist/build/uuid.py
branches/RELENG_1_2/OpenRTM-aist/build/vcprojtool.py
branches/RELENG_1_2/OpenRTM-aist/build/vcxprojtool.py
branches/RELENG_1_2/OpenRTM-aist/build/vsprops2cmake.py
branches/RELENG_1_2/OpenRTM-aist/build/yat.py
branches/RELENG_1_2/OpenRTM-aist/configure.ac
branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.cpp
branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h
branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/Logger.idl
branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/configure.ac
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/posix/coil/SharedMemory.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/coil/SharedMemory.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortSHMProvider.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMProvider.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.h
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CORBA_IORUtil/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ConnectorListener/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CorbaNaming/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CorbaPort/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/DataInOutPort/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ECFactory/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/Factory/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/NamingManager/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PeriodicECSharedComposite/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PeriodicExecutionContext/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PortAdmin/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PortBase/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SdoConfiguration/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SdoOrganization/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am
Log:
merged changes from trunk/OpenRTM-aist r3057-3062, 3065, 3070-3074, 3076-3083, 3086-3087 during 2017-11:
[incompat,->RELENG_1_2] Convert from Shift-JIS to UTF-8-BOM. refs #3269
[incompat,->RELENG_1_2] Shared memory data port implementation. #3269
[incompat,->RELENG_1_2] Shared memory data port implementation. refs #3269
[incompat,->RELENG_1_2] Python 3 support.
[incompat,bugfix,->RELENG_1_2] revision 3060.
[compat,bugfix,->RELENG_1_2] Shared memory data port implementation. refs #3269
[compat,->RELENG_1_1] Public key registration has been added. refs #4221
[compat,->RELENG_1_2] bug fix.
[compat,->RELENG_1_1] fixed bug. refs #4221
[compat,->RELENG_1_2] bug fix.
[incompat,bugfix,->RELENG_1_2] '-lrt' option has been added. refs #3269
[incompat,bugfix,->RELENG_1_2] '-lrt' option has been added. refs #3269
[incompat,bugfix,->RELENG_1_2] Modified Logger.idl.
[incompat,bugfix,->RELENG_1_2] Modified Logger.idl.
[incompat,->RELENG_1_2] Extension modules under src/ext have been added to dist packages. refs #4368
[incompat,->RELENG_1_2] Extension modules under src/ext have been added to dist packages. refs #4368
[incompat,->RELENG_1_2] Extension modules under src/ext have been added to dist packages. refs #4368
[compat,->RELENG_1_2] bug fix.
[compat,->RELENG_1_2] bug fix.
[build,->RELENG_1_2] Update fluent-bit's include path. refs #4373
[incompat,->RELENG_1_2] LogicalTimeTriggeredEC has been added to build under Windows. refs #4368
[incompat,->RELENG_1_2] LogicalTimeTriggeredEC has been added to build under Windows. refs #4368
Modified: branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -156,12 +156,12 @@
if __name__ == '__main__':
import os
if len(sys.argv) < 2:
- print "please specify vsprops file"
+ print("please specify vsprops file")
sys.exit(1)
fname = sys.argv[1]
if fname.split(".")[-1] != "vsprops":
- print "please specify vsprops file"
+ print("please specify vsprops file")
sys.exit(1)
f = file(sys.argv[1], "r")
Modified: branches/RELENG_1_2/OpenRTM-aist/build/codegen.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/codegen.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/codegen.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -165,9 +165,9 @@
return
t = yat.Template(temp_txt)
text = t.generate(data)
- fd.write(text)
+ fd.write(text)
fd.close()
- print "\"" + fname + "\"" " was generated."
+ print("\"" + fname + "\"" " was generated.")
return
def gen_all(self):
Modified: branches/RELENG_1_2/OpenRTM-aist/build/ezt.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/ezt.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/ezt.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -167,7 +167,10 @@
import string
import re
-from types import StringType, IntType, FloatType
+#from types import StringType, IntType, FloatType
+StringType = str
+IntType = int
+FloatType = float
import os
#
@@ -365,7 +368,9 @@
else:
fp.write(value)
- def _cmd_format(self, (valref, args), fp, ctx):
+ def _cmd_format(self, ref, fp, ctx):
+ valref = ref[0]
+ args = ref[1]
fmt = _get_value(valref, ctx)
parts = _re_subst.split(fmt)
for i in range(len(parts)):
@@ -378,7 +383,9 @@
piece = '<undef>'
fp.write(piece)
- def _cmd_include(self, (valref, reader), fp, ctx):
+ def _cmd_include(self, ref, fp, ctx):
+ valref = ref[0]
+ reader = ref[1]
fname = _get_value(valref, ctx)
### note: we don't have the set of for_names to pass into this parse.
### I don't think there is anything to do but document it.
@@ -412,7 +419,7 @@
def _cmd_is(self, args, fp, ctx):
((left_ref, right_ref), t_section, f_section) = args
value = _get_value(right_ref, ctx)
- value = string.lower(_get_value(left_ref, ctx)) == string.lower(value)
+ value = _get_value(left_ref, ctx).lower() == value.lower()
self._do_if(value, t_section, f_section, fp, ctx)
def _do_if(self, value, t_section, f_section, fp, ctx):
@@ -466,7 +473,7 @@
if idx < len(file_args):
return file_args[idx]
- parts = string.split(refname, '.')
+ parts = refname.split('.')
start = parts[0]
rest = parts[1:]
while rest and (start in for_names):
@@ -479,7 +486,10 @@
break
return refname, start, rest
-def _get_value((refname, start, rest), ctx):
+def _get_value(ref, ctx):
+ refname = ref[0]
+ start = ref[1]
+ rest = ref[2]
"""(refname, start, rest) -> a prepared `value reference' (see above).
ctx -> an execution context instance.
@@ -490,10 +500,10 @@
if rest is None:
# it was a string constant
return start
- if ctx.for_index.has_key(start):
+ if start in ctx.for_index:
list, idx = ctx.for_index[start]
ob = list[idx]
- elif ctx.data.has_key(start):
+ elif start in ctx.data:
ob = ctx.data[start]
else:
raise UnknownReference(refname)
Modified: branches/RELENG_1_2/OpenRTM-aist/build/makedeffile.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/makedeffile.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/makedeffile.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -70,7 +70,7 @@
sys.exit(1)
cmd = "DUMPBIN.EXE /SYMBOLS %s" % libfile
- print cmd
+ print(cmd)
dumped = os.popen(cmd)
definitions = {}
@@ -94,13 +94,13 @@
definitions[symbol] = None
- symbols = definitions.keys()
+ symbols = list(definitions.keys())
symbols.sort()
- print "Output %d symbols." % len(symbols)
+ print("Output %d symbols." % len(symbols))
out = open(deffile, "w")
- if string.lower(binname[4:]) == ".exe":
+ if binname[4:].lower() == ".exe":
out.write("NAME %s\n" % binname)
else:
out.write("LIBRARY %s\n" % binname)
Modified: branches/RELENG_1_2/OpenRTM-aist/build/makevcproj.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/makevcproj.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/makevcproj.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -21,9 +21,9 @@
import yaml
def print_usage():
- print """usage:
+ print("""usage:
%s -i [input_file] -d [dictionary] -o [output_file]
-"""
+""")
def load_dict(filename):
@@ -45,7 +45,7 @@
try:
opts, args = getopt.getopt(sys.argv[1:], "i:o:d:", [])
except:
- print "Error: Invalid option.", getopt.GetoptError
+ print("Error: Invalid option.", getopt.GetoptError)
print_usage()
sys.exit(-1)
return
Modified: branches/RELENG_1_2/OpenRTM-aist/build/makewrapper.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/makewrapper.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/makewrapper.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -262,17 +262,17 @@
newtext = re.sub(" \@date.*?\n", "", text)
oldtext2 = re.sub(" \@date.*?\n", "", oldtext)
if newtext == oldtext2:
- print "\"", fname, \
- "\" already exists and it will be same as new one."
- print "File is not need to be generated."
+ print("\"", fname, \
+ "\" already exists and it will be same as new one.")
+ print ("File is not need to be generated.")
return
else:
- print "\"", fname, "\" already exists but contents are not same"
+ print("\"", fname, "\" already exists but contents are not same")
f = file(fname, "w")
f.write(text)
f.close()
- print "\"", fname, "\"" " was generated."
+ print("\"", fname, "\"" " was generated.")
return
def gen_all(self):
Modified: branches/RELENG_1_2/OpenRTM-aist/build/makewxs.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/makewxs.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/makewxs.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -101,7 +101,7 @@
return self.comp + '%04d' % (self.count)
def sn_num(self, name):
- if self.shortnames.has_key(name):
+ if name in self.shortnames:
self.shortnames[name] += 1
else:
self.shortnames[name] = 0
@@ -108,7 +108,7 @@
return "%03d" % (self.shortnames[name])
def se_num(self, ext):
- if self.shortext.has_key(ext):
+ if ext in self.shortext:
self.shortext[ext] += 1
else:
self.shortext[ext] = 0
@@ -158,7 +158,7 @@
def usage():
- print """makewxs.py cmd options
+ print("""makewxs.py cmd options
commands:
flist: make file list to be included wxs file
wxs : make wxs file from a input template file and yaml files
@@ -165,7 +165,7 @@
examples:
makewxs.py flist -c ComponentName -p Path -o OutputFilename file_names...
makewxs.py wxs -o Output.wxs -i InputTempalte input_yaml_files...
-"""
+""")
def main(argv):
Modified: branches/RELENG_1_2/OpenRTM-aist/build/pickupprojs.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/pickupprojs.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/pickupprojs.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -38,4 +38,4 @@
if name != "" and guid != "":
break
-print name + "GUID:", guid
+print(name + "GUID:", guid)
Modified: branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_debian.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_debian.sh 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_debian.sh 2017-12-10 06:37:02 UTC (rev 3109)
@@ -307,10 +307,16 @@
exit 0
else
echo $openrtm_repo >> /etc/apt/sources.list
- # 公開鍵登録
- #apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
fi
fi
+
+ if test "x$FORCE_YES" = "xtrue" ; then
+ apt-get install --assume-yes --allow-unauthenticated dirmngr
+ else
+ apt-get install dirmngr
+ fi
+ # 公開鍵登録
+ apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
}
#----------------------------------------
Modified: branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_raspbian.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_raspbian.sh 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_raspbian.sh 2017-12-10 06:37:02 UTC (rev 3109)
@@ -297,10 +297,16 @@
exit 0
else
echo $openrtm_repo >> /etc/apt/sources.list
- # 公開鍵登録
- #apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
fi
fi
+
+ if test "x$FORCE_YES" = "xtrue" ; then
+ apt-get install --assume-yes --allow-unauthenticated dirmngr
+ else
+ apt-get install dirmngr
+ fi
+ # 公開鍵登録
+ apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
}
#----------------------------------------
Modified: branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_ubuntu.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_ubuntu.sh 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/pkg_install_ubuntu.sh 2017-12-10 06:37:02 UTC (rev 3109)
@@ -303,10 +303,10 @@
exit 0
else
echo $openrtm_repo >> /etc/apt/sources.list
- # 公開鍵登録
- apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
fi
fi
+ # 公開鍵登録
+ apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
}
#----------------------------------------
Modified: branches/RELENG_1_2/OpenRTM-aist/build/setuptest.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/setuptest.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/setuptest.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -247,7 +247,7 @@
text=t.generate(data)
f.write(text)
f.close()
- print "\"", fname, "\"" " was generated."
+ print("\"", fname, "\"" " was generated.")
return
def gen_all(self):
@@ -271,7 +271,7 @@
try:
os.mkdir(class_name, 0755)
except:
- print "Directory \"" + class_name + "\" already exists."
+ print("Directory \"" + class_name + "\" already exists.")
sys.exit(1)
data = test_dict(class_name)
Modified: branches/RELENG_1_2/OpenRTM-aist/build/slntool.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/slntool.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/slntool.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -78,7 +78,7 @@
def usage():
- print """
+ print("""
Usage:
slntool.py --dep dep_file [--outfile outfile] vcproj_files...
@@ -107,7 +107,7 @@
Lib2: Lib1
-------------
-"""
+""")
def get_projinfo(fname,vcversion="VC8"):
@@ -170,7 +170,7 @@
i += 1
if i < argc: vcversion = argv[i]
else: raise InvalidOption(opt + " needs value")
- if not vcversions.has_key(vcversion):
+ if not vcversion in vcversions:
allowedvers = vcversions.keys().__repr__()
raise InvalidOption("allowed vcversions are " + allowedvers)
else:
@@ -189,7 +189,7 @@
"""
for f in projfiles:
pj = get_projinfo(f, vcversion)
- if depdict.has_key(pj["Name"]):
+ if pj["Name"] in depdict:
pj["Depend"] = depdict[pj["Name"]]
projs.append(pj)
def depsort(d0, d1):
@@ -198,8 +198,8 @@
d0 == d1: return 0
d0 > d1: return 1
"""
- d0_depends = d0.has_key("Depend")
- d1_depends = d1.has_key("Depend")
+ d0_depends = "Depend" in d0
+ d1_depends = "Depend" in d1
if not d0_depends and not d1_depends:
# both d0, d1 has no dependency
return 0
@@ -213,8 +213,8 @@
return 1
# d0 and d1 has dependency
- d0_in_dep = depdict.has_key(d0["Name"])
- d1_in_dep = depdict.has_key(d1["Name"])
+ d0_in_dep = d0["Name"] in depdict
+ d1_in_dep = d1["Name"] in depdict
if not d0_in_dep and not d1_in_dep:
return 0
if not d0_in_dep and d1_in_dep:
@@ -249,7 +249,7 @@
GUID: &%s %s
Depend:
""" % (pj["Name"], pj["FileName"], pj["Name"], pj["GUID"])
- if pj.has_key("Depend"):
+ if "Depend" in pj:
for dep in pj["Depend"]:
dep = """ - *%s
""" % (dep)
@@ -285,7 +285,7 @@
try:
res = parse_args(argv)
except SlnToolException, e:
- print "\n" + e.msg + "\n"
+ print("\n" + e.msg + "\n")
usage()
sys.exit(-1)
@@ -308,13 +308,13 @@
#------------------------------------------------------------
def test_getprojinfo():
for f in sys.argv[1:]:
- print get_projinfo(f)
+ print(get_projinfo(f))
def test_getdep():
- print get_dependencies(sys.argv[1])
+ print(get_dependencies(sys.argv[1]))
def test_getslnyaml():
- print gen_solution(get_slnyaml("dep.yaml", sys.argv[1:]))
+ print(gen_solution(get_slnyaml("dep.yaml", sys.argv[1:])))
#------------------------------------------------------------
# entry point
Modified: branches/RELENG_1_2/OpenRTM-aist/build/uuid.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/uuid.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/uuid.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -1,103 +1,48 @@
#!/usr/bin/env python
+# -*- coding: euc-jp -*-
-r"""UUID objects (universally unique identifiers) according to RFC 4122.
+##
+# @file uuid.py
+# @brief
+# @date $Date: 2006/06/12 $
+# @author Ka-Ping Yee <ping at zesty.ca>
+#
+# Copyright (C) 2008
+# Task-intelligence Research Group,
+# Intelligent Systems Research Institute,
+# National Institute of
+# Advanced Industrial Science and Technology (AIST), Japan
+# All rights reserved.
-This module provides immutable UUID objects (class UUID) and the functions
-uuid1(), uuid3(), uuid4(), uuid5() for generating version 1, 3, 4, and 5
-UUIDs as specified in RFC 4122.
+import sys
-If all you want is a unique ID, you should probably call uuid1() or uuid4().
-Note that uuid1() may compromise privacy since it creates a UUID containing
-the computer's network address. uuid4() creates a random UUID.
-
-Typical usage:
-
- >>> import uuid
-
- # make a UUID based on the host ID and current time
- >>> uuid.uuid1()
- UUID('a8098c1a-f86e-11da-bd1a-00112444be1e')
-
- # make a UUID using an MD5 hash of a namespace UUID and a name
- >>> uuid.uuid3(uuid.NAMESPACE_DNS, 'python.org')
- UUID('6fa459ea-ee8a-3ca4-894e-db77e160355e')
-
- # make a random UUID
- >>> uuid.uuid4()
- UUID('16fd2706-8baf-433b-82eb-8c7fada847da')
-
- # make a UUID using a SHA-1 hash of a namespace UUID and a name
- >>> uuid.uuid5(uuid.NAMESPACE_DNS, 'python.org')
- UUID('886313e1-3b8a-5372-9b90-0c9aee199e5d')
-
- # make a UUID from a string of hex digits (braces and hyphens ignored)
- >>> x = uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}')
-
- # convert a UUID to a string of hex digits in standard form
- >>> str(x)
- '00010203-0405-0607-0809-0a0b0c0d0e0f'
-
- # get the raw 16 bytes of the UUID
- >>> x.bytes
- '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f'
-
- # make a UUID from a 16-byte string
- >>> uuid.UUID(bytes=x.bytes)
- UUID('00010203-0405-0607-0809-0a0b0c0d0e0f')
-
-This module works with Python 2.3 or higher."""
-
-__author__ = 'Ka-Ping Yee <ping at zesty.ca>'
-__date__ = '$Date: 2007-07-20 15:38:13 $'.split()[1].replace('/', '-')
-__version__ = '$Revision: 1.1.2.1 $'.split()[1]
-
RESERVED_NCS, RFC_4122, RESERVED_MICROSOFT, RESERVED_FUTURE = [
'reserved for NCS compatibility', 'specified in RFC 4122',
'reserved for Microsoft compatibility', 'reserved for future definition']
-class UUID(object):
- """Instances of the UUID class represent UUIDs as specified in RFC 4122.
- UUID objects are immutable, hashable, and usable as dictionary keys.
- Converting a UUID to a string with str() yields something in the form
- '12345678-1234-1234-1234-123456789abc'. The UUID constructor accepts
- four possible forms: a similar string of hexadecimal digits, or a
- string of 16 raw bytes as an argument named 'bytes', or a tuple of
- six integer fields (with 32-bit, 16-bit, 16-bit, 8-bit, 8-bit, and
- 48-bit values respectively) as an argument named 'fields', or a single
- 128-bit integer as an argument named 'int'.
-
- UUIDs have these read-only attributes:
- bytes the UUID as a 16-byte string
+if sys.version_info[0] == 3:
+ long = int
- fields a tuple of the six integer fields of the UUID,
- which are also available as six individual attributes
- and two derived attributes:
- time_low the first 32 bits of the UUID
- time_mid the next 16 bits of the UUID
- time_hi_version the next 16 bits of the UUID
- clock_seq_hi_variant the next 8 bits of the UUID
- clock_seq_low the next 8 bits of the UUID
- node the last 48 bits of the UUID
- time the 60-bit timestamp
- clock_seq the 14-bit sequence number
- hex the UUID as a 32-character hexadecimal string
- int the UUID as a 128-bit integer
+##
+# @if jp
+# @class UUID
+# @brief UUIDÊÝ»ý¥¯¥é¥¹
+#
+# À¸À®¤·¤¿ UUID ¤Î¾ðÊó¤òÊÝ»ý¤¹¤ë¤¿¤á¤Î¥¯¥é¥¹¡£
+#
+# @since 0.4.0
+#
+# @else
+#
+# @endif
+class UUID(object):
- urn the UUID as a URN as specified in RFC 4122
-
- variant the UUID variant (one of the constants RESERVED_NCS,
- RFC_4122, RESERVED_MICROSOFT, or RESERVED_FUTURE)
-
- version the UUID version number (1 through 5, meaningful only
- when the variant is RFC_4122)
- """
-
- def __init__(self, hex=None, bytes=None, fields=None, int=None,
+ def __init__(self, hex=None, bytes=None, fields=None, int_value=None,
version=None):
r"""Create a UUID from either a string of 32 hexadecimal digits,
a string of 16 bytes as the 'bytes' argument, a tuple of six
@@ -121,62 +66,68 @@
overriding bits in the given 'hex', 'bytes', 'fields', or 'int'.
"""
- if [hex, bytes, fields, int].count(None) != 3:
+
+ if [hex, bytes, fields, int_value].count(None) != 3:
raise TypeError('need just one of hex, bytes, fields, or int')
- if hex is not None:
+ if hex:
hex = hex.replace('urn:', '').replace('uuid:', '')
hex = hex.strip('{}').replace('-', '')
if len(hex) != 32:
raise ValueError('badly formed hexadecimal UUID string')
- int = long(hex, 16)
- if bytes is not None:
+ int_value = long(hex, 16)
+ if bytes:
if len(bytes) != 16:
raise ValueError('bytes is not a 16-char string')
- int = long(('%02x'*16) % tuple(map(ord, bytes)), 16)
- if fields is not None:
+ def ord_func(v):
+ if sys.version_info[0] == 3:
+ return ord(chr(v))
+ else:
+ return ord(v)
+ int_value = long(('%02x'*16) % tuple(map(ord_func, bytes)), 16)
+ if fields:
if len(fields) != 6:
raise ValueError('fields is not a 6-tuple')
(time_low, time_mid, time_hi_version,
clock_seq_hi_variant, clock_seq_low, node) = fields
- if not 0 <= time_low < 1<<32L:
+ if not 0 <= time_low < 1<<32:
raise ValueError('field 1 out of range (need a 32-bit value)')
- if not 0 <= time_mid < 1<<16L:
+ if not 0 <= time_mid < 1<<16:
raise ValueError('field 2 out of range (need a 16-bit value)')
- if not 0 <= time_hi_version < 1<<16L:
+ if not 0 <= time_hi_version < 1<<16:
raise ValueError('field 3 out of range (need a 16-bit value)')
- if not 0 <= clock_seq_hi_variant < 1<<8L:
+ if not 0 <= clock_seq_hi_variant < 1<<8:
raise ValueError('field 4 out of range (need an 8-bit value)')
- if not 0 <= clock_seq_low < 1<<8L:
+ if not 0 <= clock_seq_low < 1<<8:
raise ValueError('field 5 out of range (need an 8-bit value)')
- if not 0 <= node < 1<<48L:
+ if not 0 <= node < 1<<48:
raise ValueError('field 6 out of range (need a 48-bit value)')
- clock_seq = (clock_seq_hi_variant << 8L) | clock_seq_low
- int = ((time_low << 96L) | (time_mid << 80L) |
- (time_hi_version << 64L) | (clock_seq << 48L) | node)
- if int is not None:
- if not 0 <= int < 1<<128L:
+ clock_seq = (clock_seq_hi_variant << 8) | clock_seq_low
+ int_value = ((time_low << 96) | (time_mid << 80) |
+ (time_hi_version << 64) | (clock_seq << 48) | node)
+ if int_value:
+ if not 0 <= int_value < 1<<128:
raise ValueError('int is out of range (need a 128-bit value)')
- if version is not None:
+ if version:
if not 1 <= version <= 5:
raise ValueError('illegal version number')
# Set the variant to RFC 4122.
- int &= ~(0xc000 << 48L)
- int |= 0x8000 << 48L
+ int_value &= ~(0xc000 << 48)
+ int_value |= 0x8000 << 48
# Set the version number.
- int &= ~(0xf000 << 64L)
- int |= version << 76L
- self.__dict__['int'] = int
+ int_value &= ~(0xf000 << 64)
+ int_value |= version << 76
+ self.__dict__['int_value'] = int_value
def __cmp__(self, other):
if isinstance(other, UUID):
- return cmp(self.int, other.int)
+ return cmp(self.int_value, other.int_value)
return NotImplemented
def __hash__(self):
- return hash(self.int)
+ return hash(self.int_value)
def __int__(self):
- return self.int
+ return self.int_value
def __repr__(self):
return 'UUID(%r)' % str(self)
@@ -185,7 +136,7 @@
raise TypeError('UUID objects are immutable')
def __str__(self):
- hex = '%032x' % self.int
+ hex = '%032x' % self.int_value
return '%s-%s-%s-%s-%s' % (
hex[:8], hex[8:12], hex[12:16], hex[16:20], hex[20:])
@@ -192,7 +143,7 @@
def get_bytes(self):
bytes = ''
for shift in range(0, 128, 8):
- bytes = chr((self.int >> shift) & 0xff) + bytes
+ bytes = chr((self.int_value >> shift) & 0xff) + bytes
return bytes
bytes = property(get_bytes)
@@ -204,49 +155,49 @@
fields = property(get_fields)
def get_time_low(self):
- return self.int >> 96L
+ return self.int_value >> 96
time_low = property(get_time_low)
def get_time_mid(self):
- return (self.int >> 80L) & 0xffff
+ return (self.int_value >> 80) & 0xffff
time_mid = property(get_time_mid)
def get_time_hi_version(self):
- return (self.int >> 64L) & 0xffff
+ return (self.int_value >> 64) & 0xffff
time_hi_version = property(get_time_hi_version)
def get_clock_seq_hi_variant(self):
- return (self.int >> 56L) & 0xff
+ return (self.int_value >> 56) & 0xff
clock_seq_hi_variant = property(get_clock_seq_hi_variant)
def get_clock_seq_low(self):
- return (self.int >> 48L) & 0xff
+ return (self.int_value >> 48) & 0xff
clock_seq_low = property(get_clock_seq_low)
def get_time(self):
- return (((self.time_hi_version & 0x0fffL) << 48L) |
- (self.time_mid << 32L) | self.time_low)
+ return (((self.time_hi_version & 0x0fff) << 48) |
+ (self.time_mid << 32) | self.time_low)
time = property(get_time)
def get_clock_seq(self):
- return (((self.clock_seq_hi_variant & 0x3fL) << 8L) |
+ return (((self.clock_seq_hi_variant & 0x3f) << 8) |
self.clock_seq_low)
clock_seq = property(get_clock_seq)
def get_node(self):
- return self.int & 0xffffffffffff
+ return self.int_value & 0xffffffffffff
node = property(get_node)
def get_hex(self):
- return '%032x' % self.int
+ return '%032x' % self.int_value
hex = property(get_hex)
@@ -256,11 +207,11 @@
urn = property(get_urn)
def get_variant(self):
- if not self.int & (0x8000 << 48L):
+ if not self.int_value & (0x8000 << 48):
return RESERVED_NCS
- elif not self.int & (0x4000 << 48L):
+ elif not self.int_value & (0x4000 << 48):
return RFC_4122
- elif not self.int & (0x2000 << 48L):
+ elif not self.int_value & (0x2000 << 48):
return RESERVED_MICROSOFT
else:
return RESERVED_FUTURE
@@ -270,7 +221,7 @@
def get_version(self):
# The version bits are only meaningful for RFC 4122 UUIDs.
if self.variant == RFC_4122:
- return int((self.int >> 76L) & 0xf)
+ return int((self.int_value >> 76) & 0xf)
version = property(get_version)
@@ -277,17 +228,15 @@
def _ifconfig_getnode():
"""Get the hardware address on Unix by running ifconfig."""
import os
- for dir in ['', '/sbin/', '/usr/sbin']:
- try:
- pipe = os.popen(os.path.join(dir, 'ifconfig'))
- except IOError:
- continue
- for line in pipe:
- words = line.lower().split()
- for i in range(len(words)):
- if words[i] in ['hwaddr', 'ether']:
- return int(words[i + 1].replace(':', ''), 16)
+ dir = '/sbin/'
+ pipe = os.popen(os.path.join(dir, 'ifconfig'))
+ for line in pipe:
+ words = line.lower().split()
+ for i in range(len(words)):
+ if words[i] in ['hwaddr', 'ether']:
+ return int(words[i + 1].replace(':', ''), 16)
+
def _ipconfig_getnode():
"""Get the hardware address on Windows by running ipconfig.exe."""
import os, re
@@ -335,8 +284,8 @@
continue
status._unpack()
bytes = map(ord, status.adapter_address)
- return ((bytes[0]<<40L) + (bytes[1]<<32L) + (bytes[2]<<24L) +
- (bytes[3]<<16L) + (bytes[4]<<8L) + bytes[5])
+ return ((bytes[0]<<40) + (bytes[1]<<32) + (bytes[2]<<24) +
+ (bytes[3]<<16) + (bytes[4]<<8) + bytes[5])
# Thanks to Thomas Heller for ctypes and for his help with its use here.
@@ -384,7 +333,7 @@
def _random_getnode():
"""Get a random node ID, with eighth bit set as suggested by RFC 4122."""
import random
- return random.randrange(0, 1<<48L) | 0x010000000000L
+ return random.randrange(0, 1<<48) | 0x010000000000
_node = None
@@ -395,7 +344,7 @@
48-bit number with its eighth bit set to 1 as recommended in RFC 4122."""
global _node
- if _node is not None:
+ if _node:
return _node
import sys
@@ -409,7 +358,7 @@
_node = getter()
except:
continue
- if _node is not None:
+ if _node:
return _node
def uuid1(node=None, clock_seq=None):
@@ -428,15 +377,15 @@
nanoseconds = int(time.time() * 1e9)
# 0x01b21dd213814000 is the number of 100-ns intervals between the
# UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00.
- timestamp = int(nanoseconds/100) + 0x01b21dd213814000L
+ timestamp = int(nanoseconds/100) + 0x01b21dd213814000
if clock_seq is None:
import random
- clock_seq = random.randrange(1<<14L) # instead of stable storage
- time_low = timestamp & 0xffffffffL
- time_mid = (timestamp >> 32L) & 0xffffL
- time_hi_version = (timestamp >> 48L) & 0x0fffL
- clock_seq_low = clock_seq & 0xffL
- clock_seq_hi_variant = (clock_seq >> 8L) & 0x3fL
+ clock_seq = random.randrange(1<<14) # instead of stable storage
+ time_low = timestamp & 0xffffffff
+ time_mid = (timestamp >> 32) & 0xffff
+ time_hi_version = (timestamp >> 48) & 0x0fff
+ clock_seq_low = clock_seq & 0xff
+ clock_seq_hi_variant = (clock_seq >> 8) & 0x3f
if node is None:
node = getnode()
return UUID(fields=(time_low, time_mid, time_hi_version,
@@ -477,7 +426,3 @@
NAMESPACE_URL = UUID('6ba7b811-9dad-11d1-80b4-00c04fd430c8')
NAMESPACE_OID = UUID('6ba7b812-9dad-11d1-80b4-00c04fd430c8')
NAMESPACE_X500 = UUID('6ba7b814-9dad-11d1-80b4-00c04fd430c8')
-
-
-if __name__ == "__main__":
- print str(uuid1()).upper()
Modified: branches/RELENG_1_2/OpenRTM-aist/build/vcprojtool.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/vcprojtool.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/vcprojtool.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -804,7 +804,7 @@
def usage():
- print """Usage:
+ print("""Usage:
vcprojtool.py cmd options
commands:
vcproj: Generate vcproj
@@ -819,7 +819,7 @@
--resource *.txt
vcprojtool.py yaml --type [exe|dll|nmake|lib] --output
vcprojtool.py flist --out --source|--header|--resource *
-"""
+""")
import sys
@@ -865,7 +865,7 @@
return vcproj_template % (conf_type[type], self.tool_element(type))
def escape_cmdline(self, dict):
- if not dict.has_key("Configurations"): return
+ if not "Configurations" in dict: return
def escape_cmd(text):
text = text.replace("\"", """)
@@ -878,8 +878,8 @@
if isinstance(conf[tool], ListType):
for keyval in conf[tool]:
if isinstance(keyval, DictType) \
- and keyval.has_key("Key") \
- and keyval.has_key("Value") \
+ and "Key" in keyval \
+ and "Value" in keyval \
and keyval["Key"] == "CommandLine":
keyval["Value"] = escape_cmd(keyval["Value"])
@@ -923,15 +923,15 @@
def generate(self):
text = ""
loaded = ""
- if self.flist.has_key("yaml") and len(self.flist["yaml"]) > 0:
+ if "yaml" in self.flist and len(self.flist["yaml"]) > 0:
loaded = self.load_yamls(self.flist["yaml"])
if loaded.find("ProjectType:") < 0: # No toplevel config
- if self.yaml_template.has_key(self.type):
+ if self.type in self.yaml_template:
text = self.yaml_template[self.type]
text += loaded
else:
- print "type should be specified."
+ print("type should be specified.")
usage()
else:
text = loaded
@@ -1062,11 +1062,11 @@
if i < argc: type = argv[i]
else: raise InvalidOption(opt + " needs value")
type = type.upper()
- if not conf_type.has_key(type):
+ if not type in conf_type:
raise InvalidOption("unknown type: "
+ type + "\n" +
" --type should be [exe|dll|nmake|lib]")
- elif opt[:2] == "--" and flist.has_key(opt[2:]):
+ elif opt[:2] == "--" and opt[2:] in flist:
lname = opt[2:]
i += 1
if not i < argc: raise InvalidOption(opt + " need value")
@@ -1092,7 +1092,7 @@
try:
res = parse_args(argv)
except VCProjException, e:
- print "\n" + e.msg + "\n"
+ print("\n" + e.msg + "\n")
usage()
sys.exit(-1)
@@ -1125,12 +1125,12 @@
# tests
#------------------------------------------------------------
def test_filelist():
- print FileList({"source": ["hoge.cpp", "hage.cpp", "fuga.cpp"],
+ print(FileList({"source": ["hoge.cpp", "hage.cpp", "fuga.cpp"],
"header": ["hoge.h", "hage.h", "fuga.h"],
- "resource": []}).generate()
+ "resource": []}).generate())
def test_yamlconfig():
- print YamlConfig("EXE", "8.00", "Test", "0.9.1",
+ print(YamlConfig("EXE", "8.00", "Test", "0.9.1",
{"source":
["hoge.cpp",
"hage.cpp",
@@ -1138,10 +1138,10 @@
"header":
["hoge.h", "hage.h", "fuga.h"],
"resource":
- []}).generate()
+ []}).generate())
def test_vcproj():
- print VCProject("EXE", YamlConfig("EXE", "8.00", "Test", "1.0.0",
+ print(VCProject("EXE", YamlConfig("EXE", "8.00", "Test", "1.0.0",
{"source":
["hoge.cpp",
"hage.cpp",
@@ -1151,7 +1151,7 @@
"resource":
[],
"yaml":
- []}).generate()).generate()
+ []}).generate()).generate())
#------------------------------------------------------------
# entry point
Modified: branches/RELENG_1_2/OpenRTM-aist/build/vcxprojtool.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/vcxprojtool.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/vcxprojtool.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -927,7 +927,7 @@
def usage():
- print """Usage:
+ print("""Usage:
vcprojtool.py cmd options
commands:
vcproj: Generate vcproj
@@ -942,7 +942,7 @@
--resource *.txt
vcprojtool.py yaml --type [exe|dll|nmake|lib] --output
vcprojtool.py flist --out --source|--header|--resource *
-"""
+""")
rtcdll_yaml = rtcdll_yaml + get_after_config(rtcdll_yaml)
import sys
@@ -1026,7 +1026,7 @@
return vcxproj_template % (conf_type[type], self.PreBuildEventtool_element(type), self.CLtool_element(type), self.Libtool_element(type), self.PreLinkEventtool_element(type), self.Linktool_element(type), self.PostBuildEventtool_element(type))
def escape_cmdline(self, dict):
- if not dict.has_key("Configurations"): return
+ if not "Configurations" in dict: return
def escape_cmd(text):
text = text.replace("\"", """)
@@ -1039,8 +1039,8 @@
if isinstance(conf[tool], ListType):
for keyval in conf[tool]:
if isinstance(keyval, DictType) \
- and keyval.has_key("Key") \
- and keyval.has_key("Value") \
+ and "Key" in keyval \
+ and "Value" in keyval \
and keyval["Key"] == "Command":
keyval["Value"] = escape_cmd(keyval["Value"])
@@ -1084,20 +1084,20 @@
def generate(self):
text = ""
loaded = ""
- if self.flist.has_key("yaml") and len(self.flist["yaml"]) > 0:
+ if "yaml" in self.flist and len(self.flist["yaml"]) > 0:
loaded = self.load_yamls(self.flist["yaml"])
if loaded.find("ProjectType:") < 0: # No toplevel config
- if self.yaml_template.has_key(self.type):
+ if self.type in self.yaml_template:
text = self.yaml_template[self.type]
text += loaded
else:
- print "type should be specified."
+ print("type should be specified.")
usage()
else:
text = loaded
- print self.flist
+ print(self.flist)
text += FileList(self.flist).generate()
@@ -1227,11 +1227,11 @@
if i < argc: type = argv[i]
else: raise InvalidOption(opt + " needs value")
type = type.upper()
- if not conf_type.has_key(type):
+ if not type in conf_type:
raise InvalidOption("unknown type: "
+ type + "\n" +
" --type should be [exe|dll|nmake|lib]")
- elif opt[:2] == "--" and flist.has_key(opt[2:]):
+ elif opt[:2] == "--" and opt[2:] in flist:
lname = opt[2:]
i += 1
if not i < argc: raise InvalidOption(opt + " need value")
@@ -1257,7 +1257,7 @@
try:
res = parse_args(argv)
except VCProjException, e:
- print "\n" + e.msg + "\n"
+ print("\n" + e.msg + "\n")
usage()
sys.exit(-1)
@@ -1290,12 +1290,12 @@
# tests
#------------------------------------------------------------
def test_filelist():
- print FileList({"source": ["hoge.cpp", "hage.cpp", "fuga.cpp"],
+ print(FileList({"source": ["hoge.cpp", "hage.cpp", "fuga.cpp"],
"header": ["hoge.h", "hage.h", "fuga.h"],
- "resource": []}).generate()
+ "resource": []}).generate())
def test_yamlconfig():
- print YamlConfig("EXE", "10.00", "Test", "0.9.1",
+ print(YamlConfig("EXE", "10.00", "Test", "0.9.1",
{"source":
["hoge.cpp",
"hage.cpp",
@@ -1303,10 +1303,10 @@
"header":
["hoge.h", "hage.h", "fuga.h"],
"resource":
- []}).generate()
+ []}).generate())
def test_vcproj():
- print VCProject("EXE", YamlConfig("EXE", "10.00", "Test", "1.0.0",
+ print(VCProject("EXE", YamlConfig("EXE", "10.00", "Test", "1.0.0",
{"source":
["hoge.cpp",
"hage.cpp",
@@ -1316,7 +1316,7 @@
"resource":
[],
"yaml":
- []}).generate()).generate()
+ []}).generate()).generate())
#------------------------------------------------------------
# entry point
Modified: branches/RELENG_1_2/OpenRTM-aist/build/vsprops2cmake.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/vsprops2cmake.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/vsprops2cmake.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -7,12 +7,12 @@
if __name__ == '__main__':
if len(sys.argv) < 2:
- print "please specify vsprops file"
+ print("please specify vsprops file")
sys.exit(1)
fname = sys.argv[1]
if fname.split(".")[-1] != "vsprops":
- print "please specify vsprops file"
+ print("please specify vsprops file")
sys.exit(1)
f = file(sys.argv[1], "r")
Modified: branches/RELENG_1_2/OpenRTM-aist/build/yat.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/yat.py 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/build/yat.py 2017-12-10 06:37:02 UTC (rev 3109)
@@ -168,7 +168,13 @@
#
import string
import re
-from types import StringType, IntType, FloatType, DictType, ListType, ClassType
+#from types import StringType, IntType, FloatType, DictType, ListType, ClassType
+StringType = str
+IntType = int
+FloatType = float
+DictType = dict
+ListType = list
+#ClassType = class
import sys
class Template:
@@ -397,7 +403,7 @@
self.__write_cmd("self.pop_dict()")
self.__pop_level()
except:
- print args, self.lineno()
+ print(args, self.lineno())
raise UnmatchedBlock(self.lineno(), "endfor")
return
@@ -450,7 +456,7 @@
cmd = args[3]
if len(self.re_number.findall(cmd)) == 1:
cmd_text = "if %s_index == %s:" % (key, cmd)
- elif cmdlist.has_key(cmd):
+ elif cmd in cmdlist:
if cmd == "last":
cmd_text = cmdlist[cmd] % (key,key)
else:
@@ -474,7 +480,7 @@
cmd = args[3]
if len(self.re_number.findall(cmd)) == 1:
cmd_text = "elif %s_index == %s:" % (key, cmd)
- elif cmdlist.has_key(cmd):
+ elif cmd in cmdlist:
if cmd == "last":
cmd_text = cmdlist[cmd] % (key,key)
else:
@@ -525,19 +531,19 @@
#------------------------------------------------------------
def __print_error(self, e):
- print "Parse Error: line", e.lineno, "in input data"
- print " " + ''.join(nesteditem(e.value))
+ print("Parse Error: line", e.lineno, "in input data")
+ print(" " + ''.join(nesteditem(e.value)))
lines = self.template.split("\n")
length = len(lines)
- print "------------------------------------------------------------"
+ print("------------------------------------------------------------")
for i in range(1,10):
l = e.lineno - 6 + i
if l > 0 and l < length:
- print lines[l]
+ print(lines[l])
if i == 5:
uline = '~'*len(lines[l])
- print uline
- print "------------------------------------------------------------"
+ print(uline)
+ print("------------------------------------------------------------")
def del_nl_after_cmd(self):
# next text index after command
@@ -591,8 +597,8 @@
self.text = ""
def print_error(self, e):
- print "\nTemplate Generation Error: line", e.lineno, "in input data"
- print " " + ''.join(nesteditem(e.value))
+ print("\nTemplate Generation Error: line", e.lineno, "in input data")
+ print(" " + ''.join(nesteditem(e.value)))
temp = ""
for i, s in enumerate(self.token):
if s != None:
@@ -602,15 +608,15 @@
temp += s
lines = temp.split("\n")
length = len(lines)
- print "------------------------------------------------------------"
+ print("------------------------------------------------------------")
for i in range(1,10):
l = e.lineno - 6 + i
if l > 0 and l < length:
- print lines[l]
+ print(lines[l])
if i == 5:
uline = '~'*len(lines[l])
- print uline
- print "------------------------------------------------------------"
+ print(uline)
+ print("------------------------------------------------------------")
def set_index(self, index):
self.index = index
@@ -678,7 +684,7 @@
length = len(keys)
d = dict
for i in range(length):
- if isinstance(d, DictType) and d.has_key(keys[i]):
+ if isinstance(d, DictType) and keys[i] in d:
d = d[keys[i]]
else:
return None
@@ -818,18 +824,18 @@
if len(dict) == len(template):
for i in range(len(dict)-1,len(dict)):
t = Template(template[i])
- print "-" * 60
- print "Example:", i
- print "-" * 60
- print "Template:\n"
- print template[i]
- print "-" * 60
- print "Dictionary:\n"
- print yaml.dump(dict[i], default_flow_style=False)
- print "-" * 60
- print "Generated Script:\n"
- print t.get_script()
- print "-" * 60
- print "Generated Text:\n"
- print t.generate(dict[i])
- print ""
+ print("-" * 60)
+ print("Example:", i)
+ print("-" * 60)
+ print("Template:\n")
+ print(template[i])
+ print("-" * 60)
+ print("Dictionary:\n")
+ print(yaml.dump(dict[i], default_flow_style=False))
+ print("-" * 60)
+ print("Generated Script:\n")
+ print(t.get_script())
+ print("-" * 60)
+ print("Generated Text:\n")
+ print(t.generate(dict[i]))
+ print("")
Modified: branches/RELENG_1_2/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/configure.ac 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/configure.ac 2017-12-10 06:37:02 UTC (rev 3109)
@@ -156,7 +156,7 @@
[Linux*)]
AC_DEFINE([RTM_OS_LINUX], [TRUE], [OS is Linux])
AC_DEFINE([_REENTRANT], [TRUE], [Multi Thread Support])
- LDFLAGS="-luuid -ldl -export-dynamic $LDFLAGS"
+ LDFLAGS="-luuid -lrt -ldl -export-dynamic $LDFLAGS"
os="linux"
;;
[HP-UX*)]
@@ -190,7 +190,7 @@
os="cygwin"
CPPFLAGS="-DCygwin $CPPFLAGS"
CXXFLAGS="-DCygwin $CXXFLAGS"
- LDFLAGS="-no-undefined -luuid -ldl -export-dynamic $LDFLAGS"
+ LDFLAGS="-no-undefined -luuid -lrt -ldl -export-dynamic $LDFLAGS"
;;
*)
echo "Unkonown system"
@@ -1667,6 +1667,7 @@
src/ext/ec/logical_time/Makefile
src/ext/ec/logical_time/example/Makefile
src/ext/sdo/Makefile
+ src/ext/sdo/logger/Makefile
src/ext/sdo/observer/Makefile
src/ext/local_service/Makefile
src/ext/local_service/nameservice_file/Makefile
@@ -1712,11 +1713,16 @@
win32/OpenRTM-aist/examples/Throughput/Makefile
win32/OpenRTM-aist/examples/USBCamera/Makefile
win32/OpenRTM-aist/ext/Makefile
+ win32/OpenRTM-aist/ext/ec/artlinux/Makefile
win32/OpenRTM-aist/ext/ec/Makefile
win32/OpenRTM-aist/ext/ec/logical_time/Makefile
+ win32/OpenRTM-aist/ext/ec/rtpreempt/Makefile
win32/OpenRTM-aist/ext/local_service/Makefile
win32/OpenRTM-aist/ext/local_service/nameservice_file/Makefile
+ win32/OpenRTM-aist/ext/logger/Makefile
+ win32/OpenRTM-aist/ext/logger/fluentbit_stream/Makefile
win32/OpenRTM-aist/ext/sdo/Makefile
+ win32/OpenRTM-aist/ext/sdo/logger/Makefile
win32/OpenRTM-aist/ext/sdo/observer/Makefile
win32/OpenRTM-aist/utils/Makefile
win32/OpenRTM-aist/utils/rtc-template/Makefile
Copied: branches/RELENG_1_2/OpenRTM-aist/src/ext/CMakeLists.txt (from rev 3083, trunk/OpenRTM-aist/src/ext/CMakeLists.txt)
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/CMakeLists.txt (rev 0)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/CMakeLists.txt 2017-12-10 06:37:02 UTC (rev 3109)
@@ -0,0 +1,5 @@
+cmake_minimum_required (VERSION 2.6)
+
+add_subdirectory(sdo)
+
+
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -25,5 +25,7 @@
ArtExecutionContext_la_FLAGS = -L$(top_builddir)/src/lib/rtm/.lib
ArtExecutionContext_la_LIBADD = $(top_builddir)/src/lib/rtm/libRTC.la $(ARTLIB)
+EXTRA_DIST = rtc.conf.sample
+
clean-local:
rm -rf *~ *.o *.so
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.cpp 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.cpp 2017-12-10 06:37:02 UTC (rev 3109)
@@ -23,7 +23,7 @@
#include <rtm/ECFactory.h>
#include <rtm/RTObjectStateMachine.h>
-#include <LogicalTimeTriggeredEC.h>
+#include "LogicalTimeTriggeredEC.h"
namespace RTC
{
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h 2017-12-10 06:37:02 UTC (rev 3109)
@@ -26,7 +26,7 @@
#include <coil/ClockManager.h>
#include <rtm/ExecutionContextBase.h>
-#include <LogicalTimeTriggeredECSkel.h>
+#include "LogicalTimeTriggeredECSkel.h"
#ifdef WIN32
#pragma warning( disable : 4290 )
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -50,8 +50,8 @@
IDL_SOURCES = LogicalTimeTriggeredEC.idl
OBSERVER_DIST_SRC = LogicalTimeTriggeredEC.cpp
-OBSERVER_NODIST_SRC = $(IDL_SOURCES:.idl=Stub.cpp) $(IDL_SOURCES:.idl=Skel.cpp)
-OBSERVER_NDWIN_SRC = $(IDL_SOURCES:.idl=Stub.cpp) $(IDL_SOURCES:.idl=Skel.cpp)
+OBSERVER_NODIST_SRC = $(IDL_SOURCES:.idl=Skel.cpp)
+OBSERVER_NDWIN_SRC = $(IDL_SOURCES:.idl=Skel.cpp)
OBSERVER_SRC = $(OBSERVER_DIST_SRC) $(OBSERVER_NODIST_SRC)
OBSERVER_WIN_SRC = $(OBSERVER_DIST_SRC) $(OBSERVER_NDWIN_SRC)
@@ -73,9 +73,8 @@
socompdir = $(rtm_ecdir)
# Loadable Module
-noinst_LTLIBRARIES = libLogicalTimeTriggeredECSkel.la libLogicalTimeTriggeredECStub.la
+noinst_LTLIBRARIES = libLogicalTimeTriggeredECSkel.la
nodist_libLogicalTimeTriggeredECSkel_la_SOURCES = $(IDL_SOURCES:.idl=Skel.cpp)
-nodist_libLogicalTimeTriggeredECStub_la_SOURCES = $(IDL_SOURCES:.idl=Stub.cpp)
socomp_LTLIBRARIES = LogicalTimeTriggeredEC.la
@@ -84,7 +83,7 @@
LogicalTimeTriggeredEC_la_LDFLAGS = -module
LogicalTimeTriggeredEC_la_DEPENDENCIES = libLogicalTimeTriggeredECSkel.la
LogicalTimeTriggeredEC_la_LIBADD = \
- libLogicalTimeTriggeredECStub.la \
+ libLogicalTimeTriggeredECSkel.la \
$(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -24,5 +24,7 @@
$(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
+EXTRA_DIST = rtc.conf.sample
+
clean-local:
rm -rf *~ *.o *.so
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -10,9 +10,14 @@
AM_CPPFLAGS= \
-I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/include \
-I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/monkey/include \
- -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/mbedtls-2.4.2/include \
- -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/msgpack-c-0b7cabd/include \
+ -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/mbedtls-2.5.1/include \
+ -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/msgpack-2.1.3/include \
-I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/flb_libco \
+ -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/jemalloc/include \
+ -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/jsmn \
+ -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/onigmo \
+ -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/sha1 \
+ -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/sqlite-amalgamation-3200000 \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/coil/include \
-I$(top_srcdir)/src/lib/rtm/idl
@@ -61,6 +66,7 @@
$(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
+EXTRA_DIST = fluentbit.conf
clean-local:
rm -rf *~ *.o *.so
Copied: branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/CMakeLists.txt (from rev 3083, trunk/OpenRTM-aist/src/ext/sdo/CMakeLists.txt)
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/CMakeLists.txt (rev 0)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/CMakeLists.txt 2017-12-10 06:37:02 UTC (rev 3109)
@@ -0,0 +1,5 @@
+cmake_minimum_required (VERSION 2.6)
+
+add_subdirectory(logger)
+
+
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -7,6 +7,6 @@
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = observer
+SUBDIRS = logger observer
Copied: branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt (from rev 3083, trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt)
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt (rev 0)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt 2017-12-10 06:37:02 UTC (rev 3109)
@@ -0,0 +1,90 @@
+cmake_minimum_required (VERSION 2.6)
+
+project (LoggerConsumer)
+
+
+
+set(idl_name Logger)
+
+
+
+
+
+set(${idl_name}_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(${idl_name}_SKEL ${CMAKE_CURRENT_BINARY_DIR}/${idl_name}Skel.cpp ${CMAKE_CURRENT_BINARY_DIR}/${idl_name}Skel.h)
+set(${idl_name}_STUB ${CMAKE_CURRENT_BINARY_DIR}/${idl_name}Stub.cpp ${CMAKE_CURRENT_BINARY_DIR}/${idl_name}Stub.h)
+
+
+add_custom_command(
+ OUTPUT ${idl_name}Skel.cpp ${idl_name}Stub.cpp
+ COMMAND ${IDL_COMPILE_COMMAND} ${IDLCOMMAND_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/src/lib/rtm/idl ${CMAKE_CURRENT_SOURCE_DIR}/${idl_name}.idl
+ COMMAND python ${SKELWRAPPER_COMMAND} --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=${idl_name}.idl
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+add_custom_target(${idl_name}_TGT DEPENDS ${idl_name}Skel.cpp ${idl_name}Stub.cpp)
+
+
+
+message(STATUS ${ORB_LINK_DIR})
+link_directories(${ORB_LINK_DIR})
+include_directories(
+ ${RTM_INCLUDE_DIR}
+ ${ORB_INCLUDE_DIR}
+ ${${idl_name}_DIR}
+ )
+
+ADD_DEFINITIONS(${ORB_C_FLAGS_LIST})
+
+
+set(target LoggerConsumer)
+
+set(srcs LoggerConsumer.cpp LoggerConsumer.h ${${idl_name}_STUB})
+
+
+if(VXWORKS AND NOT RTP)
+ set(standalone_srcs ${standalone_srcs} ${CMAKE_SOURCE_DIR}/src/lib/rtm/DataFlowComponentBase.cpp)
+ set(libs ${RTCSKEL_PROJECT_NAME})
+
+ add_executable(${target})
+ target_link_libraries(${target} ${libs})
+ add_dependencies(${target} ${RTM_PROJECT_NAME})
+ add_dependencies(${target} ${idl_name}_TGT)
+
+ install(TARGETS ${target} RUNTIME DESTINATION examples)
+else()
+ if(VXWORKS)
+ set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
+ else(VXWORKS)
+ set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME})
+ endif(VXWORKS)
+
+
+ add_library(${target} SHARED ${srcs})
+ target_link_libraries(${target} ${libs} ${RTM_LINKER_OPTION})
+ add_dependencies(${target} ${RTM_PROJECT_NAME})
+ add_dependencies(${target} ${idl_name}_TGT)
+ set_target_properties(${target} PROPERTIES PREFIX "")
+
+
+ if(WIN32)
+ install(TARGETS ${target} RUNTIME DESTINATION examples)
+ else(WIN32)
+ install(TARGETS ${target} LIBRARY DESTINATION examples)
+ endif(WIN32)
+endif()
+
+
+set_source_files_properties(${${idl_name}_STUB} PROPERTIES GENERATED 1)
+
+
+
+
+if(VXWORKS)
+ if(RTP)
+ else(RTP)
+ set_target_properties(${target} PROPERTIES SUFFIX ".out")
+ endif(RTP)
+endif(VXWORKS)
+
+
+
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/Logger.idl
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/Logger.idl 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/Logger.idl 2017-12-10 06:37:02 UTC (rev 3109)
@@ -79,15 +79,15 @@
*/
enum LogLevel
{
- SILENT,
- ERROR,
- WARN,
- INFO,
- NORMAL,
- DEBUG,
- TRACE,
- VERBOSE,
- PARANOID
+ RTM_SILENT,
+ RTM_ERROR,
+ RTM_WARN,
+ RTM_INFO,
+ RTM_NORMAL,
+ RTM_DEBUG,
+ RTM_TRACE,
+ RTM_VERBOSE,
+ RTM_PARANOID
};
/*!
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/logger/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -42,11 +42,15 @@
LOGGER_DIST_SRC = LoggerConsumer.cpp
LOGGER_NODIST_SRC = $(IDL_SOURCES:.idl=Stub.cpp)
+LOGGER_NOWIN_SRC = $(IDL_SOURCES:.idl=Stub.cpp)
LOGGER_SRC = $(LOGGER_DIST_SRC) $(LOGGER_NODIST_SRC)
+LOGGER_WIN_SRC = $(LOGGER_DIST_SRC) $(LOGGER_NOWIN_SRC)
LOGGER_DIST_H = $(LOGGER_DIST_SRC:.cpp=.h)
LOGGER_NODIST_H = $(LOGGER_NODIST_SRC:.cpp=.h)
+LOGGER_NOWIN_H = $(LOGGER_NOWIN_SRC:.cpp=.h)
LOGGER_H = $(LOGGER_DIST_H) $(LOGGER_NODIST_H)
+LOGGER_WIN_H = $(LOGGER_DIST_H) $(LOGGER_NOWIN_H)
#------------------------------------------------------------
# Object list
@@ -89,9 +93,43 @@
echo $(ALL_SRC) > src.lst
echo $(EXTRA_DIST) > other.lst
-dist-hook: lst
+#------------------------------------------------------------
+# Visual Studio Project
+#------------------------------------------------------------
+win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/sdo/logger
+PROJNAME=LoggerConsumer
+vcproj: vc9proj vcxproj
+vc9proj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type DLL \
+ --vcversion "9.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(LOGGER_WIN_SRC) \
+ --header $(LOGGER_WIN_H)
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
+
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(LOGGER_WIN_SRC) \
+ --header $(LOGGER_WIN_H) ; \
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj ; \
+ done
+
+dist-hook: lst vcproj
+
+
clean_objs:
rm -f $(OBJS)
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/configure.ac
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/configure.ac 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/configure.ac 2017-12-10 06:37:02 UTC (rev 3109)
@@ -126,7 +126,7 @@
AC_DEFINE([COIL_OS_LINUX], [TRUE], [OS is Linux])
AC_DEFINE([_REENTRANT], [TRUE], [Multi Thread Support])
AC_DEFINE([COIL_PLATFORM], [POSIX], [Platform is POSIX])
- LDFLAGS="$LDFLAGS -luuid -ldl"
+ LDFLAGS="$LDFLAGS -luuid -lrt -ldl"
COIL_PLATFORM=posix
;;
[HP-UX*)]
@@ -165,7 +165,7 @@
COIL_PLATFORM=posix
CPPFLAGS="-DCygwin $CPPFLAGS"
CXXFLAGS="-DCygwin $CXXFLAGS"
- LDFLAGS="-no-undefined $LDFLAGS -luuid -ldl"
+ LDFLAGS="-no-undefined $LDFLAGS -luuid -lrt -ldl"
;;
*)
echo "Unkonown system"
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/posix/coil/SharedMemory.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/posix/coil/SharedMemory.cpp 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/posix/coil/SharedMemory.cpp 2017-12-10 06:37:02 UTC (rev 3109)
@@ -83,6 +83,7 @@
std::swap(this->m_shm_address, tmp.m_shm_address);
std::swap(this->m_shm, tmp.m_shm);
std::swap(this->m_fd, tmp.m_fd);
+ std::swap(this->m_file_create, tmp.m_file_create);
return *this;
}
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -32,7 +32,7 @@
UUIDTests_SOURCES = $(UUIDTests_COMMON_SOURCES) \
$(top_srcdir)/posix/coil/UUID.cpp
UUIDTests_LDFLAGS = -L$(libdir)
-UUIDTests_LDADD = -lcppunit -luuid
+UUIDTests_LDADD = -lcppunit -luuid -lrt
TEST_SRC = $(UUIDTests_COMMON_SOURCES) \
$(top_srcdir)/win32/coil/UUID.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/coil/SharedMemory.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/coil/SharedMemory.cpp 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/coil/SharedMemory.cpp 2017-12-10 06:37:02 UTC (rev 3109)
@@ -35,7 +35,7 @@
: m_memory_size(0),
m_shm(NULL),
m_file_create(false),
- m_handle(NULL)
+ m_handle(NULL)
{
}
@@ -65,6 +65,7 @@
m_shm_address = rhs.m_shm_address;
m_shm = rhs.m_shm;
m_handle = rhs.m_handle;
+ m_file_create = rhs.m_file_create;
}
/*!
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-12-10 06:37:02 UTC (rev 3109)
@@ -31,7 +31,7 @@
typedef _CORBA_Unbounded_Sequence_String StringUSequence;
#endif
-#ifndef ORB_IS_RTORB
+#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
// prototype of static functions
static void print_key(std::stringstream& s, OctetUSequence& key);
@@ -52,6 +52,7 @@
* @brief Convert from IOR string to IOR structure
* @endif
*/
+#if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
bool toIOR(const char* iorstr, IOP::IOR& ior)
{
#ifndef ORB_IS_RTORB
@@ -118,6 +119,7 @@
* @brief Convert from IOR structure to IOR string
* @endif
*/
+#if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
bool toString(IOP::IOR& ior, std::string& iorstr)
{
#ifndef ORB_IS_RTORB
@@ -180,7 +182,7 @@
*/
bool replaceEndpoint(std::string& iorstr, const std::string& endpoint)
{
-#ifndef ORB_IS_RTORB
+#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
try
{
IOP::IOR ior;
@@ -226,7 +228,7 @@
std::string formatIORinfo(const char* iorstr)
{
std::stringstream retstr;
-#ifndef ORB_IS_RTORB
+#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
IOP::IOR ior;
toIOR(iorstr, ior);
@@ -288,7 +290,7 @@
}
-#ifndef ORB_IS_RTORB
+#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
//------------------------------------------------------------
// static functions
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h 2017-12-10 06:37:02 UTC (rev 3109)
@@ -46,6 +46,7 @@
*
* @endif
*/
+#if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
bool toIOR(const char* iorstr, IOP::IOR& ior);
/*!
@@ -57,6 +58,7 @@
*
* @endif
*/
+#if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
bool toString(IOP::IOR& ior, std::string& iorstr);
/*!
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-12-10 06:37:02 UTC (rev 3109)
@@ -707,8 +707,11 @@
{
RTC_DEBUG(("dataflow_type push is supported"));
appendProperty("dataport.dataflow_type", "push");
- appendProperty("dataport.interface_type",
- coil::flatten(provider_types).c_str());
+ for (coil::vstring::iterator itr = provider_types.begin(); itr != provider_types.end(); ++itr)
+ {
+ appendProperty("dataport.interface_type",
+ (*itr).c_str());
+ }
}
m_providerTypes = provider_types;
@@ -756,8 +759,11 @@
{
RTC_PARANOID(("dataflow_type pull is supported"));
appendProperty("dataport.dataflow_type", "pull");
- appendProperty("dataport.interface_type",
- coil::flatten(consumer_types).c_str());
+ for (coil::vstring::iterator itr = consumer_types.begin(); itr != consumer_types.end(); ++itr)
+ {
+ appendProperty("dataport.interface_type",
+ (*itr).c_str());
+ }
}
m_consumerTypes = consumer_types;
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortConsumer.h 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortConsumer.h 2017-12-10 06:37:02 UTC (rev 3109)
@@ -29,7 +29,7 @@
};
// Why RtORB does not allow forward declaration?
-#ifndef ORB_IS_RTORB
+#if !defined ORB_IS_RTORB && !defined ORB_IS_ORBEXPRESS
namespace SDOPackage
{
class NVList;
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortSHMProvider.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortSHMProvider.cpp 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPortSHMProvider.cpp 2017-12-10 06:37:02 UTC (rev 3109)
@@ -33,7 +33,8 @@
* @endif
*/
InPortSHMProvider::InPortSHMProvider(void)
- : m_buffer(0)
+ : m_buffer(0),
+ m_connector(NULL)
{
// PortProfile setting
setInterfaceType("shared_memory");
@@ -122,7 +123,7 @@
throw (CORBA::SystemException)
{
RTC_PARANOID(("InPortSHMProvider::put()"));
- if (m_buffer == 0)
+ if (m_buffer == 0)
{
return ::OpenRTM::PORT_ERROR;
}
@@ -205,8 +206,7 @@
return ::OpenRTM::UNKNOWN_ERROR;
}
- onReceiverError(data);
- return ::OpenRTM::UNKNOWN_ERROR;
+
}
}; // namespace RTC
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2017-12-10 06:37:02 UTC (rev 3109)
@@ -535,6 +535,7 @@
const coil::vstring& modules,
vProperties& modprops)
{
+#if !defined(VXWORKS_69) && !defined(VXWORKS_66)
std::string l = "manager.modules." + lang;
coil::Properties& lprop(Manager::instance().getConfig().getNode(l));
std::vector<coil::Properties> prop;
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp 2017-12-10 06:37:02 UTC (rev 3109)
@@ -743,8 +743,11 @@
{
RTC_DEBUG(("dataflow_type pull is supported"));
appendProperty("dataport.dataflow_type", "pull");
- appendProperty("dataport.interface_type",
- coil::flatten(provider_types).c_str());
+ for (coil::vstring::iterator itr = provider_types.begin(); itr != provider_types.end(); ++itr)
+ {
+ appendProperty("dataport.interface_type",
+ (*itr).c_str());
+ }
}
m_providerTypes = provider_types;
@@ -792,8 +795,11 @@
{
RTC_PARANOID(("dataflow_type push is supported"));
appendProperty("dataport.dataflow_type", "push");
- appendProperty("dataport.interface_type",
- coil::flatten(consumer_types).c_str());
+ for (coil::vstring::iterator itr = consumer_types.begin(); itr != consumer_types.end(); ++itr)
+ {
+ appendProperty("dataport.interface_type",
+ (*itr).c_str());
+ }
}
m_consumerTypes = consumer_types;
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h 2017-12-10 06:37:02 UTC (rev 3109)
@@ -25,7 +25,7 @@
#include <rtm/CdrBufferBase.h>
// Why RtORB does not allow the following foward declaration?
-#ifndef ORB_IS_RTORB
+#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS)
namespace SDOPackage
{
class NVList;
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.cpp 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMConsumer.cpp 2017-12-10 06:37:02 UTC (rev 3109)
@@ -30,6 +30,7 @@
* @endif
*/
OutPortSHMConsumer::OutPortSHMConsumer()
+ : m_listeners(NULL)
{
rtclog.setName("OutPortSHMConsumer");
@@ -290,8 +291,6 @@
return UNKNOWN_ERROR;
}
- onSenderError();
- return UNKNOWN_ERROR;
}
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMProvider.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMProvider.cpp 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPortSHMProvider.cpp 2017-12-10 06:37:02 UTC (rev 3109)
@@ -32,7 +32,8 @@
* @endif
*/
OutPortSHMProvider::OutPortSHMProvider(void)
- : m_buffer(0)
+ : m_buffer(0),
+ m_memory_size(0)
{
// PortProfile setting
setInterfaceType("shared_memory");
@@ -245,8 +246,6 @@
return ::OpenRTM::UNKNOWN_ERROR;
}
- onSenderError();
- return ::OpenRTM::UNKNOWN_ERROR;
}
}; // namespace RTC
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.cpp 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.cpp 2017-12-10 06:37:02 UTC (rev 3109)
@@ -105,7 +105,7 @@
*
* @endif
*/
- int SharedMemoryPort::string_to_MemorySize(std::string size_str)
+ int SharedMemoryPort::string_to_MemorySize(std::string size_str)
{
int memory_size = DEFAULT_MEMORY_SIZE;
std::string size_str_n = coil::normalize(size_str);
@@ -118,22 +118,22 @@
std::string value_str = size_str_n.substr(0, size_str_n.size() - 1);
int value = 0;
- coil::stringTo(value, value_str.c_str());
-
- if (size_str_n.substr(size_str_n.size() - 1, 1) == unit_str_M)
+ if(coil::stringTo(value, value_str.c_str()))
{
- memory_size = 1048576 * value;
+ if (size_str_n.substr(size_str_n.size() - 1, 1) == unit_str_M)
+ {
+ memory_size = 1048576 * value;
+ }
+ else if (size_str_n.substr(size_str_n.size() - 1, 1) == unit_str_k)
+ {
+
+ memory_size = 1024 * value;
+ }
+ else
+ {
+ memory_size = value;
+ }
}
- else if (size_str_n.substr(size_str_n.size() - 1, 1) == unit_str_k)
- {
-
- memory_size = 1024 * value;
- }
- else
- {
- memory_size = value;
- }
-
}
return memory_size;
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.h 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SharedMemoryPort.h 2017-12-10 06:37:02 UTC (rev 3109)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file SharedMemoryPort.h
* @brief Shared Memory Port class
@@ -30,12 +30,12 @@
/*!
* @if jp
* @class SharedMemoryPort
- * @brief SharedMemory ƒNƒ‰ƒX
+ * @brief SharedMemory クラス
*
* SharedMemoryPort
*
- * ‹¤—Lƒƒ‚ƒŠ‘€ìƒNƒ‰ƒX
- * CORBA‚É‚æ‚é’ÊM‚É‚æ‚èAmmap‚̉Šú‰»AI—¹‚È‚Ç‚ªƒŠƒ‚[ƒg‚É‘€ì‚Å‚«‚é
+ * 共有メモリ操作クラス
+ * CORBAによる通信により、mmapの初期化、終了などがリモートに操作できる
*
* @since 1.2.0
*
@@ -56,9 +56,9 @@
public:
/*!
* @if jp
- * @brief ƒRƒ“ƒXƒgƒ‰ƒNƒ^
+ * @brief コンストラクタ
*
- * ƒRƒ“ƒXƒgƒ‰ƒNƒ^
+ * コンストラクタ
*
*
* @else
@@ -74,9 +74,9 @@
SharedMemoryPort();
/*!
* @if jp
- * @brief ƒfƒXƒgƒ‰ƒNƒ^
+ * @brief デストラクタ
*
- * ƒfƒXƒgƒ‰ƒNƒ^
+ * デストラクタ
*
* @else
* @brief Destructor
@@ -88,13 +88,13 @@
virtual ~SharedMemoryPort();
/*!
* @if jp
- * @brief •¶Žš—ñ‚ÅŽw’肵‚½ƒf[ƒ^ƒTƒCƒY‚ð”’l‚É•ÏŠ·‚·‚é
- * 1M ¨ 1048576
- * 1k ¨ 1024
- * 100 ¨ 100
+ * @brief 文字列で指定したデータサイズを数値に変換する
+ * 1M → 1048576
+ * 1k → 1024
+ * 100 → 100
*
- * @param size_str ƒf[ƒ^ƒTƒCƒY(•¶Žš—ñ)
- * @return ƒf[ƒ^ƒTƒCƒY(”’l)
+ * @param size_str データサイズ(文字列)
+ * @return データサイズ(数値)
*
*
*
@@ -109,10 +109,10 @@
virtual int string_to_MemorySize(std::string size_str);
/*!
* @if jp
- * @brief ‹¤—Lƒƒ‚ƒŠ‚̉Šú‰»
- * windows‚ł̓y[ƒWƒ“ƒOƒtƒ@ƒCƒ‹ã‚ɗ̈æ‚ðŠm•Û‚·‚é
- * Linux‚Å‚Í/dev/shmˆÈ‰º‚Ƀtƒ@ƒCƒ‹‚ð쬂·‚é
- * 쬂µ‚½ƒtƒ@ƒCƒ‹‚Ì“à—e‚ð‰¼‘zƒAƒhƒŒƒX‚Ƀ}ƒbƒsƒ“ƒO‚·‚é
+ * @brief 共有メモリの初期化
+ * windowsではページングファイル上に領域を確保する
+ * Linuxでは/dev/shm以下にファイルを作成する
+ * 作成したファイルの内容を仮想アドレスにマッピングする
*
*
*
@@ -128,10 +128,10 @@
throw (CORBA::SystemException);
/*!
* @if jp
- * @brief ‹¤—Lƒƒ‚ƒŠ‚̃}ƒbƒsƒ“ƒO‚ðs‚¤
+ * @brief 共有メモリのマッピングを行う
*
- * @param memory_size ‹¤—Lƒƒ‚ƒŠ‚̃TƒCƒY
- * @param shm_address ‹óŠÔ–¼
+ * @param memory_size 共有メモリのサイズ
+ * @param shm_address 空間名
*
*
*
@@ -147,8 +147,8 @@
throw (CORBA::SystemException);
/*!
* @if jp
- * @brief ƒ}ƒbƒsƒ“ƒO‚µ‚½‹¤—Lƒƒ‚ƒŠ‚ðƒAƒ“ƒ}ƒbƒv‚·‚é
- * @param unlink Linux‚Å/dev/shmˆÈ‰º‚É쬂µ‚½ƒtƒ@ƒCƒ‹‚ð휂·‚éꇂÉTrue‚É‚·‚é
+ * @brief マッピングした共有メモリをアンマップする
+ * @param unlink Linuxで/dev/shm以下に作成したファイルを削除する場合にTrueにする
*
*
* @else
@@ -162,11 +162,11 @@
throw (CORBA::SystemException);
/*!
* @if jp
- * @brief ƒf[ƒ^‚ð‘‚«ž‚Þ
- * 擪8byte‚Ƀf[ƒ^ƒTƒCƒY‚ð‘‚«ž‚ÝA‚»‚ÌŒã‚ë‚Ƀf[ƒ^‚ð‘‚«ž‚Þ
- * ݒ肵‚½ƒf[ƒ^ƒTƒCƒY‚ª‹¤—Lƒƒ‚ƒŠ‚̃TƒCƒY‚ðã‰ñ‚Á‚½ê‡A‹¤—Lƒƒ‚ƒŠ‚̉Šú‰»‚ðs‚¤
+ * @brief データを書き込む
+ * 先頭8byteにデータサイズを書き込み、その後ろにデータを書き込む
+ * 設定したデータサイズが共有メモリのサイズを上回った場合、共有メモリの初期化を行う
*
- * @param data ‘‚«ž‚Þƒf[ƒ^
+ * @param data 書き込むデータ
*
*
*
@@ -180,8 +180,8 @@
virtual void write(const cdrMemoryStream& data);
/*!
* @if jp
- * @brief ƒf[ƒ^‚ð“Ç‚Ýž‚Þ
- * @return ƒf[ƒ^
+ * @brief データを読み込む
+ * @return データ
*
*
*
@@ -195,10 +195,10 @@
virtual void read(cdrMemoryStream& data);
/*!
* @if jp
- * @brief ’ÊMæ‚ÌCORBAƒCƒ“ƒ^[ƒtƒF[ƒX‚ð“o˜^‚·‚é
- * “o˜^‚·‚鎖‚É‚æ‚苤—Lƒƒ‚ƒŠ‚̉Šú‰»‚µ‚½‚Æ‚«‚ÉA’ÊMæ‚Å‚àƒ}ƒbƒsƒ“ƒO‚ð‚â‚è’¼‚·‚±‚Æ‚ª‚Å‚«‚é
+ * @brief 通信先のCORBAインターフェースを登録する
+ * 登録する事により共有メモリの初期化したときに、通信先でもマッピングをやり直すことができる
*
- * @param sm SharedMemory‚̃IƒuƒWƒFƒNƒgƒŠƒtƒ@ƒŒƒ“ƒX
+ * @param sm SharedMemoryのオブジェクトリファレンス
*
*
*
@@ -213,9 +213,9 @@
throw (CORBA::SystemException);
/*!
* @if jp
- * @brief ƒGƒ“ƒfƒBƒAƒ“‚ðÝ’è‚·‚é
+ * @brief エンディアンを設定する
*
- * @param endian ƒGƒ“ƒfƒBƒAƒ“
+ * @param endian エンディアン
*
*
*
@@ -230,7 +230,7 @@
throw (CORBA::SystemException);
/*!
* @if jp
- * @brief ƒf[ƒ^‚Ì‘—M‚ð’m‚点‚é
+ * @brief データの送信を知らせる
*
* @return
*
@@ -247,7 +247,7 @@
throw (CORBA::SystemException);
/*!
* @if jp
- * @brief ƒf[ƒ^‚Ì‘—M‚ð—v‹‚·‚é
+ * @brief データの送信を要求する
*
* @return
*
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -27,7 +27,8 @@
BasicDataType.idl \
DataPort.idl \
ExtendedDataTypes.idl \
- InterfaceDataTypes.idl
+ InterfaceDataTypes.idl\
+ SharedMemory.idl
endif
SKEL_H = $(IDL_SOURCES:.idl=Skel.h)
@@ -80,7 +81,8 @@
BasicDataTypeSkel.h \
DataPortSkel.h \
ExtendedDataTypesSkel.h \
- InterfaceDataTypesSkel.h
+ InterfaceDataTypesSkel.h\
+ SharedMemorySkel.h
ORB_SRC = $(RTORB_SRC)
endif
@@ -146,6 +148,7 @@
echo '#include "Manager.idl"' >> OpenRTM-aist.idl
echo '#include "DataPort.idl"' >> OpenRTM-aist.idl
echo '#include "InterfaceDataTypes.idl"' >> OpenRTM-aist.idl
+ echo '#include "SharedMemory.idl"' >> OpenRTM-aist.idl
idl-stamp: $(IDL_SOURCES)
@touch idl-stamp
Copied: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/SharedMemory.idl (from rev 3062, trunk/OpenRTM-aist/src/lib/rtm/idl/SharedMemory.idl)
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/SharedMemory.idl (rev 0)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/SharedMemory.idl 2017-12-10 06:37:02 UTC (rev 3109)
@@ -0,0 +1,32 @@
+// -*- IDL -*-
+/*!
+ * @file SharedMemory.idl
+ * @brief Shared Memory TransPort interface definition
+ * @date $Date: 2016-02-25 $
+ * @author Nobuhiko Miyamoto
+ *
+ *
+ */
+
+#ifndef SharedMemory_idl
+#define SharedMemory_idl
+
+
+#include "DataPort.idl"
+
+module OpenRTM
+{
+
+
+ interface PortSharedMemory
+ {
+ void open_memory(in unsigned long long memory_size, in string shm_address);
+ void create_memory(in unsigned long long memory_size, in string shm_address);
+ void close_memory(in boolean unlink);
+ void setInterface(in PortSharedMemory sm);
+ void setEndian(in boolean endian);
+ PortStatus put();
+ PortStatus get();
+ };
+};
+#endif
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml 2017-12-10 06:37:02 UTC (rev 3109)
@@ -23,6 +23,7 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
+ makewrapper.py SharedMemory.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -31,6 +32,7 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf SharedMemory.idl
VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -76,6 +78,7 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
+ makewrapper.py SharedMemory.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -84,6 +87,7 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf SharedMemory.idl
VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -127,6 +131,7 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
+ makewrapper.py SharedMemory.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -135,6 +140,7 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf SharedMemory.idl
VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -180,6 +186,7 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
+ makewrapper.py SharedMemory.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -188,6 +195,7 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf SharedMemory.idl
VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -232,6 +240,7 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
+ makewrapper.py SharedMemory.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -240,6 +249,7 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf SharedMemory.idl
VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -279,6 +289,7 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
+ makewrapper.py SharedMemory.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -287,6 +298,7 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf SharedMemory.idl
VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
@@ -325,6 +337,7 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
+ makewrapper.py SharedMemory.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -333,6 +346,7 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf SharedMemory.idl
VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -372,6 +386,7 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
+ makewrapper.py SharedMemory.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -380,6 +395,7 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf SharedMemory.idl
VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CORBA_IORUtil/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CORBA_IORUtil/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CORBA_IORUtil/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -62,7 +62,7 @@
CORBA_IORUtilTests.cpp
CORBA_IORUtilTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-CORBA_IORUtilTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+CORBA_IORUtilTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
# Extra sources included distribution
EXTRA_DIST = \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ConnectorListener/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ConnectorListener/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ConnectorListener/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -63,7 +63,7 @@
ConnectorListenerTests.cpp
ConnectorListenerTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-ConnectorListenerTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+ConnectorListenerTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
# Extra sources included distribution
EXTRA_DIST = \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CorbaNaming/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CorbaNaming/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CorbaNaming/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -113,7 +113,7 @@
CorbaNamingTests.cpp
CorbaNamingTests_LDFLAGS = -L$(libdir) -L$(top_builddir)/src/lib/coil/lib
-CorbaNamingTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+CorbaNamingTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
CorbaNamingTests.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CorbaPort/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CorbaPort/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/CorbaPort/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -123,7 +123,7 @@
CorbaPortTests.cpp
CorbaPortTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-CorbaPortTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+CorbaPortTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
$(IDL_SOURCES) \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/DataInOutPort/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/DataInOutPort/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/DataInOutPort/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -119,7 +119,7 @@
DataInOutPortTests.cpp
DataInOutPortTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-DataInOutPortTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+DataInOutPortTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
# Extra sources included distribution
EXTRA_DIST = \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ECFactory/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ECFactory/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ECFactory/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -92,7 +92,7 @@
#ECFactoryTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
ECFactoryTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-ECFactoryTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+ECFactoryTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
ECFactoryTests.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -112,7 +112,7 @@
ExtTrigExecutionContextTests.cpp
ExtTrigExecutionContextTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-ExtTrigExecutionContextTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+ExtTrigExecutionContextTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
ExtTrigExecutionContextTests.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/Factory/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/Factory/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/Factory/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -106,7 +106,7 @@
FactoryTests.cpp
FactoryTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-FactoryTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+FactoryTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
FactoryTests.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -104,7 +104,8 @@
-lomnithread \
-lomniDynamic4 \
-lcoil \
- -luuid
+ -luuid \
+ -lrt
#
#
@@ -122,8 +123,9 @@
-lomniORB4 \
-lomnithread \
-lomniDynamic4 \
- -lcoil \
+ -lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/Manager/DummyLib.la
@@ -148,6 +150,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/Manager/DummyLib.la
nodist_DummyModule2_la_SOURCES = DummyModule2.h \
@@ -161,6 +164,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/Manager/DummyLib.la
bin_PROGRAMS = rtcprof
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -115,7 +115,8 @@
-lomnithread \
-lomniDynamic4 \
-lcoil \
- -luuid
+ -luuid \
+ -lrt
noinst_PROGRAMS = ManagerServantTests
@@ -133,6 +134,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/ManagerServant/DummyLib.la
TEST_SRC = $(ManagerServantTests_SOURCES)
@@ -156,6 +158,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/ManagerServant/DummyLib.la
nodist_DummyModule2_la_SOURCES = DummyModule2.h \
@@ -169,6 +172,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/ManagerServant/DummyLib.la
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -108,7 +108,8 @@
-lomnithread \
-lomniDynamic4 \
-lcoil \
- -luuid
+ -luuid \
+ -lrt
noinst_PROGRAMS = ModuleManagerTests
@@ -127,6 +128,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/ModuleManager/DummyLib.la
TEST_SRC = $(ModuleManagerTests_SOURCES)
@@ -148,6 +150,7 @@
-lomniDynamic4 \
-lcoil \
-luuid \
+ -lrt \
$(top_builddir)/src/lib/rtm/tests/ModuleManager/DummyLib.la
bin_PROGRAMS = rtcprof
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/NamingManager/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/NamingManager/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/NamingManager/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -105,7 +105,7 @@
NamingManagerTests.cpp
NamingManagerTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-NamingManagerTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+NamingManagerTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
NamingManagerTests.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PeriodicECSharedComposite/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PeriodicECSharedComposite/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PeriodicECSharedComposite/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -39,7 +39,7 @@
PeriodicECSharedCompositeTests.cpp
PeriodicECSharedCompositeTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-PeriodicECSharedCompositeTests_LDADD = -lcppunit -lRTC -lcoil -luuid -lgcov
+PeriodicECSharedCompositeTests_LDADD = -lcppunit -lRTC -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
PeriodicECSharedCompositeTests.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PeriodicExecutionContext/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PeriodicExecutionContext/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PeriodicExecutionContext/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -95,7 +95,7 @@
PeriodicExecutionContextTests.cpp
PeriodicExecutionContextTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-PeriodicExecutionContextTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+PeriodicExecutionContextTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
PeriodicExecutionContextTests.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PortAdmin/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PortAdmin/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PortAdmin/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -104,7 +104,7 @@
PortAdminTests.cpp
PortAdminTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-PortAdminTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+PortAdminTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
PortAdminTests.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PortBase/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PortBase/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/PortBase/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -123,7 +123,7 @@
PortBaseTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-PortBaseTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+PortBaseTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
PortBaseTests.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -119,7 +119,7 @@
RTObjectTests.cpp
RTObjectTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-RTObjectTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+RTObjectTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
RTObjectTests.cpp \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SdoConfiguration/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SdoConfiguration/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SdoConfiguration/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -94,7 +94,7 @@
SdoConfigurationTests.cpp
SdoConfigurationTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-SdoConfigurationTests_LDADD = -lcppunit -lcoil -luuid -lgcov
+SdoConfigurationTests_LDADD = -lcppunit -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
SdoConfigurationTests.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SdoOrganization/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SdoOrganization/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SdoOrganization/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -43,7 +43,7 @@
# (top_builddir)/src/lib/rtm/SdoOrganization.cpp
SdoOrganizationTests_LDFLAGS = -L$(libdir) $(AM_LDFLAGS)
-SdoOrganizationTests_LDADD = -lcppunit -lRTC -lcoil -luuid -lgcov
+SdoOrganizationTests_LDADD = -lcppunit -lRTC -lcoil -luuid -lgcov -lrt
EXTRA_DIST = \
SdoOrganizationTests.cpp
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -110,8 +110,9 @@
-lcppunit \
-lomniORB4 \
-lomnithread \
- -lcoil \
- -luuid
+ -lcoil \
+ -luuid \
+ -lrt
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -24,7 +24,7 @@
--vcversion VC9 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc9.sln \
- `find ./ -name '*_vc9.vcproj' \! -name 'USB*.vcproj' \! -name 'LTT*.vcproj' \! -name 'LogicalTime*.vcproj' \! -name 'FileName*.vcproj'`
+ `find ./ -name '*_vc9.vcproj' \! -name 'USB*.vcproj' \! -name 'LTT*.vcproj' \! -name 'FileName*.vcproj'`
qkc -O- -ms OpenRTM-aist_vc9.sln
OpenRTM-aist_vc10.sln:
@@ -32,7 +32,7 @@
--vcversion VC10 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc10.sln \
- `find ./ -name '*_vc10.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
+ `find ./ -name '*_vc10.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'FileName*.vcxproj'`
qkc -O- -ms OpenRTM-aist_vc10.sln
OpenRTM-aist_vc11.sln:
@@ -40,7 +40,7 @@
--vcversion VC11 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc11.sln \
- `find ./ -name '*_vc11.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
+ `find ./ -name '*_vc11.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'FileName*.vcxproj'`
qkc -O- -ms OpenRTM-aist_vc11.sln
OpenRTM-aist_vc12.sln:
@@ -48,7 +48,7 @@
--vcversion VC12 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc12.sln \
- `find ./ -name '*_vc12.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
+ `find ./ -name '*_vc12.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'FileName*.vcxproj'`
qkc -O- -ms OpenRTM-aist_vc12.sln
OpenRTM-aist_vc14.sln:
@@ -56,7 +56,7 @@
--vcversion VC14 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc14.sln \
- `find ./ -name '*_vc14.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
+ `find ./ -name '*_vc14.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'FileName*.vcxproj'`
qkc -O- -ms OpenRTM-aist_vc14.sln
OpenRTM-aist_vc141.sln:
@@ -64,7 +64,7 @@
--vcversion VC141 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc141.sln \
- `find ./ -name '*_vc141.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
+ `find ./ -name '*_vc141.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'FileName*.vcxproj'`
qkc -O- -ms OpenRTM-aist_vc141.sln
vsprops: coil_distbuild.vsprops coil_config.vsprops coil_distbuild.props coil_config.props
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2017-12-10 06:37:02 UTC (rev 3109)
@@ -42,3 +42,4 @@
Analyzer_testComp: libcoil libRTCSkel libRTC
Throughput: libcoil libRTCSkel libRTC
ThroughputComp: libcoil libRTCSkel libRTC
+LoggerConsumer: libcoil libRTCSkel libRTC
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = ec local_service sdo .
+SUBDIRS = ec local_service logger sdo .
clean-local:
rm -f *~
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = logical_time .
+SUBDIRS = artlinux logical_time rtpreempt .
clean-local:
rm -f *~
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am 2017-12-10 06:19:38 UTC (rev 3108)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am 2017-12-10 06:37:02 UTC (rev 3109)
@@ -4,7 +4,7 @@
##
## $Id: Makefile.am 1680 2010-01-17 15:12:59Z n-ando $
##---------------------------------------------------------------------------
-SUBDIRS = observer .
+SUBDIRS = observer logger .
clean-local:
rm -f *~
More information about the openrtm-commit
mailing list