[openrtm-commit:01413] r2540 - in branches/RELENG_1_1/OpenRTM-aist: . build etc examples examples/AutoTest examples/Composite examples/ConfigSample examples/ExtTrigger examples/SeqIO examples/SimpleIO examples/SimpleService packages/pkgsrc/OpenRTM-aist110 packages/pkgsrc/OpenRTM-aist110/patches src/ext/sdo/observer src/lib/coil/build src/lib/coil/common src/lib/coil/posix/coil src/lib/coil/tests src/lib/coil/tests/Logger src/lib/coil/tests/OS src/lib/coil/tests/UUID src/lib/coil/win32 src/lib/coil/win32/coil src/lib/rtm src/lib/rtm/idl src/lib/rtm/tests src/lib/rtm/tests/RingBuffer utils/rtcd utils/rtcprof win32/OpenRTM-aist win32/OpenRTM-aist/etc
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 3月 29日 (土) 17:09:18 JST
Author: n-ando
Date: 2014-03-29 17:09:18 +0900 (Sat, 29 Mar 2014)
New Revision: 2540
Added:
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/make_package.sh
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Removed:
branches/RELENG_1_1/OpenRTM-aist/packages/pkgsrc/OpenRTM-aist110/patches/patch-ac
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/RunAtFirst.py
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni407.vsprops
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni412.vsprops
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops
Modified:
branches/RELENG_1_1/OpenRTM-aist/
branches/RELENG_1_1/OpenRTM-aist/build/slntool.py
branches/RELENG_1_1/OpenRTM-aist/build/vcxprojtool.py
branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample
branches/RELENG_1_1/OpenRTM-aist/examples/AutoTest/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp
branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/ConnectorComp.cpp
branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/SimpleService/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/rtc.vcproj.yaml
branches/RELENG_1_1/OpenRTM-aist/examples/rtcdll.vcproj.yaml
branches/RELENG_1_1/OpenRTM-aist/packages/pkgsrc/OpenRTM-aist110/distinfo
branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/slntool.py
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Properties.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/stringutil.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/File.h
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/OS.h
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/Logger/LoggerTests.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/OS/OSTests.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/TestRunner.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/UUID/UUIDTests.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.props
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/tests/RingBuffer/RingBufferTests.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/tests/TestRunner.cpp
branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/rtcd.yaml
branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/rtcprof.yaml
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.props
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.vsprops
Log:
Merged r2522-2525,2530-2531,2534-2539
Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
- /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516
+ /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539
Modified: branches/RELENG_1_1/OpenRTM-aist/build/slntool.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/slntool.py 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/build/slntool.py 2014-03-29 08:09:18 UTC (rev 2540)
@@ -24,7 +24,9 @@
#------------------------------------------------------------
vcversions = {"VC8": {"sln": "9.00", "vc": "2005"},
"VC9": {"sln": "10.00", "vc": "2008"},
- "VC10": {"sln": "11.00", "vc": "2010"}
+ "VC10": {"sln": "11.00", "vc": "2010"},
+ "VC11": {"sln": "12.00", "vc": "2012"},
+ "VC12": {"sln": "13.00", "vc": "2013"},
}
sln_template = """Microsoft Visual Studio Solution File, Format Version %s
# Visual Studio %s
@@ -67,7 +69,9 @@
SolutionGUID: 8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942
Configurations:
- Release|Win32
+ - Release|x64
- Debug|Win32
+ - Debug|x64
"""
@@ -77,7 +81,7 @@
slntool.py --dep dep_file [--outfile outfile] vcproj_files...
Options:
- --vcversion: Visual C++'s version [VC8|VC9|VC10]
+ --vcversion: Visual C++'s version [VC8|VC9|VC10|VC11|VC12]
--dep: dependency file
--out or --output: output file name
@@ -109,7 +113,9 @@
guid = None
regexs = {"VC8": {"guid":'^.*?ProjectGUID=\"{(.*)}\"',"name":'^.*?Name=\"(.*)\"'},
"VC9": {"guid":'^.*?ProjectGUID=\"{(.*)}\"',"name":'^.*?Name=\"(.*)\"'},
- "VC10": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'}
+ "VC10": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
+ "VC11": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
+ "VC12": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
}
re_guid = re.compile(regexs[vcversion]["guid"])
re_name = re.compile(regexs[vcversion]["name"])
Property changes on: branches/RELENG_1_1/OpenRTM-aist/build/slntool.py
___________________________________________________________________
Modified: svn:mergeinfo
- /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/build/slntool.py:2173
/trunk/OpenRTM-aist/build/slntool.py:2126-2172,2174-2217,2330
+ /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/build/slntool.py:2173
/trunk/OpenRTM-aist/build/slntool.py:2126-2172,2174-2217,2330,2534-2539
Modified: branches/RELENG_1_1/OpenRTM-aist/build/vcxprojtool.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/vcxprojtool.py 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/build/vcxprojtool.py 2014-03-29 08:09:18 UTC (rev 2540)
@@ -24,10 +24,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>[RootNamespace]</ProjectName>
@@ -265,6 +273,18 @@
VC10_InheritedPropertySheets: # Set vsprops file if you need
"""
+def get_after_config(text):
+ import re
+ ret = ""
+ flag = False
+ for l in text.splitlines():
+ m = re.match("^Configurations:", l)
+ if m:
+ flag = True
+ continue
+ if flag:
+ ret += l.replace("Win32", "x64") + "\n"
+ return ret
#------------------------------------------------------------
# Yaml template
@@ -410,6 +430,7 @@
# VCWebDeploymentTool:
# VC10_VCPostBuildEventTool:
"""
+exe_yaml = exe_yaml + get_after_config(exe_yaml)
dll_yaml = """ProjectType: "Visual C++"
Version: "__VCVERSION__"
@@ -556,6 +577,8 @@
copy "$(OutDir)\\\\$(TargetName).lib" "$(SolutionDir)bin\\\\"
copy "$(OutDir)\\\\$(TargetName).dll" "$(SolutionDir)bin\\\\"
"""
+dll_yaml = dll_yaml + get_after_config(dll_yaml)
+
#------------------------------------------------------------
lib_yaml = """ProjectType: "Visual C++"
Version: "__VCVERSION__"
@@ -663,8 +686,8 @@
Value: |
copy "$(OutDir)\\\\libRTCSkel.lib" "$(SolutionDir)\\\\bin"
"""
+lib_yaml = lib_yaml + get_after_config(lib_yaml)
-
rtcexe_yaml="""ProjectType: "Visual C++"
Version: "__VCVERSION__"
Name: __PROJECT_NAME__
@@ -780,6 +803,7 @@
- Key: TargetMachine
Value: "MachineX86"
"""
+rtcexe_yaml = rtcexe_yaml + get_after_config(rtcexe_yaml)
rtcdll_yaml="""ProjectType: "Visual C++"
Version: "__VCVERSION__"
@@ -919,6 +943,7 @@
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
Modified: branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/etc/rtc.conf.sample 2014-03-29 08:09:18 UTC (rev 2540)
@@ -225,11 +225,22 @@
# Loadable modules, which is specified only as its file name, is searched
# in each module load path specified in the "manager.modules.load_path".
# If the "manager.modules.abs_path_allowed" option is YES, loadable file
-# can be specified as full-path name,
+# can be specified as full-path name.
#
+# Module initialization function name is usually estimated module file
+# name. If the module file name is ConsoleIn.so, the initialization
+# function name is set to "ConsleInInit." If you want to specify
+# specify the initialization function name, the initialization
+# function name in parenthesis after module file name can be
+# specified, like as "Hoge.so (ConsoleInInit)". File extensions such
+# as ".so", ".dll", ".dylib" can be drop. If module file name without
+# file extension is specified, an extension specified in property
+# variable "manager.modules.C++.suffixes" is supplied.
+#
# Valid settings:
# manager.modules.preload: ConsoleIn.dll, ConsoleOut.dll
# manager.modules.preload: ConsoleIn.so, ConsoleOut.so
+# manager.modules.preload: Hoge.so (ConsoleInInit), ConsoleOut
# manager.modules.abs_path_allowed: YES
# manager.modules.preload: /usr/lib/OpenRTM-aist/ConsoleIn.so
#
@@ -268,7 +279,30 @@
#
manager.components.precreate:
+#
+# Loading local service modules
+#
+# Local service mechanisms are provided for services provided among
+# components in the same process. Components can obtain and utilize
+# local services from the manager. By using this mechanism components
+# can share resources each other.
+#
+# Local service modules sometimes must be initialized before component
+# module loading and initialization. Loadable modules which is
+# specified in this option are previously loaded and initialized.
+#
+manager.local_service.modules: IEEE1394CameraService.so
+#
+# Specifying enabled local services
+#
+# All the loaded local service modules are activated and enabled in
+# default. This option specify local serivces to be enabled when
+# manager enables local services.
+#
+manager.local_service.enabled_services: IEEE1394CameraService
+
+
#============================================================
# Logger configurations
#============================================================
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/AutoTest/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/AutoTest/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/AutoTest/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -138,7 +138,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/AutoTest
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -266,6 +266,90 @@
--header $(CONSUMER_H)
qkc -O- -sm $(win32_builddir)/AutoTestOutDll_vc10.vcxproj
+vc11proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "AutoTestInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestIn_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(PROVIDER_COMP_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/AutoTestIn_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "AutoTestIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestInDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(PROVIDER_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/AutoTestInDll_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "AutoTestOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestOut_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/AutoTestOut_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "AutoTestOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestOutDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/AutoTestOutDll_vc11.vcxproj
+
+vc12proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "AutoTestInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestIn_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(PROVIDER_COMP_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/AutoTestIn_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "AutoTestIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestInDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(PROVIDER_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/AutoTestInDll_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "AutoTestOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestOut_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/AutoTestOut_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "AutoTestOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestOutDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/AutoTestOutDll_vc12.vcxproj
+
dist-hook:
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -112,7 +112,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/Composite
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -333,6 +333,152 @@
--source Composite.cpp
qkc -O- -sm $(win32_builddir)/Composite_vc10.vcxproj
+vc11proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "ControllerComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Controller_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Controller.cpp ControllerComp.cpp \
+ --header Controller.h
+ qkc -sm $(win32_builddir)/Controller_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "Controller" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ControllerDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Controller.cpp \
+ --header Controller.h
+ qkc -sm $(win32_builddir)/ControllerDll_vc11.vcxproj
+
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "MotorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Motor_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Motor.cpp MotorComp.cpp \
+ --header Motor.h
+ qkc -sm $(win32_builddir)/Motor_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "Motor" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MotorDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Motor.cpp \
+ --header Motor.h
+ qkc -sm $(win32_builddir)/MotorDll_vc11.vcxproj
+
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "SensorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Sensor_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Sensor.cpp SensorComp.cpp \
+ --header Sensor.h
+ qkc -sm $(win32_builddir)/Sensor_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "Sensor" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SensorDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Sensor.cpp \
+ --header Sensor.h
+ qkc -sm $(win32_builddir)/SensorDll_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "Composite" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Composite_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Composite.cpp
+ qkc -sm $(win32_builddir)/Composite_vc11.vcxproj
+
+vc12proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "ControllerComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Controller_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Controller.cpp ControllerComp.cpp \
+ --header Controller.h
+ qkc -sm $(win32_builddir)/Controller_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "Controller" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ControllerDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Controller.cpp \
+ --header Controller.h
+ qkc -sm $(win32_builddir)/ControllerDll_vc12.vcxproj
+
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "MotorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Motor_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Motor.cpp MotorComp.cpp \
+ --header Motor.h
+ qkc -sm $(win32_builddir)/Motor_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "Motor" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MotorDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Motor.cpp \
+ --header Motor.h
+ qkc -sm $(win32_builddir)/MotorDll_vc12.vcxproj
+
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "SensorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Sensor_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Sensor.cpp SensorComp.cpp \
+ --header Sensor.h
+ qkc -sm $(win32_builddir)/Sensor_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "Sensor" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SensorDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Sensor.cpp \
+ --header Sensor.h
+ qkc -sm $(win32_builddir)/SensorDll_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "Composite" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Composite_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Composite.cpp
+ qkc -sm $(win32_builddir)/Composite_vc12.vcxproj
+
dist-hook: lst vcproj
clean-local:
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -70,7 +70,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/ConfigSample/
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -138,6 +138,50 @@
--header ConfigSample.h VectorConvert.h
qkc -O- -sm $(win32_builddir)/ConfigSampleDll_vc10.vcxproj
+vc11proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "ConfigSampleComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConfigSample_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConfigSample.cpp ConfigSampleComp.cpp \
+ --header ConfigSample.h VectorConvert.h
+ qkc -sm $(win32_builddir)/ConfigSample_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "ConfigSample" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConfigSampleDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConfigSample.cpp \
+ --header ConfigSample.h VectorConvert.h
+ qkc -sm $(win32_builddir)/ConfigSampleDll_vc11.vcxproj
+
+vc12proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "ConfigSampleComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConfigSample_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConfigSample.cpp ConfigSampleComp.cpp \
+ --header ConfigSample.h VectorConvert.h
+ qkc -sm $(win32_builddir)/ConfigSample_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "ConfigSample" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConfigSampleDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConfigSample.cpp \
+ --header ConfigSample.h VectorConvert.h
+ qkc -sm $(win32_builddir)/ConfigSampleDll_vc12.vcxproj
+
dist-hook: lst vcproj
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -28,6 +28,10 @@
using namespace RTC;
+#ifdef __QNX__
+using std::exit;
+#endif
+
void usage()
{
std::cout << std::endl;
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -74,7 +74,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/ExtTrigger
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -86,7 +86,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SeqIO
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -214,6 +214,90 @@
--header SeqOut.h
qkc -O- -sm $(win32_builddir)/SeqOutDll_vc10.vcxproj
+vc11proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "SeqInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqIn_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source SeqIn.cpp SeqInComp.cpp \
+ --header SeqIn.h
+ qkc -sm $(win32_builddir)/SeqIn_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "SeqIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqInDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source SeqIn.cpp \
+ --header SeqIn.h
+ qkc -sm $(win32_builddir)/SeqInDll_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "SeqOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqOut_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source SeqOut.cpp SeqOutComp.cpp \
+ --header SeqOut.h
+ qkc -sm $(win32_builddir)/SeqOut_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "SeqOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqOutDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source SeqOut.cpp \
+ --header SeqOut.h
+ qkc -sm $(win32_builddir)/SeqOutDll_vc11.vcxproj
+
+vc12proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "SeqInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqIn_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source SeqIn.cpp SeqInComp.cpp \
+ --header SeqIn.h
+ qkc -sm $(win32_builddir)/SeqIn_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "SeqIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqInDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source SeqIn.cpp \
+ --header SeqIn.h
+ qkc -sm $(win32_builddir)/SeqInDll_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "SeqOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqOut_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source SeqOut.cpp SeqOutComp.cpp \
+ --header SeqOut.h
+ qkc -sm $(win32_builddir)/SeqOut_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "SeqOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqOutDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source SeqOut.cpp \
+ --header SeqOut.h
+ qkc -sm $(win32_builddir)/SeqOutDll_vc12.vcxproj
+
dist-hook: lst vcproj
clean-local:
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/ConnectorComp.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/ConnectorComp.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/ConnectorComp.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -27,6 +27,10 @@
using namespace RTC;
+#ifdef __QNX__
+using std::exit;
+#endif
+
void usage()
{
std::cout << std::endl;
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -225,6 +225,90 @@
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc10.vcxproj
+vc11proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "ConsoleInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleIn_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleIn.cpp ConsoleInComp.cpp \
+ --header ConsoleIn.h
+ qkc -sm $(win32_builddir)/ConsoleIn_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "ConsoleIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleInDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleIn.cpp \
+ --header ConsoleIn.h
+ qkc -sm $(win32_builddir)/ConsoleInDll_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "ConsoleOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOut_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleOut.cpp ConsoleOutComp.cpp \
+ --header ConsoleOut.h
+ qkc -sm $(win32_builddir)/ConsoleOut_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "ConsoleOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOutDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleOut.cpp \
+ --header ConsoleOut.h
+ qkc -sm $(win32_builddir)/ConsoleOutDll_vc11.vcxproj
+
+vc12proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "ConsoleInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleIn_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleIn.cpp ConsoleInComp.cpp \
+ --header ConsoleIn.h
+ qkc -sm $(win32_builddir)/ConsoleIn_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "ConsoleIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleInDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleIn.cpp \
+ --header ConsoleIn.h
+ qkc -sm $(win32_builddir)/ConsoleInDll_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "ConsoleOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOut_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleOut.cpp ConsoleOutComp.cpp \
+ --header ConsoleOut.h
+ qkc -sm $(win32_builddir)/ConsoleOut_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "ConsoleOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOutDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleOut.cpp \
+ --header ConsoleOut.h
+ qkc -sm $(win32_builddir)/ConsoleOutDll_vc12.vcxproj
+
dist-hook: lst vcproj
clean-local:
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SimpleService/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SimpleService/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SimpleService/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -154,7 +154,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SimpleService
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -282,6 +282,90 @@
--header $(CONSUMER_H)
qkc -O- -sm $(win32_builddir)/MyServiceConsumerDll_vc10.vcxproj
+vc11proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "MyServiceProviderComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceProvider_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(PROVIDER_COMP_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/MyServiceProvider_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "MyServiceProvider" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceProviderDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(PROVIDER_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/MyServiceProviderDll_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "MyServiceConsumerComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceConsumer_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/MyServiceConsumer_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "MyServiceConsumer" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceConsumerDll_vc11.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/MyServiceConsumerDll_vc11.vcxproj
+
+vc12proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "MyServiceProviderComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceProvider_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(PROVIDER_COMP_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/MyServiceProvider_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "MyServiceProvider" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceProviderDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(PROVIDER_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/MyServiceProviderDll_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "MyServiceConsumerComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceConsumer_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/MyServiceConsumer_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "MyServiceConsumer" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceConsumerDll_vc12.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/MyServiceConsumerDll_vc12.vcxproj
+
dist-hook: lst vcproj
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/rtc.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/rtc.vcproj.yaml 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/rtc.vcproj.yaml 2014-03-29 08:09:18 UTC (rev 2540)
@@ -97,6 +97,90 @@
Value: "Console"
- Key: TargetMachine
Value: "MachineX86"
+ - Name: "Debug|x64"
+ OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(ConfigurationName)"
+ IntermediateDirectory: "__PROJECT_NAME__\\$(ConfigurationName)"
+ ConfigurationType: "1"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
+ VCCLCompilerTool:
+ - Key: Optimization
+ Value: 0
+ - Key: PreprocessorDefinitions
+ Value: "INCLUDE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "3"
+ - Key: RuntimeLibrary
+ Value: "3"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "4"
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_libd)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "2"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "1"
+ - Key: TargetMachine
+ Value: "1"
+ VC10_OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(Configuration)"
+ VC10_IntermediateDirectory: "__PROJECT_NAME__\\$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "true"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
+ VC10_VCCLCompilerTool:
+ - Key: Optimization
+ Value: "Disabled"
+ - Key: PreprocessorDefinitions
+ Value: "INCLUDED_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "EnableFastChecks"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDebugDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "EditAndContinue"
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_libd);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "true"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "Console"
+ - Key: TargetMachine
+ Value: "MachineX64"
#------------------------------------------------------------
# Release Configuration
#------------------------------------------------------------
@@ -195,3 +279,98 @@
Value: ""
- Key: TargetMachine
Value: "MachineX86"
+ - Name: "Release|x64"
+ OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(ConfigurationName)"
+ IntermediateDirectory: "__PROJECT_NAME__\\$(ConfigurationName)"
+ ConfigurationType: "1"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ WholeProgramOptimization: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ if NOT EXIST "$(SolutionDir)\\\\components" mkdir "$(SolutionDir)\\\\components"
+ copy "$(OutDir)\\\\__PROJECT_NAME__.exe" "$(SolutionDir)\\\\components"
+ VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "INCLUDED_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "2"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "3"
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_lib)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "1"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "1"
+ - Key: OptimizeReferences
+ Value: "2"
+ - Key: EnableCOMDATFolding
+ Value: "2"
+ - Key: LinkTimeCodeGeneration
+ Value: "0"
+ - Key: TargetMachine
+ Value: "1"
+ VC10_OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(Configuration)"
+ VC10_IntermediateDirectory: "__PROJECT_NAME__\\$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "false"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ if NOT EXIST "$(SolutionDir)\\\\components" mkdir "$(SolutionDir)\\\\components"
+ copy "$(OutDir)\\\\__PROJECT_NAME__.exe" "$(SolutionDir)\\\\components"
+ VC10_VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "USE_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_lib);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "false"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "Console"
+ - Key: OptimizeReferences
+ Value: "true"
+ - Key: EnableCOMDATFolding
+ Value: "true"
+ - Key: LinkTimeCodeGeneration
+ Value: ""
+ - Key: TargetMachine
+ Value: "MachineX64"
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/rtcdll.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/rtcdll.vcproj.yaml 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/rtcdll.vcproj.yaml 2014-03-29 08:09:18 UTC (rev 2540)
@@ -105,6 +105,98 @@
Value: "Windows"
- Key: TargetMachine
Value: "MachineX86"
+ - Name: "Debug|x64"
+ OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(ConfigurationName)"
+ IntermediateDirectory: "__PROJECT_NAME__\\$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
+ VCCLCompilerTool:
+ - Key: Optimization
+ Value: "0"
+ - Key: PreprocessorDefinitions
+ Value: "INCLUDED_stub_in_nt_dll;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "3"
+ - Key: RuntimeLibrary
+ Value: "3"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "4"
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_libd)"
+# - Key: OutputFile
+# Value: "$(OutDir)\\__PROJECT_NAME__.dll"
+# - Key: Version
+# Value: __VERSION__
+ - Key: LinkIncremental
+ Value: "2"
+# - Key: ModuleDefinitionFile
+# Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VC10_OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(Configuration)"
+ VC10_IntermediateDirectory: "__PROJECT_NAME__\\$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "true"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
+ VC10_VCCLCompilerTool:
+ - Key: Optimization
+ Value: "Disabled"
+ - Key: PreprocessorDefinitions
+ Value: "INCLUDED_stub_in_nt_dll;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "EnableFastChecks"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDebugDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "EditAndContinue"
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_libd);%(AdditionalDependencies)"
+# - Key: OutputFile
+# Value: "$(OutDir)\\__PROJECT_NAME__.dll"
+# - Key: Version
+# Value: __VERSION__
+ - Key: LinkIncremental
+ Value: "true"
+# - Key: ModuleDefinitionFile
+# Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: TargetMachine
+ Value: "MachineX64"
#------------------------------------------------------------
# Release Configuration
#------------------------------------------------------------
@@ -203,3 +295,98 @@
Value: "true"
- Key: TargetMachine
Value: "MachineX86"
+ - Name: "Release|x64"
+ OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(ConfigurationName)"
+ IntermediateDirectory: "__PROJECT_NAME__\\$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ WholeProgramOptimization: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ if NOT EXIST "$(SolutionDir)\\\\components" mkdir "$(SolutionDir)\\\\components"
+ copy "$(OutDir)\\\\__PROJECT_NAME__.dll" "$(SolutionDir)\\\\components"
+ VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "INCLUDED_stub_in_nt_dll;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "2"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "3"
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_lib)"
+# - Key: OutputFile
+# Value: "$(OutDir)\\__PROJECT_NAME__.dll"
+ - Key: LinkIncremental
+ Value: "1"
+# - Key: ModuleDefinitionFile
+# Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "2"
+ - Key: OptimizeReferences
+ Value: "2"
+ - Key: EnableCOMDATFolding
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VC10_OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(Configuration)"
+ VC10_IntermediateDirectory: "__PROJECT_NAME__\\$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "false"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) -Wbdll_includes %%x
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ if NOT EXIST "$(SolutionDir)\\\\components" mkdir "$(SolutionDir)\\\\components"
+ copy "$(OutDir)\\\\__PROJECT_NAME__.dll" "$(SolutionDir)\\\\components"
+ VC10_VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "INCLUDED_stub_in_nt_dll;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_lib);%(AdditionalDependencies)"
+# - Key: OutputFile
+# Value: "$(OutDir)\\__PROJECT_NAME__.dll"
+ - Key: LinkIncremental
+ Value: "false"
+# - Key: ModuleDefinitionFile
+# Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: OptimizeReferences
+ Value: "true"
+ - Key: EnableCOMDATFolding
+ Value: "true"
+ - Key: TargetMachine
+ Value: "MachineX64"
Modified: branches/RELENG_1_1/OpenRTM-aist/packages/pkgsrc/OpenRTM-aist110/distinfo
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/pkgsrc/OpenRTM-aist110/distinfo 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/pkgsrc/OpenRTM-aist110/distinfo 2014-03-29 08:09:18 UTC (rev 2540)
@@ -5,4 +5,3 @@
Size (OpenRTM-aist-1.1.0-RELEASE.tar.bz2) = 4391286 bytes
SHA1 (patch-aa) = d414c6b5ae06dac7ac5ebf17b53da8cf6b217971
SHA1 (patch-ab) = f1f882fc7bc3dcc00613126947a0535815e0cdad
-SHA1 (patch-ac) = e1cdce087b621aa3911be82c2b0bf0a4d75266cf
Deleted: branches/RELENG_1_1/OpenRTM-aist/packages/pkgsrc/OpenRTM-aist110/patches/patch-ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/pkgsrc/OpenRTM-aist110/patches/patch-ac 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/pkgsrc/OpenRTM-aist110/patches/patch-ac 2014-03-29 08:09:18 UTC (rev 2540)
@@ -1,38 +0,0 @@
---- src/lib/coil/posix/coil/Routing.cpp.orig 2012-05-24 23:18:14.000000000 +0900
-+++ src/lib/coil/posix/coil/Routing.cpp 2012-07-16 18:50:00.000000000 +0900
-@@ -64,7 +64,7 @@
- addr.sin_addr.s_addr = **(unsigned int **)(hostent->h_addr_list);
- dest_addr = inet_ntoa(addr.sin_addr);
-
--#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN)
-+#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN) || defined(COIL_OS_QNX)
- std::string cmd("PATH=/bin:/sbin:/usr/bin:/usr/sbin "
- "route get ");
- const char* match_str = "interface";
-@@ -72,7 +72,7 @@
- size_t ifname_pos(1);
- cmd += dest_addr;
- cmd += " 2> /dev/null";
--#endif // COIL_OS_IS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN
-+#endif // COIL_OS_IS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN || COIL_OS_QNX
- #if defined(COIL_OS_LINUX)
- std::string cmd("PATH=/bin:/sbin:/usr/bin:/usr/sbin "
- "ip route get ");
-@@ -100,7 +100,7 @@
- line.erase(line.end() - 1);
- coil::vstring vs(coil::split(line, delimiter));
-
--#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN)
-+#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN) || defined(COIL_OS_QNX)
- if (vs.size() > ifname_pos)
- {
- dest_if = vs[ifname_pos];
-@@ -108,7 +108,7 @@
- wait(NULL);
- return true;
- }
--#endif // COIL_OS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN
-+#endif // COIL_OS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN || COIL_OS_QNX
- #if defined(COIL_OS_LINUX)
- for (int i(0); i < vs.size(); ++i)
- {
Modified: branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -105,7 +105,7 @@
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/sdo/observer
PROJNAME=ComponentObserverConsumer
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -143,7 +143,31 @@
--header $(OBSERVER_WIN_H)
qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj
+vc11proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(OBSERVER_WIN_SRC) \
+ --header $(OBSERVER_WIN_H)
+ qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj
+vc12proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(OBSERVER_WIN_SRC) \
+ --header $(OBSERVER_WIN_H)
+ qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj
+
+
dist-hook: lst vcproj
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -13,6 +13,7 @@
autogen \
setuptest.py \
vcprojtool.py \
+ vcxprojtool.py \
makedeffile.py \
slntool.py \
yat.py \
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/slntool.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/slntool.py 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/slntool.py 2014-03-29 08:09:18 UTC (rev 2540)
@@ -4,15 +4,14 @@
# @date $Date: 2008-03-06 06:46:37 $
# @author Norkai Ando <n-ando at aist.go.jp>
#
-# Copyright (C) 2008
-# Noriaki Ando
-# Task-intelligence Research Group,
+# Copyright (C) 2008-2011
+# Noriaki Ando, Tsuyoto Katami
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
#
-# $Id: slntool.py 1863 2010-02-11 06:31:11Z n-ando $
+# $Id: slntool.py 2217 2011-08-22 07:58:52Z fsi-katami $
#
import sys
@@ -25,7 +24,9 @@
#------------------------------------------------------------
vcversions = {"VC8": {"sln": "9.00", "vc": "2005"},
"VC9": {"sln": "10.00", "vc": "2008"},
- "VC10": {"sln": "11.00", "vc": "2010"}
+ "VC10": {"sln": "11.00", "vc": "2010"},
+ "VC11": {"sln": "12.00", "vc": "2012"},
+ "VC12": {"sln": "13.00", "vc": "2013"},
}
sln_template = """Microsoft Visual Studio Solution File, Format Version %s
# Visual Studio %s
@@ -68,7 +69,9 @@
SolutionGUID: 8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942
Configurations:
- Release|Win32
+ - Release|x64
- Debug|Win32
+ - Debug|x64
"""
@@ -78,7 +81,7 @@
slntool.py --dep dep_file [--outfile outfile] vcproj_files...
Options:
- --vcversion: Visual C++'s version [VC8|VC9|VC10]
+ --vcversion: Visual C++'s version [VC8|VC9|VC10|VC11|VC12]
--dep: dependency file
--out or --output: output file name
@@ -105,33 +108,14 @@
"""
-def get_projinfo(fname):
+def get_projinfo(fname,vcversion="VC8"):
name = None
guid = None
- re_guid = re.compile('^.*?ProjectGUID=\"{(.*)}\"')
- re_name = re.compile('^.*?Name=\"(.*)\"')
- fd = open(fname, "r")
- pj = fd.readlines()
- for t in pj:
- n = re_name.match(t)
- g = re_guid.match(t)
-
- if name == None and n:
- name = n.group(1)
- if guid == None and g:
- guid = g.group(1)
-
- if name and guid:
- break
- fd.close()
- return {"Name": name, "GUID": guid, "FileName": fname}
-
-def get_projinfo(fname,vcversion):
- name = None
- guid = None
regexs = {"VC8": {"guid":'^.*?ProjectGUID=\"{(.*)}\"',"name":'^.*?Name=\"(.*)\"'},
"VC9": {"guid":'^.*?ProjectGUID=\"{(.*)}\"',"name":'^.*?Name=\"(.*)\"'},
- "VC10": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'}
+ "VC10": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
+ "VC11": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
+ "VC12": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
}
re_guid = re.compile(regexs[vcversion]["guid"])
re_name = re.compile(regexs[vcversion]["name"])
@@ -192,75 +176,12 @@
i += 1
return (vcversion, depfile, outfile, flist)
-def get_slnyaml(depfile, projfiles):
+def get_slnyaml(depfile, projfiles, vcversion="VC8"):
depdict = get_dependencies(depfile)
projs = []
projlist = """Projects:
"""
for f in projfiles:
- pj = get_projinfo(f)
- if depdict.has_key(pj["Name"]):
- pj["Depend"] = depdict[pj["Name"]]
- projs.append(pj)
- def depsort(d0, d1):
- """
- d0 < d1: return -1
- d0 == d1: return 0
- d0 > d1: return 1
- """
- d0_depends = d0.has_key("Depend")
- d1_depends = d1.has_key("Depend")
- if not d0_depends and not d1_depends:
- # both d0, d1 has no dependency
- return 0
-
- if not d0_depends and d1_depends:
- # only "d1" has dependency: d0 < d1
- return -1
-
- if d0_depends and not d1_depends:
- # only "d0" has dependency: d1 < d0
- return 1
-
- # d0 and d1 has dependency
- d0_in_dep = depdict.has_key(d0["Name"])
- d1_in_dep = depdict.has_key(d1["Name"])
- if not d0_in_dep and not d1_in_dep:
- return 0
- if not d0_in_dep and d1_in_dep:
- return -1
- if d0_in_dep and not d1_in_dep:
- return 1
-
- # both d0 and d1 have several dependency
- if depdict[d0["Name"]].count(d1["Name"]) > 0:
- return 1
- if depdict[d1["Name"]].count(d0["Name"]) > 0:
- return -1
- return 0
-
- projs.sort(depsort)
- for pj in projs:
- list = """ - Name: %s
- FileName: %s
- GUID: &%s %s
- Depend:
-""" % (pj["Name"], pj["FileName"], pj["Name"], pj["GUID"])
- if pj.has_key("Depend"):
- for dep in pj["Depend"]:
- dep = """ - *%s
-""" % (dep)
- list += dep
- projlist += list
- yaml_text = sln_yaml + projlist
- return yaml_text
-
-def get_slnyaml(depfile, projfiles, vcversion):
- depdict = get_dependencies(depfile)
- projs = []
- projlist = """Projects:
-"""
- for f in projfiles:
pj = get_projinfo(f, vcversion)
if depdict.has_key(pj["Name"]):
pj["Depend"] = depdict[pj["Name"]]
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py 2014-03-29 08:09:18 UTC (rev 2540)
@@ -5,8 +5,7 @@
# @author Norkai Ando <n-ando at aist.go.jp>
#
# Copyright (C) 2008
-# Noriaki Ando
-# Task-intelligence Research Group,
+# Tsuyoto Katami, Noriaki Ando
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
@@ -25,10 +24,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>[RootNamespace]</ProjectName>
@@ -142,7 +149,7 @@
# Tool set for configuration
#------------------------------------------------------------
PreBuildEventtools = {"EXE":
- ["PreBuildEvent",
+ ["VC10_VCPreBuildEventTool",
"VCCustomBuildTool",
"VCXMLDataGeneratorTool",
"VCWebServiceProxyGeneratorTool",
@@ -151,9 +158,9 @@
"VCResourceCompilerTool",
"VCManifestTool"],
"DLL":
- ["PreBuildEvent"],
+ ["VC10_VCPreBuildEventTool"],
"LIB":
- ["PreBuildEvent"]
+ ["VC10_VCPreBuildEventTool"]
}
PreBuildEventtools["RTCEXE"] = PreBuildEventtools["EXE"]
PreBuildEventtools["RTCDLL"] = PreBuildEventtools["DLL"]
@@ -229,16 +236,7 @@
Linktools["RTCEXE"] = Linktools["EXE"]
Linktools["RTCDLL"] = Linktools["DLL"]
PostBuildEventtools = {"EXE":
- ["VC10_VCPreLinkEventTool",
- "VC10_VCLinkerTool",
- "VCALinkTool",
- "VCManifestTool",
- "VCXDCMakeTool",
- "VCBscMakeTool",
- "VCFxCopTool",
- "VCAppVerifierTool",
- "VCWebDeploymentTool",
- "VC10_VCPostBuildEventTool"],
+ ["VC10_VCPostBuildEventTool"],
"DLL":
["VC10_VCPostBuildEventTool"],
"LIB":
@@ -420,6 +418,7 @@
# VCWebDeploymentTool:
# VC10_VCPostBuildEventTool:
"""
+exe_yaml = exe_yaml + "\n" + exe_yaml.replace("Win32", "x64")
dll_yaml = """ProjectType: "Visual C++"
Version: "__VCVERSION__"
@@ -566,6 +565,8 @@
copy "$(OutDir)\\\\$(TargetName).lib" "$(SolutionDir)bin\\\\"
copy "$(OutDir)\\\\$(TargetName).dll" "$(SolutionDir)bin\\\\"
"""
+dll_yaml = dll_yaml + "\n" + dll_yaml.replace("Win32", "x64")
+
#------------------------------------------------------------
lib_yaml = """ProjectType: "Visual C++"
Version: "__VCVERSION__"
@@ -673,8 +674,8 @@
Value: |
copy "$(OutDir)\\\\libRTCSkel.lib" "$(SolutionDir)\\\\bin"
"""
+lib_yaml = lib_yaml + "\n" + lib_yaml.replace("Win32", "x64")
-
rtcexe_yaml="""ProjectType: "Visual C++"
Version: "__VCVERSION__"
Name: __PROJECT_NAME__
@@ -790,6 +791,7 @@
- Key: TargetMachine
Value: "MachineX86"
"""
+rtcexe_yaml = rtcexe_yaml + "\n" + rtcexe_yaml.replace("Win32", "x64")
rtcdll_yaml="""ProjectType: "Visual C++"
Version: "__VCVERSION__"
@@ -911,7 +913,6 @@
"""
-
def usage():
print """Usage:
vcprojtool.py cmd options
@@ -929,6 +930,7 @@
vcprojtool.py yaml --type [exe|dll|nmake|lib] --output
vcprojtool.py flist --out --source|--header|--resource *
"""
+rtcdll_yaml = rtcdll_yaml + "\n" + rtcdll_yaml.replace("Win32", "x64")
import sys
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Properties.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -21,6 +21,10 @@
#include <coil/stringutil.h>
#include <iostream>
+#ifdef __QNX__
+using std::size_t;
+#endif
+
namespace coil
{
/*!
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/stringutil.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/stringutil.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/stringutil.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -28,6 +28,11 @@
#include <cctype>
#include <cstdio>
+#ifdef __QNX__
+using std::toupper;
+using std::isalpha;
+#endif
+
namespace coil
{
/*!
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/File.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/File.h 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/File.h 2014-03-29 08:09:18 UTC (rev 2540)
@@ -27,6 +27,11 @@
#include <coil/config_coil.h>
#include <coil/stringutil.h>
+#ifdef __QNX__
+using std::strlen;
+using std::strcpy;
+#endif
+
namespace coil
{
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/OS.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/OS.h 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/OS.h 2014-03-29 08:09:18 UTC (rev 2540)
@@ -180,6 +180,9 @@
: optarg(::optarg), optind(1), opterr(1), optopt(0), m_argc(argc), m_argv(argv), m_opt(opt), m_flag(flag)
{
::optind = 1;
+#ifdef __QNX___
+ optind_last = 1;
+#endif
}
/*!
@@ -200,6 +203,9 @@
~GetOpt()
{
::optind = 1;
+#ifdef __QNX__
+ optind_last = 1;
+#endif
}
/*!
@@ -224,14 +230,27 @@
int operator()()
{
::opterr = opterr;
+#ifndef __QNX__
::optind = optind;
-
+#else
+ ::optind = optind_last;
+ ::optarg = 0;
+#endif
int result = getopt(m_argc, m_argv, m_opt);
-
+#ifdef __QNX__
+ if(::optind == optind_last)
+ {
+ ::optind++;
+ result = getopt(m_argc, m_argv, m_opt);
+ optind_last = ::optind;
+ }
+#endif
optarg = ::optarg;
optind = ::optind;
optopt = ::optopt;
-
+#if __QNX__
+ if(optind_last < m_argc) { ++optind_last; }
+#endif
return result;
}
@@ -239,6 +258,9 @@
int optind; //! 処理対象引数
int opterr; //! エラー表示 0:抑止、1:表示
int optopt; //! オプション文字が足りない時、多い時にセットされる
+#ifdef __QNX__
+ int optind_last;
+#endif
private:
int m_argc;
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -64,7 +64,7 @@
addr.sin_addr.s_addr = **(unsigned int **)(hostent->h_addr_list);
dest_addr = inet_ntoa(addr.sin_addr);
-#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN)
+#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN) || defined(COIL_OS_QNX)
std::string cmd("PATH=/bin:/sbin:/usr/bin:/usr/sbin "
"route get ");
const char* match_str = "interface";
@@ -72,7 +72,7 @@
size_t ifname_pos(1);
cmd += dest_addr;
cmd += " 2> /dev/null";
-#endif // COIL_OS_IS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN
+#endif // COIL_OS_IS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN || COIL_OS_QNX
#if defined(COIL_OS_LINUX)
std::string cmd("PATH=/bin:/sbin:/usr/bin:/usr/sbin "
"ip route get ");
@@ -100,7 +100,7 @@
line.erase(line.end() - 1);
coil::vstring vs(coil::split(line, delimiter));
-#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN)
+#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN) || defined(COIL_OS_QNX)
if (vs.size() > ifname_pos)
{
dest_if = vs[ifname_pos];
@@ -108,7 +108,7 @@
wait(NULL);
return true;
}
-#endif // COIL_OS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN
+#endif // COIL_OS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN || COIL_OS_QNX
#if defined(COIL_OS_LINUX)
for (int i(0); i < vs.size(); ++i)
{
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/Logger/LoggerTests.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/Logger/LoggerTests.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/Logger/LoggerTests.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -38,6 +38,10 @@
#include <coil/Mutex.h>
#include <coil/Guard.h>
+#ifdef __QNX__
+using std::rand;
+#endif
+
namespace coil
{
};
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/OS/OSTests.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/OS/OSTests.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/OS/OSTests.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -32,6 +32,10 @@
/* Global Valiables */
+#ifdef __QNX__
+using std::fprintf;
+using std::sprintf;
+#endif
namespace OS
{
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/TestRunner.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/TestRunner.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/TestRunner.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -36,6 +36,10 @@
#include <cppunit/CompilerOutputter.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
+#ifdef __QNX__
+using std::exit;
+#endif
+
enum FORMAT
{
TEXT_OUT,
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/UUID/UUIDTests.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/UUID/UUIDTests.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/tests/UUID/UUIDTests.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -30,6 +30,10 @@
* @brief UUID test
*/
+#ifdef __QNX__
+using std::isxdigit;
+#endif
+
namespace coilUUID
{
class UUIDTests
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -18,14 +18,16 @@
coil_distbuild.vsprops \
coil_vc8.sln \
coil_vc9.sln \
- coil_vc10.sln
+ coil_vc10.sln \
+ coil_vc11.sln \
+ coil_vc12.sln
#------------------------------------------------------------
# sln file build rules
#------------------------------------------------------------
win32_builddir = .
-sln: coil_vc8.sln coil_vc9.sln coil_vc10.sln
+sln: coil_vc8.sln coil_vc9.sln coil_vc10.sln coil_vc11.sln coil_vc12.sln
vcproj:
(cd coil ; make vcproj)
@@ -55,3 +57,19 @@
`find ./ -name '*_vc10.vcxproj'`
qkc -O- -ms coil_vc10.sln
+coil_vc11.sln: coil.sln.dep vcproj
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC11 \
+ --dep coil.sln.dep \
+ --out coil_vc11.sln \
+ `find ./ -name '*_vc11.vcxproj'`
+ qkc -ms coil_vc11.sln
+
+coil_vc12.sln: coil.sln.dep vcproj
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC12 \
+ --dep coil.sln.dep \
+ --out coil_vc12.sln \
+ `find ./ -name '*_vc12.vcxproj'`
+ qkc -ms coil_vc12.sln
+
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -99,7 +99,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: libcoil_vc8.vcproj libcoil_vc9.vcproj libcoil_vc10.vcxproj
+vcproj: libcoil_vc8.vcproj libcoil_vc9.vcproj libcoil_vc10.vcxproj libcoil_vc11.vcxproj libcoil_vc12.vcxproj
libcoil_vc8.vcproj: libcoil.vcproj.yaml $(COIL_ALL)
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -134,6 +134,28 @@
--header $(COIL_H)
qkc -O- -sm $(win32_builddir)/libcoil_vc10.vcxproj
+libcoil_vc11.vcxproj: libcoil.vcproj.yaml $(COIL_ALL)
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/libcoil_vc11.vcxproj \
+ --yaml libcoil.vcproj.yaml \
+ --source $(COIL_SRC) \
+ --header $(COIL_H)
+ qkc -sm $(win32_builddir)/libcoil_vc11.vcxproj
+
+libcoil_vc12.vcxproj: libcoil.vcproj.yaml $(COIL_ALL)
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/libcoil_vc12.vcxproj \
+ --yaml libcoil.vcproj.yaml \
+ --source $(COIL_SRC) \
+ --header $(COIL_H)
+ qkc -sm $(win32_builddir)/libcoil_vc12.vcxproj
+
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml 2014-03-29 08:09:18 UTC (rev 2540)
@@ -119,6 +119,112 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\coil$(coil_dllver)d.lib"
copy "$(OutDir)\\coil$(coil_dllver)d.dll" "$(SolutionDir)bin\\"
+ - Name: "Debug|x64"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)coil_config.vsprops;$(SolutionDir)coil_distbuild.vsprops"
+ CharacterSet: "0"
+ VCCLCompilerTool:
+ - Key: Optimization
+ Value: "0"
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "3"
+ - Key: RuntimeLibrary
+ Value: "3"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "4"
+ VCPreLinkEventTool:
+ - Key: CommandLine
+ Value: |
+ lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
+ set PATH=%PATH%;$(coil_path)
+ cd "$(TargetDir)"
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ move coil$(coil_dllver)d.def ..\
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(coil_depend_libd)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\coil$(coil_dllver)d.dll"
+ - Key: Version
+ Value: __VERSION__
+ - Key: LinkIncremental
+ Value: "2"
+ - Key: ModuleDefinitionFile
+ Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
+ copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)coil_distbuild.props"
+ - "$(SolutionDir)coil_config.props"
+ VC10_LinkIncrementalCondition: "true"
+ VC10_VCCLCompilerTool:
+ - Key: Optimization
+ Value: "Disabled"
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "EnableFastChecks"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDebugDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "EditAndContinue"
+ VC10_VCPreLinkEventTool:
+ - Key: Command
+ Value: |
+ lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
+ set PATH=%PATH%;$(coil_path)
+ cd "$(TargetDir)"
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ move coil$(coil_dllver)d.def ..\
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(coil_depend_libd);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\coil$(coil_dllver)d.dll"
+ - Key: Version
+ Value: __VERSION__
+ - Key: LinkIncremental
+ Value: "true"
+ - Key: ModuleDefinitionFile
+ Value: "coil$(coil_dllver)d.def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: TargetMachine
+ Value: "MachineX64"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\coil$(coil_dllver)d.lib"
+ copy "$(OutDir)\\coil$(coil_dllver)d.dll" "$(SolutionDir)bin\\"
#------------------------------------------------------------
# Release Configuration
#------------------------------------------------------------
@@ -222,3 +328,103 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\coil$(coil_dllver).lib"
copy "$(OutDir)\\coil$(coil_dllver).dll" "$(SolutionDir)bin\\"
+ - Name: "Release|x64"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)coil_config.vsprops;$(SolutionDir)coil_distbuild.vsprops"
+ CharacterSet: "0"
+ WholeProgramOptimization: "0"
+ VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "2"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "3"
+ VCPreLinkEventTool:
+ - Key: CommandLine
+ Value: |
+ lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
+ set PATH=%PATH%;$(coil_path)
+ cd "$(OutDir)"
+ start /wait cmd /c makedeffile.py coil_static.lib $(TargetName) $(coil_version) $(TargetName).def
+ move coil$(coil_dllver).def ..\\
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(coil_depend_lib)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\coil$(coil_dllver).dll"
+ - Key: LinkIncremental
+ Value: "1"
+ - Key: ModuleDefinitionFile
+ Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "2"
+ - Key: OptimizeReferences
+ Value: "2"
+ - Key: EnableCOMDATFolding
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
+ copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
+
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)coil_distbuild.props"
+ - "$(SolutionDir)coil_config.props"
+ VC10_LinkIncrementalCondition: "false"
+ VC10_VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCPreLinkEventTool:
+ - Key: Command
+ Value: |
+ lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
+ set PATH=%PATH%;$(coil_path)
+ cd "$(OutDir)"
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver) $(coil_version) coil$(coil_dllver).def
+ move coil$(coil_dllver).def ..\\
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(coil_depend_lib);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\coil$(coil_dllver).dll"
+ - Key: LinkIncremental
+ Value: "false"
+ - Key: ModuleDefinitionFile
+ Value: "coil$(coil_dllver).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: OptimizeReferences
+ Value: "true"
+ - Key: EnableCOMDATFolding
+ Value: "true"
+ - Key: TargetMachine
+ Value: "MachineX64"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\coil$(coil_dllver).lib"
+ copy "$(OutDir)\\coil$(coil_dllver).dll" "$(SolutionDir)bin\\"
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.props
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.props 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.props 2014-03-29 08:09:18 UTC (rev 2540)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
- <coil_dllver>110</coil_dllver>
- <coil_version>1.0.0</coil_version>
+ <coil_dllver>$(COIL_DLLVER)</coil_dllver>
+ <coil_version>$(COIL_VERSION)</coil_version>
<coil_includes>$(coil_root);..</coil_includes>
<coil_libdir>$(coil_root)\bin</coil_libdir>
<coil_bin>$(coil_root)\bin;$(coil_root)\build</coil_bin>
@@ -12,7 +12,7 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <_PropertySheetDisplayName>coil-1.0</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>coil-$(COIL_SHORT_VER)</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops 2014-03-29 08:09:18 UTC (rev 2540)
@@ -2,7 +2,7 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="coil-1.0"
+ Name="coil-%COIL_SHORTVER%"
>
<Tool
Name="VCCLCompilerTool"
@@ -18,11 +18,11 @@
/>
<UserMacro
Name="coil_dllver"
- Value="110"
+ Value="%COIL_DLLVER%"
/>
<UserMacro
Name="coil_version"
- Value="1.1.0"
+ Value="%COIL_VERSION%"
/>
<!-- coil macros -->
<UserMacro
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props 2014-03-29 08:09:18 UTC (rev 2540)
@@ -2,14 +2,12 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<coil_root>$(SolutionDir)</coil_root>
- <!-- <coil_depend_libd>"advapi32.lib";"ws2_32.lib";"mswsock.lib";"rpcrt4.lib";"msvcrt.lib";"msvcmrt.lib"</coil_depend_libd>
- -->
<coil_depend_libd>"advapi32.lib";"ws2_32.lib";"mswsock.lib";"rpcrt4.lib";"msvcrtd.lib";"msvcmrtd.lib"</coil_depend_libd>
<coil_depend_lib>"advapi32.lib";"ws2_32.lib";"mswsock.lib";"rpcrt4.lib";"msvcrt.lib";"msvcmrt.lib"</coil_depend_lib>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <_PropertySheetDisplayName>coil-dist-1.0</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>coil-dist-$(COIL_SHORTVER)</_PropertySheetDisplayName>
</PropertyGroup>
<ItemGroup>
<BuildMacro Include="coil_root">
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops 2014-03-29 08:09:18 UTC (rev 2540)
@@ -2,7 +2,7 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="coil-dist-1.0"
+ Name="coil-dist-%COIL_SHORTVER%"
>
<UserMacro
Name="coil_root"
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -233,7 +233,7 @@
if (ior.profiles.length() == 0 && strlen(ior.type_id) == 0)
{
retstr << "IOR is a nil object reference." << std::endl;
- retstr << iorstr << std::endl;
+ if (iorstr) { retstr << iorstr << std::endl; }
return retstr.str();
}
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -166,7 +166,7 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
vc8proj: libRTC.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -201,6 +201,28 @@
--header $(rtmheader_HEADERS)
qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc10.vcxproj
+vc11proj: libRTC.vcproj.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/libRTC_vc11.vcxproj \
+ --yaml libRTC.vcproj.yaml \
+ --source $(RTC_SRC) \
+ --header $(rtmheader_HEADERS)
+ qkc -sm $(win32_builddir)/rtm/libRTC_vc11.vcxproj
+
+vc12proj: libRTC.vcproj.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/libRTC_vc12.vcxproj \
+ --yaml libRTC.vcproj.yaml \
+ --source $(RTC_SRC) \
+ --header $(rtmheader_HEADERS)
+ qkc -sm $(win32_builddir)/rtm/libRTC_vc12.vcxproj
+
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -102,7 +102,7 @@
/*!
* @if jp
- * @brief マネージャの初期化
+ * @brief ¥Þ¥Í¡¼¥¸¥ã¤Î½é´E½
* @else
* @brief Initialize manager
* @endif
@@ -174,8 +174,7 @@
/*!
* @if jp
- * @brief マネージャ・シャットダウン
- * @else
+ * @brief ¥Þ¥Í¡¼¥¸¥ã¡¦¥·¥ã¥Ã¥È¥À¥¦¥E * @else
* @brief Shutdown Manager
* @endif
*/
@@ -186,7 +185,7 @@
shutdownNaming();
shutdownORB();
shutdownManager();
- // 終了待ち合わせ
+ // ½ªÎ»ÂÔ¤Á¹ç¤E»
if (m_runner != NULL)
{
m_runner->wait();
@@ -200,7 +199,7 @@
/*!
* @if jp
- * @brief マネージャ終了処理の待ち合わせ
+ * @brief ¥Þ¥Í¡¼¥¸¥ã½ªÎ»½èÍý¤ÎÂÔ¤Á¹ç¤E»
* @else
* @brief Wait for Manager's termination
* @endif
@@ -224,7 +223,7 @@
/*!
* @if jp
- * @brief 初期化プロシージャのセット
+ * @brief ½é´E½¥×¥úÁ·¡¼¥¸¥ã¤Î¥»¥Ã¥È
* @else
* @brief Set initial procedure
* @endif
@@ -266,11 +265,33 @@
for (int i(0), len(mods.size()); i < len; ++i)
{
- std::string basename(coil::split(mods[i], ".").operator[](0));
- basename += "Init";
+ size_t begin_pos(mods[i].find_first_of('('));
+ size_t end_pos(mods[i].find_first_of(')'));
+ std::string filename, initfunc;
+ if (begin_pos != std::string::npos && end_pos != std::string::npos &&
+ begin_pos < end_pos)
+ {
+ initfunc = mods[i].substr(begin_pos + 1, end_pos - (begin_pos + 1));
+ filename = mods[i].substr(0, begin_pos);
+ coil::eraseBothEndsBlank(initfunc);
+ coil::eraseBothEndsBlank(filename);
+ }
+ else
+ {
+ initfunc = coil::split(mods[i], ".").operator[](0) + "Init";
+ filename = mods[i];
+ }
+ if (filename.find_first_of('.') == std::string::npos)
+ {
+ std::cout << m_config["manager.modules.C++.suffixes"] << std::endl;
+ if (m_config.findNode("manager.modules.C++.suffixes") != 0)
+ {
+ filename += "." + m_config["manager.modules.C++.suffixes"];
+ }
+ }
try
{
- m_module->load(mods[i], basename);
+ m_module->load(mods[i], initfunc);
}
catch (ModuleManager::Error& e)
{
@@ -338,7 +359,7 @@
//============================================================
/*!
* @if jp
- * @brief モジュールのロード
+ * @brief ¥â¥¸¥å¡¼¥EÎ¥ú½¼¥É
* @else
* @brief Load module
* @endif
@@ -368,7 +389,7 @@
/*!
* @if jp
- * @brief モジュールのアンロード
+ * @brief ¥â¥¸¥å¡¼¥EÎ¥¢¥ó¥ú½¼¥É
* @else
* @brief Unload module
* @endif
@@ -382,7 +403,7 @@
/*!
* @if jp
- * @brief 全モジュールのアンロード
+ * @brief Á´¥â¥¸¥å¡¼¥EÎ¥¢¥ó¥ú½¼¥É
* @else
* @brief Unload all modules
* @endif
@@ -396,8 +417,7 @@
/*!
* @if jp
- * @brief ロード済みのモジュールリストを取得する
- * @else
+ * @brief ¥ú½¼¥ÉºÑ¤ß¤Î¥â¥¸¥å¡¼¥EE¹¥È¤ò¼èÆÀ¤¹¤E * @else
* @brief Get a list of loaded modules
* @endif
*/
@@ -409,8 +429,7 @@
/*!
* @if jp
- * @brief ロード可能なモジュールリストを取得する
- * @else
+ * @brief ¥ú½¼¥É²Äǽ¤Ê¥â¥¸¥å¡¼¥EE¹¥È¤ò¼èÆÀ¤¹¤E * @else
* @brief Get a list of loadable modules
* @endif
*/
@@ -425,8 +444,7 @@
//============================================================
/*!
* @if jp
- * @brief RTコンポーネント用ファクトリを登録する
- * @else
+ * @brief RT¥³¥ó¥Ý¡¼¥Í¥ó¥ÈÍÑ¥Õ¥¡¥¯¥È¥ê¤òÅÐÏ¿¤¹¤E * @else
* @brief Register RT-Component Factory
* @endif
*/
@@ -466,8 +484,7 @@
/*!
* @if jp
- * @brief ExecutionContext用ファクトリを登録する
- * @else
+ * @brief ExecutionContextÍÑ¥Õ¥¡¥¯¥È¥ê¤òÅÐÏ¿¤¹¤E * @else
* @brief Register ExecutionContext Factory
* @endif
*/
@@ -494,8 +511,7 @@
/*!
* @if jp
- * @brief ファクトリ全リストを取得する
- * @else
+ * @brief ¥Õ¥¡¥¯¥È¥E´¥E¹¥È¤ò¼èÆÀ¤¹¤E * @else
* @brief Get the list of all Factories
* @endif
*/
@@ -512,8 +528,7 @@
//============================================================
/*!
* @if jp
- * @brief RTコンポーネントを生成する
- * @else
+ * @brief RT¥³¥ó¥Ý¡¼¥Í¥ó¥È¤òÀ¸À®¤¹¤E * @else
* @brief Create RT-Components
* @endif
*/
@@ -625,7 +640,10 @@
for (int i(0); inherit_prop[i][0] != '\0'; ++i)
{
const char* key(inherit_prop[i]);
- prop[key] = m_config[key];
+ if (m_config.findNode(key) != NULL)
+ {
+ prop[key] = m_config[key];
+ }
}
RTObject_impl* comp;
@@ -654,11 +672,15 @@
// Component initialization
if (comp->initialize() != RTC::RTC_OK)
{
- RTC_TRACE(("RTC initialization failed: %s",
+ RTC_TRACE(("RTC initialization failed: %s",
comp_id["implementation_id"].c_str()));
- comp->exit();
- RTC_TRACE(("%s was finalized", comp_id["implementation_id"].c_str()));
- return NULL;
+ RTC_TRACE(("%s was finalized", comp_id["implementation_id"].c_str()));
+ if (comp->exit() != RTC::RTC_OK)
+ {
+ RTC_DEBUG(("%s finalization was failed.",
+ comp_id["implementation_id"].c_str()));
+ }
+ return NULL;
}
RTC_TRACE(("RTC initialization succeeded: %s",
comp_id["implementation_id"].c_str()));
@@ -670,8 +692,7 @@
/*!
* @if jp
- * @brief RTコンポーネントを直接 Manager に登録する
- * @else
+ * @brief RT¥³¥ó¥Ý¡¼¥Í¥ó¥È¤òľÀÜ Manager ¤ËÅÐÏ¿¤¹¤E * @else
* @brief Register RT-Component directly without Factory
* @endif
*/
@@ -693,8 +714,7 @@
/*!
* @if jp
- * @brief RTコンポーネントの登録を解除する
- * @else
+ * @brief RT¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ÎÅÐÏ¿¤ò²ò½E¹¤E * @else
* @brief Unregister RT-Components
* @endif
*/
@@ -704,7 +724,7 @@
// ### NamingManager のみで代用可能
m_compManager.unregisterObject(comp->getInstanceName());
- std::vector<std::string> names(comp->getNamingNames());
+ coil::vstring names(comp->getNamingNames());
for (int i(0), len(names.size()); i < len; ++i)
{
@@ -740,8 +760,7 @@
/*!
* @if jp
- * @brief Manager に登録されているRTコンポーネントを削除する
- * @else
+ * @brief Manager ¤ËÅÐÏ¿¤µ¤EƤ¤¤ET¥³¥ó¥Ý¡¼¥Í¥ó¥È¤òºEE¹¤E * @else
* @brief Unregister RT-Components that have been registered to Manager
* @endif
*/
@@ -795,8 +814,7 @@
/*!
* @if jp
- * @brief Manager に登録されているRTコンポーネントを検索する
- * @else
+ * @brief Manager ¤ËÅÐÏ¿¤µ¤EƤ¤¤ET¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò¸¡º÷¤¹¤E * @else
* @brief Get RT-Component's pointer
* @endif
*/
@@ -808,8 +826,7 @@
/*!
* @if jp
- * @brief Manager に登録されている全RTコンポーネントを取得する
- * @else
+ * @brief Manager ¤ËÅÐÏ¿¤µ¤EƤ¤¤E´RT¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò¼èÆÀ¤¹¤E * @else
* @brief Get all RT-Components registered in the Manager
* @endif
*/
@@ -824,8 +841,7 @@
//============================================================
/*!
* @if jp
- * @brief ORB のポインタを取得する
- * @else
+ * @brief ORB ¤Î¥Ý¥¤¥ó¥¿¤ò¼èÆÀ¤¹¤E * @else
* @brief Get the pointer to the ORB
* @endif
*/
@@ -837,8 +853,7 @@
/*!
* @if jp
- * @brief Manager が持つ RootPOA のポインタを取得する
- * @else
+ * @brief Manager ¤¬»ý¤Ä RootPOA ¤Î¥Ý¥¤¥ó¥¿¤ò¼èÆÀ¤¹¤E * @else
* @brief Get the pointer to the RootPOA
* @endif
*/
@@ -850,8 +865,7 @@
/*!
* @if jp
- * @brief Manager が持つ POAManager を取得する
- * @else
+ * @brief Manager ¤¬»ý¤Ä POAManager ¤ò¼èÆÀ¤¹¤E * @else
* @brief Get the pointer to the POAManager
* @endif
*/
@@ -870,7 +884,7 @@
//============================================================
/*!
* @if jp
- * @brief Manager の内部初期化処理
+ * @brief Manager ¤ÎÆâÉô½é´E½½èÍý
* @else
* @brief Manager internal initialization
* @endif
@@ -969,7 +983,7 @@
//============================================================
/*!
* @if jp
- * @brief System logger の初期化
+ * @brief System logger ¤Î½é´E½
* @else
* @brief System logger initialization
* @endif
@@ -1027,7 +1041,7 @@
RTC_INFO(("%s", m_config["openrtm.version"].c_str()));
- RTC_INFO(("Copyright (C) 2003-2010"));
+ RTC_INFO(("Copyright (C) 2003-2014"));
RTC_INFO((" Noriaki Ando"));
RTC_INFO((" Intelligent Systems Research Institute, AIST"));
RTC_INFO(("Manager starting."));
@@ -1065,7 +1079,7 @@
//============================================================
/*!
* @if jp
- * @brief CORBA ORB の初期化処理
+ * @brief CORBA ORB ¤Î½é´E½½èÍý
* @else
* @brief CORBA ORB initialization
* @endif
@@ -1129,7 +1143,7 @@
/*!
* @if jp
- * @brief ORB のコマンドラインオプション作成
+ * @brief ORB のコマンドラインオプション笹椪
* @else
* @brief ORB command option creation
* @endif
@@ -1312,7 +1326,7 @@
//============================================================
/*!
* @if jp
- * @brief NamingManager の初期化
+ * @brief NamingManager ¤Î½é´E½
* @else
* @brief NamingManager initialization
* @endif
@@ -1384,7 +1398,7 @@
//============================================================
/*!
* @if jp
- * @brief ExecutionContextManager の初期化
+ * @brief ExecutionContextManager ¤Î½é´E½
* @else
* @brief ExecutionContextManager initialization
* @endif
@@ -1415,7 +1429,7 @@
/*!
* @if jp
- * @brief Timer の初期化
+ * @brief Timer ¤Î½é´E½
* @else
* @brief Timer initialization
* @endif
@@ -1516,8 +1530,7 @@
/*!
* @if jp
- * @brief RTコンポーネントの登録解除
- * @else
+ * @brief RT¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ÎÅÐÏ¿²ò½E * @else
* @brief Unregister RT-Components
* @endif
*/
@@ -1549,8 +1562,7 @@
/*!
* @if jp
- * @brief createComponentの引数を処理する
- * @else
+ * @brief createComponent¤Î°ú¿ô¤ò½èÍý¤¹¤E * @else
*
* @endif
*/
@@ -1645,7 +1657,7 @@
/*!
* @if jp
- * @brief RTコンポーネントのコンフィギュレーション処理
+ * @brief RT¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¥³¥ó¥Õ¥£¥®¥å¥E¼¥·¥ç¥ó½èÍý
* @else
*
* @endif
@@ -1659,40 +1671,71 @@
std::string type_conf(category + "." + type_name + ".config_file");
std::string name_conf(category + "." + inst_name + ".config_file");
+ coil::vstring config_fname;
-
coil::Properties type_prop, name_prop;
// Load "category.instance_name.config_file"
if (!m_config[name_conf].empty())
{
- std::ifstream conff(m_config[name_conf].c_str());
- if (!conff.fail())
- {
- name_prop.load(conff);
- }
+ std::ifstream conff(m_config[name_conf].c_str());
+ if (!conff.fail())
+ {
+ name_prop.load(conff);
+ RTC_INFO(("Component instance conf file: %s loaded.",
+ m_config[name_conf].c_str()));
+ RTC_DEBUG_STR((name_prop))
+ config_fname.push_back(m_config[name_conf].c_str());
+ }
}
if (m_config.findNode(category + "." + inst_name) != NULL)
{
- name_prop << m_config.getNode(category + "." + inst_name);
+ coil::Properties& temp(m_config.getNode(category + "." + inst_name));
+ coil::vstring keys(temp.propertyNames());
+ if (!(keys.size() == 1 && keys.back() == "config_file"))
+ {
+ name_prop << m_config.getNode(category + "." + inst_name);
+ RTC_INFO(("Component type conf exists in rtc.conf. Merged."));
+ RTC_DEBUG_STR((name_prop));
+ if (m_config.findNode("config_file") != NULL)
+ {
+ config_fname.push_back(m_config["config_file"]);
+ }
+ }
}
if (!m_config[type_conf].empty())
{
- std::ifstream conff(m_config[type_conf].c_str());
- if (!conff.fail())
- {
- type_prop.load(conff);
- }
+ std::ifstream conff(m_config[type_conf].c_str());
+ if (!conff.fail())
+ {
+ type_prop.load(conff);
+ RTC_INFO(("Component type conf file: %s loaded.",
+ m_config[type_conf].c_str()));
+ RTC_DEBUG_STR((type_prop));
+ config_fname.push_back(m_config[type_conf].c_str());
+ }
}
if (m_config.findNode(category + "." + type_name) != NULL)
{
- type_prop << m_config.getNode(category + "." + type_name);
+ coil::Properties& temp(m_config.getNode(category + "." + type_name));
+ coil::vstring keys(temp.propertyNames());
+ if (!(keys.size() == 1 && keys.back() == "config_file"))
+ {
+ type_prop << m_config.getNode(category + "." + type_name);
+ RTC_INFO(("Component type conf exists in rtc.conf. Merged."));
+ RTC_DEBUG_STR((type_prop));
+ if (m_config.findNode("config_file") != NULL)
+ {
+ config_fname.push_back(m_config["config_file"]);
+ }
+ }
}
-
+
// Merge Properties. type_prop is merged properties
comp->setProperties(prop);
type_prop << name_prop;
+ type_prop["config_file"] = coil::flatten(coil::unique_sv(config_fname));
comp->setProperties(type_prop);
//------------------------------------------------------------
@@ -1716,7 +1759,7 @@
/*!
* @if jp
- * @brief プロパティ情報のマージ
+ * @brief ¥×¥úÁѥƥ£¾ðÊó¤Î¥Þ¡¼¥¸
* @else
* @brief Merge property information
* @endif
@@ -1743,13 +1786,12 @@
/*!
* @if jp
- * @brief NamingServer に登録する際の登録情報を組み立てる
- * @else
+ * @brief NamingServer ¤ËÅÐÏ¿¤¹¤EݤÎÅÐÏ¿¾ðÊó¤òÁȤßΩ¤Æ¤E * @else
* @brief Construct registration information when registering to Naming server
* @endif
*/
std::string Manager::formatString(const char* naming_format,
- coil::Properties& prop)
+ coil::Properties& prop)
{
std::string name(naming_format), str("");
std::string::iterator it, it_end;
@@ -1759,54 +1801,60 @@
it_end = name.end();
for ( ; it != it_end; ++it)
{
- char c(*it);
- if (c == '%')
- {
- ++count;
- if (!(count % 2)) str.push_back((*it));
- }
- else if (c == '$')
- {
- count = 0;
- ++it;
- if (*it == '{' || *it == '(')
- {
- ++it;
- std::string env;
- for ( ; it != it_end && (*it) != '}' && (*it) != ')'; ++it)
- {
- env += *it;
- }
- char* envval = coil::getenv(env.c_str());
- if (envval != NULL) str += envval;
- }
- else
- {
- str.push_back(c);
- }
- }
- else
- {
- if (count > 0 && (count % 2))
- {
- count = 0;
- if (c == 'n') str += prop["instance_name"];
- else if (c == 't') str += prop["type_name"];
- else if (c == 'm') str += prop["type_name"];
- else if (c == 'v') str += prop["version"];
- else if (c == 'V') str += prop["vendor"];
- else if (c == 'c') str += prop["category"];
- else if (c == 'h') str += m_config["os.hostname"];
- else if (c == 'M') str += m_config["manager.name"];
- else if (c == 'p') str += m_config["manager.pid"];
- else str.push_back(c);
- }
- else
- {
- count = 0;
- str.push_back(c);
- }
- }
+ char c(*it);
+ if (c == '%')
+ {
+ ++count;
+ if (!(count % 2)) str.push_back((*it));
+ }
+ else if (c == '$')
+ {
+ count = 0;
+ ++it;
+ if (*it == '{' || *it == '(')
+ {
+ ++it;
+ std::string env;
+ for ( ; it != it_end && (*it) != '}' && (*it) != ')'; ++it)
+ {
+ env += *it;
+ }
+ char* envval = coil::getenv(env.c_str());
+ if (envval != NULL) str += envval;
+ }
+ else
+ {
+ str.push_back(c);
+ }
+ }
+ else
+ {
+ if (count > 0 && (count % 2))
+ {
+ count = 0;
+ if (c == 'n') str += prop["instance_name"];
+ else if (c == 't') str += prop["type_name"];
+ else if (c == 'm') str += prop["type_name"];
+ else if (c == 'v') str += prop["version"];
+ else if (c == 'V') str += prop["vendor"];
+ else if (c == 'c') str += prop["category"];
+ else if (c == 'i') str += prop["implementation_id"];
+ else if (c == 'N')
+ {
+ size_t n = prop["implementation_id"].size();
+ str += prop["instance_name"].substr(n);
+ }
+ else if (c == 'h') str += m_config["os.hostname"];
+ else if (c == 'M') str += m_config["manager.name"];
+ else if (c == 'p') str += m_config["manager.pid"];
+ else str.push_back(c);
+ }
+ else
+ {
+ count = 0;
+ str.push_back(c);
+ }
+ }
}
return str;
}
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -25,6 +25,10 @@
#include <coil/stringutil.h>
#include <rtm/DefaultConfiguration.h>
+#ifdef __QNX__
+using std::sprintf;
+#endif
+
namespace RTC
{
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -27,6 +27,12 @@
#include <rtm/ModuleManager.h>
#include <coil/stringutil.h>
+#ifdef __QNX__
+using std::FILE;
+using std::fgets;
+using std::feof;
+#endif
+
namespace RTC
{
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -25,6 +25,10 @@
#include <iostream>
#include <typeinfo>
+#ifdef __QNX__
+using std::atof;
+#endif
+
namespace RTC
{
/*!
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -213,7 +213,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
vc8proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -248,6 +248,28 @@
--header $(SKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcxproj
+vc11proj: libRTCSkel.vcproj.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type LIB \
+ --vcversion "11.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/idl/libRTCSkel_vc11.vcxproj \
+ --yaml libRTCSkel.vcproj.yaml \
+ --source $(SKEL_CPP) \
+ --header $(SKEL_H)
+ qkc -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc11.vcxproj
+
+vc12proj: libRTCSkel.vcproj.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type LIB \
+ --vcversion "12.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/idl/libRTCSkel_vc12.vcxproj \
+ --yaml libRTCSkel.vcproj.yaml \
+ --source $(SKEL_CPP) \
+ --header $(SKEL_H)
+ qkc -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc12.vcxproj
+
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml 2014-03-29 08:09:18 UTC (rev 2540)
@@ -109,6 +109,110 @@
Value: |
cd "$(OutDir)"
copy libRTCSkeld.lib "$(SolutionDir)\\bin"
+ - Name: "Debug|x64"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "4"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py BasicDataType.idl
+ makewrapper.py DataPort.idl
+ makewrapper.py Manager.idl
+ makewrapper.py OpenRTM.idl
+ makewrapper.py RTC.idl
+ makewrapper.py SDOPackage.idl
+ makewrapper.py ExtendedDataTypes.idl
+ makewrapper.py InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf BasicDataType.idl
+ omniidl -bcxx -Wba -nf DataPort.idl
+ omniidl -bcxx -Wba -nf Manager.idl
+ omniidl -bcxx -Wba -nf OpenRTM.idl
+ omniidl -bcxx -Wba -nf RTC.idl
+ omniidl -bcxx -Wba -nf SDOPackage.idl
+ omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf InterfaceDataTypes.idl

+ VCCLCompilerTool:
+ - Key: Optimization
+ Value: "0"
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;_DEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "3"
+ - Key: RuntimeLibrary
+ Value: "3"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "4"
+ VCLibrarianTool:
+ - Key: OutputFile
+ Value: "$(OutDir)\\libRTCSkeld.lib"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ cd "$(OutDir)"
+ copy libRTCSkeld.lib "$(SolutionDir)\\bin"
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_ConfigurationType: "StaticLibrary"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_CharacterSet: "NotSet"
+ VC10_LinkIncrementalCondition: "true"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py BasicDataType.idl
+ makewrapper.py DataPort.idl
+ makewrapper.py Manager.idl
+ makewrapper.py OpenRTM.idl
+ makewrapper.py RTC.idl
+ makewrapper.py SDOPackage.idl
+ makewrapper.py ExtendedDataTypes.idl
+ makewrapper.py InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf BasicDataType.idl
+ omniidl -bcxx -Wba -nf DataPort.idl
+ omniidl -bcxx -Wba -nf Manager.idl
+ omniidl -bcxx -Wba -nf OpenRTM.idl
+ omniidl -bcxx -Wba -nf RTC.idl
+ omniidl -bcxx -Wba -nf SDOPackage.idl
+ omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf InterfaceDataTypes.idl

+ VC10_VCCLCompilerTool:
+ - Key: Optimization
+ Value: "Disabled"
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;_DEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "EnableFastChecks"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDebugDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "EditAndContinue"
+ VC10_VCLibrarianTool:
+ - Key: OutputFile
+ Value: "$(OutDir)\\libRTCSkeld.lib"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ cd "$(OutDir)"
+ copy libRTCSkeld.lib "$(SolutionDir)\\bin"
- Name: "Release|Win32"
OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
IntermediateDirectory: "$(ConfigurationName)"
@@ -202,3 +306,96 @@
Value: |
cd "$(OutDir)"
copy libRTCSkel.lib "$(SolutionDir)\\bin"
+ - Name: "Release|x64"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "4"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ WholeProgramOptimization: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py BasicDataType.idl
+ makewrapper.py DataPort.idl
+ makewrapper.py Manager.idl
+ makewrapper.py OpenRTM.idl
+ makewrapper.py RTC.idl
+ makewrapper.py SDOPackage.idl
+ makewrapper.py ExtendedDataTypes.idl
+ makewrapper.py InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf BasicDataType.idl
+ omniidl -bcxx -Wba -nf DataPort.idl
+ omniidl -bcxx -Wba -nf Manager.idl
+ omniidl -bcxx -Wba -nf OpenRTM.idl
+ omniidl -bcxx -Wba -nf RTC.idl
+ omniidl -bcxx -Wba -nf SDOPackage.idl
+ omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf InterfaceDataTypes.idl

+ VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "2"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "3"
+ VCLibrarianTool:
+ - Key: OutputFile
+ Value: "$(OutDir)\\libRTCSkel.lib"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ cd "$(OutDir)"
+ copy libRTCSkel.lib "$(SolutionDir)\\bin"
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_ConfigurationType: "StaticLibrary"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_CharacterSet: "NotSet"
+ VC10_LinkIncrementalCondition: "false"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py BasicDataType.idl
+ makewrapper.py DataPort.idl
+ makewrapper.py Manager.idl
+ makewrapper.py OpenRTM.idl
+ makewrapper.py RTC.idl
+ makewrapper.py SDOPackage.idl
+ makewrapper.py ExtendedDataTypes.idl
+ makewrapper.py InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf BasicDataType.idl
+ omniidl -bcxx -Wba -nf DataPort.idl
+ omniidl -bcxx -Wba -nf Manager.idl
+ omniidl -bcxx -Wba -nf OpenRTM.idl
+ omniidl -bcxx -Wba -nf RTC.idl
+ omniidl -bcxx -Wba -nf SDOPackage.idl
+ omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf InterfaceDataTypes.idl

+ VC10_VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDLL"
+ - Key: UsePrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCLibrarianTool:
+ - Key: OutputFile
+ Value: "$(OutDir)\\libRTCSkel.lib"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ cd "$(OutDir)"
+ copy libRTCSkel.lib "$(SolutionDir)\\bin"
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml 2014-03-29 08:09:18 UTC (rev 2540)
@@ -119,6 +119,112 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\RTC$(rtm_dllver)d.lib"
copy "$(OutDir)\\RTC$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
+ - Name: "Debug|x64"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ VCCLCompilerTool:
+ - Key: Optimization
+ Value: "0"
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "3"
+ - Key: RuntimeLibrary
+ Value: "3"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "4"
+ VCPreLinkEventTool:
+ - Key: CommandLine
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(TargetDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_version) RTC$(rtm_dllver)d.def
+ move RTC$(rtm_dllver)d.def ..\
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTCSkeld.lib $(rtm_depend_libd)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver)d.dll"
+ - Key: Version
+ Value: __VERSION__
+ - Key: LinkIncremental
+ Value: "2"
+ - Key: ModuleDefinitionFile
+ Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
+ copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "true"
+ VC10_VCCLCompilerTool:
+ - Key: Optimization
+ Value: "Disabled"
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "EnableFastChecks"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDebugDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "EditAndContinue"
+ VC10_VCPreLinkEventTool:
+ - Key: Command
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(TargetDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_version) RTC$(rtm_dllver)d.def
+ move RTC$(rtm_dllver)d.def ..\
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver)d.dll"
+ - Key: Version
+ Value: __VERSION__
+ - Key: LinkIncremental
+ Value: "true"
+ - Key: ModuleDefinitionFile
+ Value: "RTC$(rtm_dllver)d.def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: TargetMachine
+ Value: "MachineX64"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\RTC$(rtm_dllver)d.lib"
+ copy "$(OutDir)\\RTC$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
#------------------------------------------------------------
# Release Configuration
#------------------------------------------------------------
@@ -221,3 +327,102 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\RTC$(rtm_dllver).lib"
copy "$(OutDir)\\RTC$(rtm_dllver).dll" "$(SolutionDir)bin\\"
+ - Name: "Release|x64"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ WholeProgramOptimization: "0"
+ VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "2"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "3"
+ VCPreLinkEventTool:
+ - Key: CommandLine
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(OutDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib $(TargetName) $(rtm_version) $(TargetName).def
+ move RTC$(rtm_dllver).def ..\\
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTCSkel.lib $(rtm_depend_lib)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver).dll"
+ - Key: LinkIncremental
+ Value: "1"
+ - Key: ModuleDefinitionFile
+ Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "2"
+ - Key: OptimizeReferences
+ Value: "2"
+ - Key: EnableCOMDATFolding
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
+ copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "false"
+ VC10_VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCPreLinkEventTool:
+ - Key: Command
+ Value: |
+ lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
+ set PATH=%PATH%;$(rtm_path)
+ cd "$(OutDir)"
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver) $(rtm_version) RTC$(rtm_dllver).def
+ move RTC$(rtm_dllver).def ..\\
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\RTC$(rtm_dllver).dll"
+ - Key: LinkIncremental
+ Value: "false"
+ - Key: ModuleDefinitionFile
+ Value: "RTC$(rtm_dllver).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: OptimizeReferences
+ Value: "true"
+ - Key: EnableCOMDATFolding
+ Value: "true"
+ - Key: TargetMachine
+ Value: "MachineX64"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\RTC$(rtm_dllver).lib"
+ copy "$(OutDir)\\RTC$(rtm_dllver).dll" "$(SolutionDir)bin\\"
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/tests/RingBuffer/RingBufferTests.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/tests/RingBuffer/RingBufferTests.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/tests/RingBuffer/RingBufferTests.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -49,10 +49,16 @@
#include <string>
#include <sstream>
+#include <unistd.h>
#include <rtm/RingBuffer.h>
//#define DEBUG
+#ifdef __QNX__
+using std::abort;
+using std::perror;
+#endif
+
static const int NLOOP = 0x00000fff; // 読み書きのループ回数
typedef ::RTC::BufferStatus::Enum ReturnCode;
int isBlockTest = false;
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/tests/TestRunner.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/tests/TestRunner.cpp 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/tests/TestRunner.cpp 2014-03-29 08:09:18 UTC (rev 2540)
@@ -36,6 +36,10 @@
#include <cppunit/CompilerOutputter.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
+#ifdef __QNX__
+using std::exit;
+#endif
+
enum FORMAT
{
TEXT_OUT,
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -29,10 +29,10 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
vc8proj: rtcd.yaml
- $(top_builddir)/build/vcprojtool.py vcproj \
+ $(top_builddir)/build/vcprojtool.py vcproj \
--type RTCEXE \
--vcversion "8.00" \
--projectname "rtcd" \
@@ -43,7 +43,7 @@
# qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc8.vcproj
vc9proj: rtcd.yaml
- $(top_builddir)/build/vcprojtool.py vcproj \
+ $(top_builddir)/build/vcprojtool.py vcproj \
--type RTCEXE \
--vcversion "9.00" \
--projectname "rtcd" \
@@ -54,14 +54,34 @@
# qkc -O- -sm $(win32_builddir)/rtm/rtcd_vc9.vcproj
vc10proj: rtcd.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type RTCEXE \
- --vcversion "10.00" \
- --projectname "rtcd" \
- --version $(RTM_VERSION) \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "10.00" \
+ --projectname "rtcd" \
+ --version $(RTM_VERSION) \
--out $(win32_builddir)/utils/rtcd/rtcd_vc10.vcxproj \
- --yaml rtcd.yaml \
+ --yaml rtcd.yaml \
--source $(rtcd_SOURCES)
+
+vc11proj: rtcd.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "11.00" \
+ --projectname "rtcd" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/utils/rtcd/rtcd_vc11.vcxproj \
+ --yaml rtcd.yaml \
+ --source $(rtcd_SOURCES)
+
+vc12proj: rtcd.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "12.00" \
+ --projectname "rtcd" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/utils/rtcd/rtcd_vc12.vcxproj \
+ --yaml rtcd.yaml \
+ --source $(rtcd_SOURCES)
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/rtcd.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/rtcd.yaml 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/rtcd.yaml 2014-03-29 08:09:18 UTC (rev 2540)
@@ -96,6 +96,94 @@
Value: "Console"
- Key: TargetMachine
Value: "MachineX86"
+ - Name: "Debug|x64"
+ OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(ConfigurationName)"
+ IntermediateDirectory: "__PROJECT_NAME__\\$(ConfigurationName)"
+ ConfigurationType: "1"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+ VCCLCompilerTool:
+ - Key: Optimization
+ Value: 0
+ - Key: PreprocessorDefinitions
+ Value: "USE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "3"
+ - Key: RuntimeLibrary
+ Value: "3"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: Detect64BitPortabilityProblems
+ Value: "true"
+ - Key: DebugInformationFormat
+ Value: "4"
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_libd)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "2"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "1"
+ - Key: TargetMachine
+ Value: "1"
+ VC10_OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(Configuration)"
+ VC10_IntermediateDirectory: "__PROJECT_NAME__\\$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "true"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+ VC10_VCCLCompilerTool:
+ - Key: Optimization
+ Value: "Disabled"
+ - Key: PreprocessorDefinitions
+ Value: "USE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "EnableFastChecks"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDebugDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: Detect64BitPortabilityProblems
+ Value: "true"
+ - Key: DebugInformationFormat
+ Value: "EditAndContinue"
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_libd);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "true"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "Console"
+ - Key: TargetMachine
+ Value: "MachineX64"
#------------------------------------------------------------
# Release Configuration
#------------------------------------------------------------
@@ -198,3 +286,102 @@
Value: ""
- Key: TargetMachine
Value: "MachineX86"
+ - Name: "Release|x64"
+ OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(ConfigurationName)"
+ IntermediateDirectory: "__PROJECT_NAME__\\$(ConfigurationName)"
+ ConfigurationType: "1"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ WholeProgramOptimization: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ if NOT EXIST "$(SolutionDir)\\bin" mkdir "$(SolutionDir)\\bin"
+ copy "$(OutDir)\\__PROJECT_NAME__.exe" "$(SolutionDir)\\bin"
+ VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "USE_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "2"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: Detect64BitPortabilityProblems
+ Value: "true"
+ - Key: DebugInformationFormat
+ Value: "3"
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_lib)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "1"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "1"
+ - Key: OptimizeReferences
+ Value: "2"
+ - Key: EnableCOMDATFolding
+ Value: "2"
+ - Key: LinkTimeCodeGeneration
+ Value: "0"
+ - Key: TargetMachine
+ Value: "1"
+ VC10_OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(Configuration)"
+ VC10_IntermediateDirectory: "__PROJECT_NAME__\\$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "false"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ if NOT EXIST "$(SolutionDir)\\bin" mkdir "$(SolutionDir)\\bin"
+ copy "$(OutDir)\\__PROJECT_NAME__.exe" "$(SolutionDir)\\bin"
+ VC10_VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "USE_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: Detect64BitPortabilityProblems
+ Value: "true"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_lib);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "false"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "Console"
+ - Key: OptimizeReferences
+ Value: "true"
+ - Key: EnableCOMDATFolding
+ Value: "true"
+ - Key: LinkTimeCodeGeneration
+ Value: ""
+ - Key: TargetMachine
+ Value: "MachineX64"
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -29,39 +29,59 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
vc8proj: rtcprof.yaml
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type RTCEXE \
- --vcversion "8.00" \
- --projectname "rtcprof" \
- --version $(RTM_VERSION) \
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type RTCEXE \
+ --vcversion "8.00" \
+ --projectname "rtcprof" \
+ --version $(RTM_VERSION) \
--out $(win32_builddir)/utils/rtcprof/rtcprof_vc8.vcproj \
- --yaml rtcprof.yaml \
+ --yaml rtcprof.yaml \
--source $(rtcprof_SOURCES)
# qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc8.vcproj
vc9proj: rtcprof.yaml
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type RTCEXE \
- --vcversion "9.00" \
- --projectname "rtcprof" \
- --version $(RTM_VERSION) \
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type RTCEXE \
+ --vcversion "9.00" \
+ --projectname "rtcprof" \
+ --version $(RTM_VERSION) \
--out $(win32_builddir)/utils/rtcprof/rtcprof_vc9.vcproj \
- --yaml rtcprof.yaml \
+ --yaml rtcprof.yaml \
--source $(rtcprof_SOURCES)
# qkc -O- -sm $(win32_builddir)/rtm/rtcprof_vc9.vcproj
vc10proj: rtcprof.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type RTCEXE \
- --vcversion "10.00" \
- --projectname "rtcprof" \
- --version $(RTM_VERSION) \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "10.00" \
+ --projectname "rtcprof" \
+ --version $(RTM_VERSION) \
--out $(win32_builddir)/utils/rtcprof/rtcprof_vc10.vcxproj \
- --yaml rtcprof.yaml \
+ --yaml rtcprof.yaml \
--source $(rtcprof_SOURCES)
+
+vc11proj: rtcprof.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "11.00" \
+ --projectname "rtcprof" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/utils/rtcprof/rtcprof_vc11.vcxproj \
+ --yaml rtcprof.yaml \
+ --source $(rtcprof_SOURCES)
+
+vc12proj: rtcprof.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "12.00" \
+ --projectname "rtcprof" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/utils/rtcprof/rtcprof_vc12.vcxproj \
+ --yaml rtcprof.yaml \
+ --source $(rtcprof_SOURCES)
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/rtcprof.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/rtcprof.yaml 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/rtcprof.yaml 2014-03-29 08:09:18 UTC (rev 2540)
@@ -96,6 +96,94 @@
Value: "Console"
- Key: TargetMachine
Value: "MachineX86"
+ - Name: "Debug|x64"
+ OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(ConfigurationName)"
+ IntermediateDirectory: "__PROJECT_NAME__\\$(ConfigurationName)"
+ ConfigurationType: "1"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+ VCCLCompilerTool:
+ - Key: Optimization
+ Value: 0
+ - Key: PreprocessorDefinitions
+ Value: "USE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "3"
+ - Key: RuntimeLibrary
+ Value: "3"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: Detect64BitPortabilityProblems
+ Value: "true"
+ - Key: DebugInformationFormat
+ Value: "4"
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_libd)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "2"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "1"
+ - Key: TargetMachine
+ Value: "1"
+ VC10_OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(Configuration)"
+ VC10_IntermediateDirectory: "__PROJECT_NAME__\\$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "true"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+ VC10_VCCLCompilerTool:
+ - Key: Optimization
+ Value: "Disabled"
+ - Key: PreprocessorDefinitions
+ Value: "USE_stub_in_nt_dll;WIN32;_DEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "EnableFastChecks"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDebugDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: Detect64BitPortabilityProblems
+ Value: "true"
+ - Key: DebugInformationFormat
+ Value: "EditAndContinue"
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_libd)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "true"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "Console"
+ - Key: TargetMachine
+ Value: "MachineX64"
#------------------------------------------------------------
# Release Configuration
#------------------------------------------------------------
@@ -198,3 +286,102 @@
Value: ""
- Key: TargetMachine
Value: "MachineX86"
+ - Name: "Release|x64"
+ OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(ConfigurationName)"
+ IntermediateDirectory: "__PROJECT_NAME__\\$(ConfigurationName)"
+ ConfigurationType: "1"
+ InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
+ CharacterSet: "0"
+ WholeProgramOptimization: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ if NOT EXIST "$(SolutionDir)\\bin" mkdir "$(SolutionDir)\\bin"
+ copy "$(OutDir)\\__PROJECT_NAME__.exe" "$(SolutionDir)\\bin"
+ VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "USE_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "2"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: Detect64BitPortabilityProblems
+ Value: "true"
+ - Key: DebugInformationFormat
+ Value: "3"
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_lib)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "1"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "1"
+ - Key: OptimizeReferences
+ Value: "2"
+ - Key: EnableCOMDATFolding
+ Value: "2"
+ - Key: LinkTimeCodeGeneration
+ Value: "0"
+ - Key: TargetMachine
+ Value: "1"
+ VC10_OutputDirectory: "$(ProjectDir)__PROJECT_NAME__\\$(Configuration)"
+ VC10_IntermediateDirectory: "__PROJECT_NAME__\\$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)rtm_config.props"
+ - "$(SolutionDir)rtm_distbuild.props"
+ VC10_LinkIncrementalCondition: "false"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x
+ for %%x in (*.idl) do $(rtm_idlc) $(rtm_idlflags) %%x
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ if NOT EXIST "$(SolutionDir)\\bin" mkdir "$(SolutionDir)\\bin"
+ copy "$(OutDir)\\__PROJECT_NAME__.exe" "$(SolutionDir)\\bin"
+ VC10_VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "USE_stub_in_nt_dll;WIN32;NDEBUG;_CONSOLE;__WIN32__;__x86__;_WIN32_WINNT=0x0400;__NT__;__OSVERSION__=4;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: Detect64BitPortabilityProblems
+ Value: "true"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(rtm_lib);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\__PROJECT_NAME__.exe"
+ - Key: LinkIncremental
+ Value: "false"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "Console"
+ - Key: OptimizeReferences
+ Value: "true"
+ - Key: EnableCOMDATFolding
+ Value: "true"
+ - Key: LinkTimeCodeGeneration
+ Value: ""
+ - Key: TargetMachine
+ Value: "MachineX64"
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -16,14 +16,14 @@
rm -f coil_config.props
-sln: OpenRTM-aist_vc8.sln OpenRTM-aist_vc9.sln OpenRTM-aist_vc10.sln
+sln: OpenRTM-aist_vc8.sln OpenRTM-aist_vc9.sln OpenRTM-aist_vc10.sln OpenRTM-aist_vc11.sln OpenRTM-aist_vc12.sln
OpenRTM-aist_vc8.sln: OpenRTM-aist.sln.dep
$(top_srcdir)/build/slntool.py \
--vcversion VC8 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc8.sln \
- `find ./ -name '*_vc8.vcproj' \! -name 'USB*.vcproj'`
+ `find ./ -name '*_vc8.vcproj' \! -name 'USB*.vcproj' \! -name 'LTT*.vcproj' \! -name 'LogicalTime*.vcproj' \! -name 'FileName*.vcproj'`
qkc -O- -ms OpenRTM-aist_vc8.sln
OpenRTM-aist_vc9.sln:
@@ -31,7 +31,7 @@
--vcversion VC9 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc9.sln \
- `find ./ -name '*_vc9.vcproj' \! -name 'USB*.vcproj'`
+ `find ./ -name '*_vc9.vcproj' \! -name 'USB*.vcproj' \! -name 'LTT*.vcproj' \! -name 'LogicalTime*.vcproj' \! -name 'FileName*.vcproj'`
qkc -O- -ms OpenRTM-aist_vc9.sln
OpenRTM-aist_vc10.sln:
@@ -39,9 +39,25 @@
--vcversion VC10 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc10.sln \
- `find ./ -name '*_vc10.vcxproj' \! -name 'USB*.vcxproj'`
+ `find ./ -name '*_vc10.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
qkc -O- -ms OpenRTM-aist_vc10.sln
+OpenRTM-aist_vc11.sln:
+ $(top_srcdir)/build/slntool.py \
+ --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'`
+ qkc -ms OpenRTM-aist_vc11.sln
+
+OpenRTM-aist_vc12.sln:
+ $(top_srcdir)/build/slntool.py \
+ --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'`
+ qkc -ms OpenRTM-aist_vc12.sln
+
vsprops: coil_distbuild.vsprops coil_config.vsprops coil_distbuild.props coil_config.props
@@ -57,16 +73,43 @@
coil_config.props:
cp -p $(top_srcdir)/src/lib/coil/win32/coil_config.props .
+AUTHORS:
+ cp $(top_srcdir)/AUTHORS .
+ChangeLog:
+ cp $(top_srcdir)/ChangeLog .
+COPYING.LIB:
+ cp $(top_srcdir)/COPYING.LIB .
+COPYRIGHT:
+ cp $(top_srcdir)/COPYRIGHT .
+README:
+ cp $(top_srcdir)/README .
+README.jp:
+ cp $(top_srcdir)/README.jp .
+
+
dist-hook: clean-local sln vsprops
-EXTRA_DIST = \
+EXTRA_DIST = \
OpenRTM-aist.sln.dep \
- RunAtFirst.py \
autobuild_vc8.bat \
autobuild_vc9.bat \
autobuild_vc10.bat \
+ coil_distbuild.vsprops \
+ coil_config.vsprops \
rtm_distbuild.vsprops \
- coil_distbuild.vsprops \
- coil_config.vsprops
+ rtm_config.vsprops \
+ coil_distbuild.props \
+ coil_config.props \
+ rtm_distbuild.props \
+ rtm_config.props \
+ make_package.sh \
+ prepare_openrtm.sh \
+ prepare_openrtm_inst.sh \
+ AUTHORS \
+ ChangeLog \
+ COPYING.LIB \
+ COPYRIGHT \
+ README \
+ README.jp
Deleted: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/RunAtFirst.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/RunAtFirst.py 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/RunAtFirst.py 2014-03-29 08:09:18 UTC (rev 2540)
@@ -1,486 +0,0 @@
-#!/usr/bin/env python
-
-from Tkinter import *
-from tkFont import *
-import tkMessageBox, os.path, string
-import tkSimpleDialog
-import tkCommonDialog
-import time
-import re
-import thread
-import sys
-
-default_searchdir="C:\\Program Files"
-
-property_sheet=os.path.dirname(sys.argv[0]) + "\\OpenRTM-aist.vsprops"
-
-widlist = ["ace_root", "ace_inc", "ace_lib",
- "omni_root", "omni_bin", "omni_inc", "omni_lib"]
-
-jwin_title = "OpenRTM-aist-win32 ƒrƒ‹ƒhŠÂ‹«Ý’è"
-win_title = "OpenRTM-aist-win32 Build Environment Setting"
-
-jexplain = """OpenRTM-aist‚ðƒrƒ‹ƒh‚·‚邽‚ß‚É•K—v‚Ȋ‹«‚ðݒ肵‚Ü‚·B‰º‹L‚Ì€–Ú‚É•K—v‚Èî•ñ‚ð“ü—Í‚µ‚ÄAƒvƒƒpƒeƒBƒV[ƒg¶¬ƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B"""
-
-explain = """Setting up OpenRTM-aist build environment. Please input information to the following forms, and push Generate button to generate property sheet"""
-
-jsearch_expln = """Ž©“®“I‚ÉŒŸõ‚·‚邱‚Æ‚à‚Å‚«‚Ü‚·BŒŸõ‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð“ü—Í‚µ‚ÄuŒŸõvƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B
-ŒŸõ‚É‚Í”•ª‚©‚©‚邱‚Æ‚ª‚ ‚è‚Ü‚·B"""
-search_expln = """Automatic search. Input search directory and push [Search] button.
-It may take a few minutes."""
-
-jsearch_dir = "ŒŸõƒfƒBƒŒƒNƒgƒŠ"
-search_dir = "Search Directory"
-
-jsbutton="ŒŸõ"
-sbutton="Search"
-
-jdirname_error="ƒfƒBƒŒƒNƒgƒŠ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB"
-dirname_error="DIrectory not found."
-
-
-entries = {
- "ace_root" : \
- {"label": "ACE directory",
- "expln": "The ACE_wrapper directory a.k.a ACE_ROOT directory."},
- "ace_inc" : \
- {"label": "ACE include directory",
- "expln": "The directory in which ace/ACE.h exists."},
- "ace_lib" : \
- {"label": "ACE lib directory",
- "expln": "The directory in which ACE.LIB exists."},
- "omni_root": \
- {"label": "omniORB directory",
- "expln": "The omniORB directory in which bin, include, lib dirs exist."},
- "omni_bin" : \
- {"label": "omniORB bin directory",
- "expln": "The directory in which omniidl exists."},
- "omni_inc" : \
- {"label": "omniORB include directory",
- "expln": "The directory in which omniORB4/CORBA.h exists"},
- "omni_lib" : \
- {"label": "omniORB lib directory",
- "expln": "The directory in wihch omniORB407_rt.lib exists."}
- }
-
-jentries = {
- "ace_root" : \
- {"label": "ACEƒfƒBƒŒƒNƒgƒŠ",
- "expln": "’Êí‚ÍACE_wrapperƒfƒBƒŒƒNƒgƒŠ‚̈ʒu‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "ace_inc" : \
- {"label": "ACE include ƒfƒBƒŒƒNƒgƒŠ",
- "expln": "ace/ACE.h‚ª‚ ‚éƒfƒBƒŒƒNƒgƒŠ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "ace_lib" : \
- {"label": "ACE lib ƒfƒBƒŒƒNƒgƒŠ",
- "expln": "ACE.LIB‚ª‚ ‚éꊂðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "omni_root": \
- {"label": "omniORBƒfƒBƒŒƒNƒgƒŠ",
- "expln": "omniORB‚̃fƒBƒŒƒNƒgƒŠ(‰º‚Ébin, include, lib‚ª‚ ‚é)‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "omni_bin" : \
- {"label": "omniORB bin ƒfƒBƒŒƒNƒgƒŠ",
- "expln": "omniidl‚ª‚ ‚éƒfƒBƒŒƒNƒgƒŠ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "omni_inc" : \
- {"label": "omniORB include ƒfƒBƒŒƒNƒgƒŠ",
- "expln": "omniORB4/CORBA.h‚ª‚ ‚éƒfƒBƒŒƒNƒgƒŠ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "omni_lib" : \
- {"label": "omniORB lib ƒfƒBƒŒƒNƒgƒŠ",
- "expln": "omniORB407_rt.lib‚È‚Ç‚ª‚ ‚éƒfƒBƒŒƒNƒgƒŠ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"}
- }
-
-
-jgbutton="¶¬"
-gbutton="Generate"
-
-jgen_label="ƒvƒƒpƒeƒBƒV[ƒg:"
-gen_label="Property Sheet:"
-
-jgen_expln = """OpenRTM-aistƒ\[ƒXƒfƒBƒŒƒNƒgƒŠ‚̉º‚ÉOpenRTM-aist.vsprops‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹–¼‚ŃvƒƒpƒeƒBƒV[ƒg‚𶬂·‚é•K—v‚ª‚ ‚è‚Ü‚·BACE‚âomniORB‚ÌŠeŽíƒpƒX‚¨‚æ‚уvƒƒpƒeƒBƒV[ƒg‚̃fƒBƒŒƒNƒgƒŠ‚ª³‚µ‚¯‚ê‚欃{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B"""
-
-gen_expln = """Property sheet named OpenRTM-aist.vsprops should exist under OpenRTM-aist source directory. Please confirm directories of ACE, omniORB and property sheet and push Generate button."""
-
-prop_sheet = """<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="OpenRTM-aist-0.4"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)\\rtm\idl";"$(ace_include)";"$(omni_include)";.;..\..;..;..\..\.."
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""$(SolutionDir)\\bin";"$(ace_libdir)";"$(omni_libdir)""
- />
- <UserMacro
- Name="ace_root"
- Value="%s"
- />
- <UserMacro
- Name="omni_root"
- Value="%s"
- />
- <UserMacro
- Name="rtm_root"
- Value="$(SolutionDir)"
- />
- <UserMacro
- Name="ace_include"
- Value="%s"
- />
- <UserMacro
- Name="ace_libdir"
- Value="%s"
- />
- <UserMacro
- Name="omni_include"
- Value="%s"
- />
- <UserMacro
- Name="omni_libdir"
- Value="%s"
- />
- <UserMacro
- Name="omni_bin"
- Value="%s"
- />
- <UserMacro
- Name="rtm_includes"
- Value="$(SolutionDir);$(SolutionDir)\\rtm\idl;$(ace_include);$(omni_include);.;..\..\\"
- />
- <UserMacro
- Name="rtm_libdir"
- Value="$(SolutionDir)\\bin;$(ace_libdir);$(omni_libdir);."
- />
- <UserMacro
- Name="rtm_path"
- Value="$(SolutionDir)\\bin;$(SolutionDir)\\build;"$(omni_bin)""
- />
-</VisualStudioPropertySheet>
-"""
-
-jisdir_error = "“¯–¼‚̃fƒBƒŒƒNƒgƒŠ‚ª‘¶Ý‚µ‚Ü‚·B "
-isdir_error = "The Directory of a same name exists. "
-
-jfile_exists = "ƒtƒ@ƒCƒ‹‚ª‘¶Ý‚µ‚Ü‚·Bã‘‚«‚µ‚Ü‚·‚©H "
-file_exists = "The file already exists. Overwrite? "
-
-jfile_gened = "ƒtƒ@ƒCƒ‹‚𶬂µ‚Ü‚µ‚½B"
-file_gened = "File generated."
-
-
-def search(path, fnames, results):
- try:
- flist = os.listdir(path)
- except:
- return
-
- mp = []
- for fn in fnames:
- mp.append(re.compile(fn))
-
- for f in flist:
- fullpath = path + "/" + f
- if os.path.isfile(fullpath):
-# for fname in fnames:
-# if f == fname:
-# results[fname] = fullpath
- i = 0
- for m in mp:
- if m.match(f):
- results[fnames[i]] = fullpath
- i += 1
- elif os.path.isdir(fullpath):
- res = search(fullpath, fnames, results)
- return
-
-
-def j(str, encoding="cp932"):
- return unicode(str, encoding).encode("utf8")
-
-
-
-class App(Frame):
- def init(self):
- self.setlang()
- self.width=512
-
- self.f8 = Font(weight=NORMAL, family="", size=8)
- self.f9 = Font(weight=NORMAL, family="", size=9)
- self.f10 = Font(weight=NORMAL, family="", size=10)
- self.f11 = Font(weight=NORMAL, family="", size=11)
-
- self.master.title(self.win_title)
-
- f = Frame()
-
- # à–¾
- self.expw = Label(f, text=self.explain, font=self.f11, \
- justify=LEFT, wraplength=self.width)
- self.expw.pack(side=TOP, anchor=W, padx=3, pady=3)
-
- self.search_frame(f)
- self.entries_frame(f)
- self.gen_frame(f)
- f.pack(side=TOP, anchor=E, pady=5)
-
- def setlang(self):
- if time.tzname[0].find("“Œ‹ž") or time.tzname[0].find("JST"):
- self.ent = jentries
- self.win_title = j(jwin_title)
- self.explain = j(jexplain)
- self.search_expln = j(jsearch_expln)
- self.search_dir = j(jsearch_dir)
- self.search_button = j(jsbutton)
- self.gen_button = j(jgbutton)
- self.dirname_error=j(jdirname_error)
- self.gen_label = j(jgen_label)
- self.gen_expln = j(jgen_expln)
- self.isdir_error = j(jisdir_error)
- self.file_exists = j(jfile_exists)
- self.file_gened = j(jfile_gened)
- else:
- self.ent = entries
- self.win_title = win_title
- self.explain = explain
- self.search_expln = search_expln
- self.search_dir = search_dir
- self.search_button = sbutton
- self.gen_button = gbutton
- self.dirname_error=dirname_error
- self.gen_label = gen_label
- self.gen_expln = gen_expln
- self.isdir_error = isdir_error
- self.file_exists = file_exists
- self.file_gened = file_gened
-
- def search_frame(self, f):
- frame = Frame(f, relief=Tkinter.GROOVE, bd=2)
- dummyw = Frame(frame, width=self.width)
- dummyw.pack(side=TOP)
- frame.pack(side=TOP)
- # Ž©“®ŒŸõ‚Ìà–¾
- self.search_explnw = Label(frame, text=self.search_expln, \
- wraplength=self.width, justify=LEFT,\
- font=self.f11)
- self.search_explnw.pack(side=TOP, anchor=W, padx=0)
-
- f1 = Frame(frame, width=self.width)
- f1.pack(side=TOP)
-
- self.search_labelw = Label(f1, text=self.search_dir, font=self.f11)
- self.search_labelw.pack(side=LEFT, anchor=W)
- self.search_dirw = Entry(f1, width=40, font=self.f11)
- self.search_dirw.delete(0)
- self.search_dirw.insert(0, default_searchdir)
- self.search_dirw.pack(side=LEFT, anchor=W, padx=5, pady=5)
- self.search_button = Button(f1, text=self.search_button,
- command=self.search, font=self.f10)
- self.search_button.pack(side=LEFT, anchor=W, padx=10, pady=5)
- f1.pack(side=TOP, anchor=W)
-
- def entries_frame(self, f):
- frame = Frame(f, relief=GROOVE, bd=2)
- dummyw = Frame(frame, width=self.width)
- dummyw.pack(side=TOP)
- frame.pack(side=TOP)
- for w in widlist:
- self.ent[w]["wid"] = Label(frame, text=j(self.ent[w]["label"]), \
- font=self.f11, wraplength='10c')
- self.ent[w]["wid"].pack(side=TOP, anchor=W, padx=10)
- self.ent[w]["wid"] = Label(frame, text=j(self.ent[w]["expln"]), \
- font=self.f9, wraplength='10c')
- self.ent[w]["wid"].pack(side=TOP, anchor=W, padx=10)
- self.ent[w]["wid"] = Entry(frame, width=80, font=self.f9)
- self.ent[w]["wid"].pack(side=TOP, anchor=NW, padx=10, pady=5)
-
- def gen_frame(self, f):
- frame = Frame(f, relief=Tkinter.GROOVE, bd=2)
- dummyw = Frame(frame, width=self.width)
- dummyw.pack(side=TOP)
- frame.pack(side=TOP)
-
- self.gen_expw = Label(frame, text=self.gen_expln, \
- wraplength=self.width, justify=LEFT,\
- font=self.f11)
- self.gen_expw.pack(side=TOP, anchor=W, padx=0)
-
- f1 = Frame(frame)
- self.gen_labelw = Label(f1, text=self.gen_label, font=self.f11)
- self.gen_labelw.pack(side=LEFT, anchor=W, padx=3, pady=3)
- self.gen_entryw = Entry(f1, width=40, \
- text="OpenRTM-aist.vsprops", font=self.f11)
- self.gen_entryw.insert(0, property_sheet)
- self.gen_entryw.pack(side=LEFT, anchor=W, padx=5, pady=5)
- self.gbuttonw = Button(f1, text=self.gen_button, font=self.f10,
- command=self.generate)
- self.gbuttonw.pack(side=LEFT, anchor=W, padx=3, pady=3)
- f1.pack(side=TOP, anchor=W)
-
-
- def quit(self):
- self.master.destroy()
-
- def generate(self):
- ace_inc = self.ent["ace_inc"]["wid"].get()
- ace_lib = self.ent["ace_lib"]["wid"].get()
- ace_dirs = [ace_inc, ace_lib]
-
- omni_bin = self.ent["omni_bin"]["wid"].get()
- omni_inc = self.ent["omni_inc"]["wid"].get()
- omni_lib = self.ent["omni_lib"]["wid"].get()
- omni_dirs = [omni_bin, omni_inc, omni_lib]
-
- ace_root, ace_paths = self.common_path(ace_dirs)
- omni_root, omni_paths = self.common_path(omni_dirs)
-
- print ace_paths
- print ace_root
- print ace_inc
- if ace_paths[0] == "/" and ace_paths[1] == "/lib/":
- ace_inc = "$(ace_root)"
- ace_lib = "$(ace_root)/lib"
-
- if omni_paths[0] == "/bin/x86_win32/" and \
- omni_paths[1] == "/include/" and \
- omni_paths[2] == "/lib/x86_win32/" :
- omni_bin = "$(omni_root)/bin/x86_win32"
- omni_inc = "$(omni_root)/include"
- omni_lib = "$(omni_root)/lib/x86_win32"
-
- ace_root = re.sub("/", "\\\\", ace_root)
- omni_root = re.sub("/", "\\\\", omni_root)
- ace_inc = re.sub("/", "\\\\", ace_inc)
- ace_lib = re.sub("/", "\\\\", ace_lib)
- omni_bin = re.sub("/", "\\\\", omni_bin)
- omni_inc = re.sub("/", "\\\\", omni_inc)
- omni_lib = re.sub("/", "\\\\", omni_lib)
-
- fname = self.gen_entryw.get()
-
- if os.path.isdir(fname):
- tkMessageBox.showerror(title=self.isdir_error,
- message=self.isdir_error + fname)
- return
-
- if os.path.isfile(fname):
- if not tkMessageBox.askyesno(title=self.file_exists,
- message=self.file_exists + fname):
- return
-
- f = open(fname, "w")
- f.write(prop_sheet % \
- (ace_root, omni_root, \
- ace_inc, ace_lib, \
- omni_inc, omni_lib, omni_bin))
- f.close()
- tkMessageBox.showinfo(title=self.file_gened,
- message=self.file_gened + fname)
- return
-
- def search(self):
- w = {
- "ACE.h" : ["ace_inc", "ace/ACE.h"],
- "ACE.lib" : ["ace_lib", "ACE.lib"],
- "omniidl.exe" : ["omni_bin", "omniidl.exe"],
- "omniORB.h" : ["omni_inc", "omniORB4/omniORB.h"],
- "omniORB[0-9]+_rt.lib": ["omni_lib", "omniORB[0-9]+_rt.lib"]
- }
- res = {}
- dirname = self.search_dirw.get()
- if os.path.isdir(dirname):
-# th = thread.start_new_thread(search, (dirname, w.keys(), res))
- search(dirname, w.keys(), res)
- else:
- tkMessageBox.showerror(title=self.dirname_error,
- message=self.dirname_error + dirname)
- return
-
- # ŒŸõŒ‹‰Ê‚ðEntry‚ɃZƒbƒg
- for f in w.keys():
- if res.has_key(f):
- l = len(self.ent[w[f][0]]["wid"].get())
- self.ent[w[f][0]]["wid"].delete(0, l)
- t = re.sub(re.compile(w[f][1]), "", res[f])
- self.ent[w[f][0]]["wid"].insert(0, t)
-
- # ŒŸõŒ‹‰Ê‚ðŽæ“¾
- ace_dirs = [
- self.ent["ace_inc"]["wid"].get(),
- self.ent["ace_lib"]["wid"].get()
- ]
-
- omni_dirs = [
- self.ent["omni_bin"]["wid"].get(),
- self.ent["omni_inc"]["wid"].get(),
- self.ent["omni_lib"]["wid"].get()
- ]
-
- # ‹¤’ʃpƒX‚ðŽæ“¾
- ace_root = ""
- if ace_dirs[0] != "" or ace_dirs[1] != "":
- ace_root, ace_paths = self.common_path(ace_dirs)
-
- omni_root = ""
- if omni_dirs[0] != "" or \
- omni_dirs[1] != "" or \
- omni_dirs[2] != "":
- omni_root, omni_paths = self.common_path(omni_dirs)
-
-
- if omni_root != "":
- l = len(self.ent["omni_root"]["wid"].get())
- self.ent["omni_root"]["wid"].delete(0, l)
- self.ent["omni_root"]["wid"].insert(0, omni_root)
-
- # ACE_ROOT, OMNI_ROOT‚ðEntry‚ɃZƒbƒg
- if ace_root != "":
- l = len(self.ent["ace_root"]["wid"].get())
- self.ent["ace_root"]["wid"].delete(0, l)
- self.ent["ace_root"]["wid"].insert(0, ace_root)
-
- return
-
-
- def common_path_len(self, plist):
- for i in range(len(plist[0])): # ƒfƒBƒŒƒNƒgƒŠ–¼‚ð”äŠr
- dirname = plist[0][i]
- for j in range(1, len(plist)):
- if dirname != plist[j][i]:
- return i
- return
-
- def common_path_split(self, paths):
- plist = []
- for p in paths:
- plist.append(p.split("/"))
- return plist
-
- def common_path(self, paths):
- plist = self.common_path_split(paths)
- comlen = self.common_path_len(plist)
-
- compath=""
- for i in range(comlen):
- compath += plist[0][i]
- if i != comlen - 1:
- compath += "/"
-
- diff_paths = [""] * len(paths)
- for i in range(len(paths)):
- diff_paths[i] = ""
- for j in range(comlen, len(plist[i])):
- diff_paths[i] += "/" + plist[i][j]
-
- return compath, diff_paths
-
-
-
- def __init__(self, master=None):
- Frame.__init__(self, master)
- self.pack(); self.init()
-
-
-if __name__ == "__main__": app = App(); app.mainloop()
-# end.
-
Copied: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat (from rev 2531, trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat 2014-03-29 08:09:18 UTC (rev 2540)
@@ -0,0 +1,168 @@
+ at echo off
+ at rem ============================================================
+ at rem OpenRTM-aist for Windows build batch
+ at rem
+ at rem @author Noriaki Ando <n-ando at aist.go.jp>
+ at rem Copyright (C) 2014 n-ando All Rights Reserved
+ at rem
+ at rem In order to compile omniORB on Windows, this batch file can be
+ at rem used with the following prerequisite tools and environments.
+ at rem
+ at rem 0. 64bit Windows 7 or later
+ at rem If you want to compile both 32 bit and 64 bit binaries on one OS,
+ at rem 64 bit OS is required. Because the omniidl which is built as
+ at rem target architecture executable in midstream is required to
+ at rem compile omniORB itself. OS have to execute both (32 bit /64 bit)
+ at rem executable.
+ at rem
+ at rem 1. Cygwin
+ at rem cygwin-lite distributed from omniORB is not recommended.
+ at rem The following command should be installed on Cygwin
+ at rem wget, make, zip, svn
+ at rem
+ at rem 2. Visual C++
+ at rem Currently VC2008, 2010, 2012, 2013 are supported.
+ at rem Different versions in the same machine are not recommended.
+ at rem
+ at rem Environment vairables required
+ at rem
+ at rem OMNIORB_SRC: URL to download omniORB source code tar-ball
+ at rem ARCH: x86 or x86_64
+ at rem VC_VERSION: 9(=VC2008), 10(=VC2010), 11(=VC2012), 12(=VC2013),....
+ at rem PYTHON_DIR: /cygdrive/c/Python27
+ at rem
+ at rem ============================================================
+
+set PATH=%PATH%;C:\cygwin\bin;C:\cygwin64\bin
+set RTM_ROOT=%~dp0
+set COIL_ROOT=%RTM_ROOT%\coil
+set OMNI_ROOT=%RTM_ROOT%\omniORB
+set VC_VERSION=10
+set ARCH=x86
+set PATH=%OMNI_ROOT%\bin\x86_win32;%PATH%
+
+if %ARCH% == x86 set DLL_ARCH=
+if %ARCH% == x86_64 set DLL_ARCH=_x64
+
+set COIL_DLLVER=111_vc%VC_VERSION%%DLL_ARCH%
+set COIL_VERSION=1.1.1
+set COIL_SHORTVER=1.1
+
+set RTM_DLLVER=111_vc%VC_VERSION%%DLL_ARCH%
+set RTM_VERSION=1.1.1
+set RTM_SHORTVER=1.1
+
+set OMNI_DLLVER=417
+set OMNI_VERSION=4.1.7
+set OMNI_SHORTVER=4.1
+set OMNITHREAD_DLLVER=34
+set OMNITHREAD_VERSION=3.4
+
+ at rem ------------------------------------------------------------
+ at rem Printing env variables
+echo Environment variables:
+echo ARCH : %ARCH%
+echo VC_VERSION : %VC_VERSION%
+echo PYTHON_DIR : %PYTHON_DIR%
+
+ at rem ============================================================
+ at rem switching to x86 or x86_64
+ at rem ============================================================
+echo ARCH %ARCH%
+if %ARCH% == x86 goto x86
+if %ARCH% == x86_64 goto x86_64
+goto end
+
+
+ at rem ============================================================
+ at rem Compiling 32bit binaries
+ at rem ============================================================
+:x86
+echo Compiling 32bit binaries
+echo Setting up Visual C++ environment.
+if %VC_VERSION% == 9 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
+ goto VCBUILDx86
+ )
+if %VC_VERSION% == 10 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat%" x86
+ goto MSBUILDx86
+ )
+if %VC_VERSION% == 11 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
+ goto MSBUILDx86
+ )
+if %VC_VERSION% == 12 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
+ goto MSBUILDx86
+ )
+
+ at rem ------------------------------------------------------------
+ at rem Build (VC2008 x86)
+ at rem ------------------------------------------------------------
+:VCBUILDx86
+echo Visual Studio Dir: %VSINSTALLDIR%
+echo LIB: %LIB%
+vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln
+goto END
+
+ at rem ------------------------------------------------------------
+ at rem Build (VC2010- x86)
+ at rem ------------------------------------------------------------
+:MSBUILDx86
+echo Visual Studio Dir: %VSINSTALLDIR%
+echo LIB: %LIB%
+ at rem msbuild /M:2 /t:clean /p:configuration=debug /p:platform=Win32 OpenRTM-aist_vc%VC_VERSION%.sln
+ at rem msbuild /M:2 /t:clean /p:configuration=release /p:platform=Win32 OpenRTM-aist_vc%VC_VERSION%.sln
+ at rem msbuild /M:2 /t:rebuild /p:configuration=debug /p:platform=Win32 OpenRTM-aist_vc%VC_VERSION%.sln
+msbuild /M:2 /t:rebuild /p:configuration=release /p:platform=Win32 OpenRTM-aist_vc%VC_VERSION%.sln
+goto END
+
+ at rem ============================================================
+ at rem Compiling 64bit binaries
+ at rem ============================================================
+:x86_64
+echo Compiling 64bit binaries
+ at rem Setting up Visual C++ environment
+if /i %VC_VERSION% == 9 (
+ echo 64bit compilation on Visual C++ 2008 is not supported. Aborting.
+ goto END
+ )
+if /i %VC_VERSION% == 10 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
+ goto MSBUILDx64
+ )
+if /i %VC_VERSION% == 11 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" amd64
+ goto MSBUILDx64
+ )
+if /i %VC_VERSION% == 12 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
+ goto MSBUILDx64
+ )
+echo Visual Studio Dir: %VSINSTALLDIR%
+echo LIB: %LIB%
+
+ at rem ------------------------------------------------------------
+ at rem Build (VC2008 x64)
+ at rem ------------------------------------------------------------
+:VCBUILDx64
+echo Visual Studio Dir: %VSINSTALLDIR%
+echo LIB: %LIB%
+vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln
+goto END
+
+ at rem ------------------------------------------------------------
+ at rem Build (VC2010- x64)
+ at rem ------------------------------------------------------------
+:MSBUILDx64
+echo Visual Studio Dir: %VSINSTALLDIR%
+echo LIB: %LIB%
+msbuild /M:4 /t:clean /fileLogger /flp:logfile=debug.log /v:diag /p:configuration=debug /p:platform=x64 OpenRTM-aist_vc%VC_VERSION%.sln
+msbuild /M:4 /t:clean /fileLogger /flp:logfile=release.log /v:diag /p:configuration=release /p:platform=x64 OpenRTM-aist_vc%VC_VERSION%.sln
+
+ at rem msbuild /M:4 /t:rebuild /fileLogger /flp:logfile=debug.log /v:diag /p:configuration=debug /p:platform=x64 OpenRTM-aist_vc%VC_VERSION%.sln
+ at rem msbuild /M:4 /t:rebuild /fileLogger /flp:logfile=release.log /v:diag /p:configuration=release /p:platform=x64 OpenRTM-aist_vc%VC_VERSION%.sln
+goto END
+
+:END
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am 2014-03-29 08:09:18 UTC (rev 2540)
@@ -16,10 +16,6 @@
dist-hook: clean-local rtc.conf.sample wxs
-EXTRA_DIST = \
+EXTRA_DIST = \
rtc.conf.sample \
- etc.yaml \
- rtm_config_omni407.vsprops \
- rtm_config_omni412.vsprops \
- rtm_config_omni414.vsprops \
- rtm_config_omni414.props
+ etc.yaml
Deleted: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni407.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni407.vsprops 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni407.vsprops 2014-03-29 08:09:18 UTC (rev 2540)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="OpenRTM-aist-1.0"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(ace_includes);$(omni_includes);$(rtm_includes)"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(ace_libdir);$(omni_libdir);$(rtm_libdir)"
- />
- <UserMacro
- Name="ace_root"
- Value="%ACE_ROOT%"
- />
- <UserMacro
- Name="omni_root"
- Value="%OMNI_ROOT%"
- />
- <UserMacro
- Name="omni_dllver"
- Value="407"
- />
- <UserMacro
- Name="omnithread_dllver"
- Value="32"
- />
- <UserMacro
- Name="rtm_root"
- Value="%RTM_ROOT%"
- />
- <UserMacro
- Name="coil_dllver"
- Value="100"
- />
- <UserMacro
- Name="coil_version"
- Value="1.0.0"
- />
- <!-- ACE macros -->
- <UserMacro
- Name="ace_includes"
- Value=""$(ace_root)""
- />
- <UserMacro
- Name="ace_libdir"
- Value="$(ace_root)\lib"
- />
- <!-- omniORB macros -->
- <UserMacro
- Name="omni_includes"
- Value=""$(omni_root)\include""
- />
- <UserMacro
- Name="omni_libdir"
- Value=""$(omni_root)\lib\x86_win32""
- />
- <UserMacro
- Name="omni_bin"
- Value=""$(omni_root)\bin\x86_win32""
- />
- <UserMacro
- Name="omni_lib"
- Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
- />
- <UserMacro
- Name="omni_libd"
- Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
- />
- <!-- OpenRTM-aist macros -->
- <UserMacro
- Name="rtm_includes"
- Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
- />
- <UserMacro
- Name="rtm_libdir"
- Value=""$(rtm_root)\bin""
- />
- <UserMacro
- Name="rtm_bin"
- Value=""$(rtm_root)\bin";"$(rtm_root)\build""
- />
- <UserMacro
- Name="rtm_path"
- Value="$(rtm_bin);$(omni_bin)"
- />
- <UserMacro
- Name="rtm_libd"
- Value="ACEd.lib RTC$(rtm_dllver)d.lib $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
- />
- <UserMacro
- Name="rtm_lib"
- Value="ACE.lib RTC$(rtm_dllver).lib $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
- />
- <UserMacro
- Name="rtm_idlc"
- Value="omniidl"
- />
- <UserMacro
- Name="rtm_idlflags"
- Value="-bcxx -Wba -nf"
- />
-</VisualStudioPropertySheet>
Deleted: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni412.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni412.vsprops 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni412.vsprops 2014-03-29 08:09:18 UTC (rev 2540)
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="OpenRTM-aist-1.0"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(ace_includes);$(omni_includes);$(rtm_includes)"
- PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(ace_libdir);$(omni_libdir);$(rtm_libdir)"
- />
- <UserMacro
- Name="ace_root"
- Value="%ACE_ROOT%"
- />
- <UserMacro
- Name="omni_root"
- Value="%OMNI_ROOT%"
- />
- <UserMacro
- Name="omni_dllver"
- Value="412"
- />
- <UserMacro
- Name="omnithread_dllver"
- Value="33"
- />
- <UserMacro
- Name="rtm_root"
- Value="%RTM_ROOT%"
- />
- <UserMacro
- Name="coil_dllver"
- Value="100"
- />
- <UserMacro
- Name="coil_version"
- Value="1.0.0"
- />
- <!-- ACE macros -->
- <UserMacro
- Name="ace_includes"
- Value=""$(ace_root)""
- />
- <UserMacro
- Name="ace_libdir"
- Value="$(ace_root)\lib"
- />
- <!-- omniORB macros -->
- <UserMacro
- Name="omni_includes"
- Value=""$(omni_root)\include""
- />
- <UserMacro
- Name="omni_libdir"
- Value=""$(omni_root)\lib\x86_win32""
- />
- <UserMacro
- Name="omni_bin"
- Value=""$(omni_root)\bin\x86_win32""
- />
- <UserMacro
- Name="omni_lib"
- Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
- />
- <UserMacro
- Name="omni_libd"
- Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
- />
- <!-- OpenRTM-aist macros -->
- <UserMacro
- Name="rtm_includes"
- Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
- />
- <UserMacro
- Name="rtm_libdir"
- Value=""$(rtm_root)\bin""
- />
- <UserMacro
- Name="rtm_bin"
- Value=""$(rtm_root)\bin";"$(rtm_root)\build""
- />
- <UserMacro
- Name="rtm_path"
- Value="$(rtm_bin);$(omni_bin)"
- />
- <UserMacro
- Name="rtm_libd"
- Value="ACEd.lib RTC$(rtm_dllver)d.lib $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
- />
- <UserMacro
- Name="rtm_lib"
- Value="ACE.lib RTC$(rtm_dllver).lib $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
- />
- <UserMacro
- Name="rtm_idlc"
- Value="omniidl"
- />
- <UserMacro
- Name="rtm_idlflags"
- Value="-bcxx -Wba -nf"
- />
-</VisualStudioPropertySheet>
Deleted: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props 2014-03-29 08:09:18 UTC (rev 2540)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Label="UserMacros">
- <omni_dllver>415</omni_dllver>
- <omnithread_dllver>34</omnithread_dllver>
- <rtm_dllver>110</rtm_dllver>
- <rtm_version>1.1.0</rtm_version>
- <coil_dllver>110</coil_dllver>
- <coil_lib>coil$(coil_dllver).lib</coil_lib>
- <coil_libd>coil$(coil_dllver)d.lib</coil_libd>
- <omni_includes>$(omni_root)\include</omni_includes>
- <omni_libdir>$(omni_root)\lib\x86_win32</omni_libdir>
- <omni_bin>$(omni_root)\bin\x86_win32</omni_bin>
- <omni_lib>omniORB$(omni_dllver)_rt.lib;omniDynamic$(omni_dllver)_rt.lib;omnithread$(omnithread_dllver)_rt.lib</omni_lib>
- <omni_libd>omniORB$(omni_dllver)_rtd.lib;omniDynamic$(omni_dllver)_rtd.lib;omnithread$(omnithread_dllver)_rtd.lib</omni_libd>
- <rtm_includes>$(rtm_root);$(rtm_root)\rtm\idl</rtm_includes>
- <rtm_libdir>$(rtm_root)\bin</rtm_libdir>
- <rtm_bin>$(rtm_root)\bin;$(rtm_root)\build</rtm_bin>
- <rtm_path>$(rtm_bin);$(omni_bin)</rtm_path>
- <rtm_libd>RTC$(rtm_dllver)d.lib;$(coil_libd);$(omni_libd);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_libd)</rtm_libd>
- <rtm_lib>RTC$(rtm_dllver).lib;$(coil_lib);$(omni_lib);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_lib)</rtm_lib>
- <rtm_idlc>omniidl</rtm_idlc>
- <rtm_idlflags>-bcxx -Wba -nf -I $(SolutionDir)\rtm\idl</rtm_idlflags>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <_PropertySheetDisplayName>OpenRTM-aist-1.0</_PropertySheetDisplayName>
- </PropertyGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <AdditionalIncludeDirectories>$(omni_includes);$(rtm_includes);.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <Link>
- <AdditionalLibraryDirectories>$(omni_libdir);$(rtm_libdir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <BuildMacro Include="omni_root">
- <Value>$(omni_root)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_dllver">
- <Value>$(omni_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="omnithread_dllver">
- <Value>$(omnithread_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_root">
- <Value>$(rtm_root)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_dllver">
- <Value>$(rtm_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_version">
- <Value>$(rtm_version)</Value>
- </BuildMacro>
- <BuildMacro Include="coil_dllver">
- <Value>$(coil_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_includes">
- <Value>$(omni_includes)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_libdir">
- <Value>$(omni_libdir)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_bin">
- <Value>$(omni_bin)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_lib">
- <Value>$(omni_lib)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_libd">
- <Value>$(omni_libd)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_includes">
- <Value>$(rtm_includes)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_libdir">
- <Value>$(rtm_libdir)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_bin">
- <Value>$(rtm_bin)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_path">
- <Value>$(rtm_path)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_libd">
- <Value>$(rtm_libd)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_lib">
- <Value>$(rtm_lib)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_idlc">
- <Value>$(rtm_idlc)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_idlflags">
- <Value>$(rtm_idlflags)</Value>
- </BuildMacro>
- <BuildMacro Include="coil_lib">
- <Value>$(coil_lib)</Value>
- </BuildMacro>
- <BuildMacro Include="coil_libd">
- <Value>$(coil_libd)</Value>
- </BuildMacro>
- </ItemGroup>
-</Project>
Deleted: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops 2014-03-29 08:09:18 UTC (rev 2540)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="OpenRTM-aist-1.1"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes);."
- PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
- />
- <UserMacro
- Name="omni_root"
- Value="%OMNI_ROOT%"
- />
- <UserMacro
- Name="omni_dllver"
- Value="415"
- />
- <UserMacro
- Name="omnithread_dllver"
- Value="34"
- />
- <UserMacro
- Name="rtm_root"
- Value="%RTM_ROOT%"
- />
- <UserMacro
- Name="rtm_dllver"
- Value="110"
- />
- <UserMacro
- Name="rtm_version"
- Value="1.1.0"
- />
- <UserMacro
- Name="coil_dllver"
- Value="110"
- />
- <!-- omniORB macros -->
- <UserMacro
- Name="omni_includes"
- Value=""$(omni_root)\include""
- />
- <UserMacro
- Name="omni_libdir"
- Value=""$(omni_root)\lib\x86_win32""
- />
- <UserMacro
- Name="omni_bin"
- Value=""$(omni_root)\bin\x86_win32""
- />
- <UserMacro
- Name="omni_lib"
- Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
- />
- <UserMacro
- Name="omni_libd"
- Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
- />
- <!-- OpenRTM-aist macros -->
- <UserMacro
- Name="rtm_includes"
- Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
- />
- <UserMacro
- Name="rtm_libdir"
- Value=""$(rtm_root)\bin""
- />
- <UserMacro
- Name="rtm_bin"
- Value=""$(rtm_root)\bin";"$(rtm_root)\build""
- />
- <UserMacro
- Name="rtm_path"
- Value="$(rtm_bin);$(omni_bin)"
- />
- <UserMacro
- Name="rtm_libd"
- Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
- />
- <UserMacro
- Name="rtm_lib"
- Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
- />
- <UserMacro
- Name="rtm_idlc"
- Value="omniidl"
- />
- <UserMacro
- Name="rtm_idlflags"
- Value="-bcxx -Wba -nf -I"$(SolutionDir)\rtm\idl""
- />
- <!-- coil macros -->
- <UserMacro
- Name="coil_lib"
- Value="coil$(coil_dllver).lib"
- />
- <UserMacro
- Name="coil_libd"
- Value="coil$(coil_dllver)d.lib"
- />
-
-</VisualStudioPropertySheet>
Copied: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/make_package.sh (from rev 2539, trunk/OpenRTM-aist/win32/OpenRTM-aist/make_package.sh)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/make_package.sh (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/make_package.sh 2014-03-29 08:09:18 UTC (rev 2540)
@@ -0,0 +1,88 @@
+#!/bin/sh
+#
+# @brief Archiving OpenRTM-aist Windows binaries in to a ZIP file
+# @author Noriaki Ando <n-ando at aist.go.jp>
+# Copyright 2014 (C) All Right Reserved
+#
+# This is part of OpenRTM-aist build scripts suite
+# for building OpenRTM-aist for Windows binaries.
+#
+# The following environment variables should be set.
+# ex.
+export OPENRTM_DIR=OpenRTM-aist
+export PYTHON_DIR=/cygdrive/c/Python27
+export VC_VERSION=10
+export ARCH=x86
+export PATH=${PATH}:/bin:/usr/bin
+#
+#==============================
+# main
+if test "x$OPENRTM_DIR" = "x" ; then
+ echo "OPENRTM_DIR not defined"
+ exit -1
+fi
+
+/usr/bin/find ./$OPENRTM_DIR -type d -exec chmod 755 {} \;
+/usr/bin/find ./$OPENRTM_DIR -type f -exec chmod 644 {} \;
+
+
+echo "Current dir: " `pwd`
+echo "OPENRTM_DIR: " ${OPENRTM_DIR}
+echo "Removing auto generated temp files."
+/usr/bin/find ./$OPENRTM_DIR -name '*.pyc' -type f -exec rm {} \;
+/usr/bin/find ./$OPENRTM_DIR -name '*.sdf' -type f -exec rm {} \;
+/usr/bin/find ./$OPENRTM_DIR -name '*.suo' -type f -exec rm {} \;
+/usr/bin/find ./$OPENRTM_DIR -name '*.yaml' -type f -exec rm {} \;
+/usr/bin/find ./$OPENRTM_DIR -name 'Makefile' -type f -exec rm {} \;
+/usr/bin/find ./$OPENRTM_DIR -name 'Makefile.in' -type f -exec rm {} \;
+/usr/bin/find ./$OPENRTM_DIR -name 'Makefile.am' -type f -exec rm {} \;
+dirs="rtm examples utils"
+dirs=""
+for d in $dirs ; do
+ /usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.obj' -type f -exec rm {} \;
+ /usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.pdb' -type f -exec rm {} \;
+ /usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.tlog' -type f -exec rm {} \;
+ /usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.dll' -type f -exec rm {} \;
+ /usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.lib' -type f -exec rm {} \;
+ /usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.exp' -type f -exec rm {} \;
+ /usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.def' -type f -exec rm {} \;
+ /usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.res' -type f -exec rm {} \;
+ /usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.rc' -type f -exec rm {} \;
+ /usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.exe' -type f -exec rm {} \;
+ /usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.user' -type f -exec rm {} \;
+done
+
+echo "done"
+
+if test "x$ARCH" = "xx86" ; then
+ WIN_ARCH=win32
+elif test "x$ARCH" = "xx86_64" ; then
+ WIN_ARCH=win64
+else
+ echo "Unknown architecture: " $ARCH
+ exit -1
+fi
+
+if test "x$PYTHON_DIR" = "x" ; then
+ echo "PYTHON_DIR is not defined. "
+ exit -1
+else
+ PY_VER=`echo $PYTHON_DIR | sed 's/.*[Pp][Yy][Tt][Hh][Oo][Nn]\([0-9][0-9]\).*/\1/'`
+fi
+
+NEW_DIR=${OPENRTM_DIR}-${WIN_ARCH}-vc${VC_VERSION}
+ZIP_FILE=${OPENRTM_DIR}-${WIN_ARCH}-vc${VC_VERSION}.zip
+
+echo "NEW_DIR: " ${NEW_DIR}
+echo "OPENRTM_DIR: " ${OPENRTM_DIR}
+echo "ZIP_FILE: " ${ZIP_FILE}
+
+rm -rf ${NEW_DIR}
+cp -r ${OPENRTM_DIR} ${NEW_DIR}
+
+rm -rf ${ZIP_FILE}
+zip -r ${ZIP_FILE} ${NEW_DIR}
+rm -rf ${NEW_DIR}
+
+# end of script
+#==============================
\ No newline at end of file
Copied: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh (from rev 2539, trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh 2014-03-29 08:09:18 UTC (rev 2540)
@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+# @brief Preparing OpenRTM-aist build environment on Windows
+# @author Noriaki Ando <n-ando at aist.go.jp>
+# Copyright 2014 (C) All Right Reserved
+#
+# This is part of build.bat omniORB build batch file
+# for building omniORB for Windows binaries.
+#
+# The following environment variables should be set.
+#
+export OMNI_VERSION=4.1.7
+export OMNITH_VER=3.4
+export PYTHON_DIR=/cygdrive/c/Python27
+export VC_VERSION=10
+export ARCH=x86
+#
+export PATH=/cygdrive/c/cygwin64/bin:$PATH
+echo `pwd`
+
+check_env()
+{
+
+ if test "x$ARCH" = "xx86" ;then
+ WIN_ARCH="win32"
+ elif test "x$ARCH" = "xx86_64" ;then
+ WIN_ARCH="win64"
+ else
+ echo "ARCH not defined"
+ exit -1
+ fi
+ if test "x$VC_VERSION" = "x" ; then
+ echo "VC_VERSION not defined."
+ exit -1
+ fi
+ if test "x$OMNI_VERSION" = "x" ; then
+ echo "OMNI_VERSION not defined."
+ exit -1
+ else
+ OMNI_SHORT_VER=`echo $OMNI_VERSION | sed 's/\.//g'`
+ fi
+ if test "x$OMNITH_VER" = "x" ; then
+ echo "OMNITH_VER not defined."
+ exit -1
+ else
+ OMNITH_SHORT_VER=`echo $OMNITH_VER | sed 's/\.//g'`
+ fi
+ if test "xPYTHON_DIR" = "x" ; then
+ echo "PYTHON_DIR not defined."
+ exit -1
+ else
+ PY_VERSION=`echo ${PYTHON_DIR} | sed 's/.*ython\([0-9][0-9]\).*/\1/'`
+ fi
+ base_url="http://openrtm.org/pub/omniORB/win32/omniORB-${OMNI_VERSION}/"
+
+ OMNIORB_ZIP=omniORB-${OMNI_VERSION}-${WIN_ARCH}-vc${VC_VERSION}-py${PY_VERSION}.zip
+ OMNIORB_URL=${base_url}/${OMNIORB_ZIP}
+}
+
+unpack_omnibin()
+{
+ omnidir=`find ./ -maxdepth 1 -name 'omniORB*' -type d`
+ if test -d $omnidir ; then
+ rm -rf $omnidir
+ fi
+ # getting omniORB-4.1.7.tar.bz2
+ if test ! -f $OMNIORB_ZIP ; then
+ wget $OMNIORB_URL
+ fi
+ unzip $OMNIORB_ZIP
+}
+
+rename_omnidir()
+{
+ omnidir=`find ./ -maxdepth 1 -name 'omniORB*' -type d`
+ mv ${omnidir} omniORB
+}
+check_env
+unpack_omnibin
+rename_omnidir
+
+# end of ecript
+#==============================
Copied: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh (from rev 2539, trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh 2014-03-29 08:09:18 UTC (rev 2540)
@@ -0,0 +1,214 @@
+#!/bin/sh
+#
+# @brief Preparing omniORB WiX merge module build environment
+# @author Noriaki Ando <n-ando at aist.go.jp>
+# Copyright 2014 (C) All Right Reserved
+#
+# This script copy the following omniORB files to specific directories
+# runtime: DLL and EXE for runtime environemnt
+# --> omniORB_runtime
+# devel : headers, omniidl and backends python scripts and others
+# --> omniORB_devel
+#
+# OpenRTM_runtime
+# + <version>
+# + bin
+# + etc
+# + ext
+# + sdo
+#
+# OpenRTM_devel
+# + <version>
+# + cmake
+# + coil
+# + lib
+# + rtm
+# + idl
+# + utils
+# + rtc-template
+#
+# OpenRTM_examples
+# + <version>
+# + examples
+# + C++
+#
+# OpenRTM_doc
+# + <version>
+# + doc
+#
+
+export PATH=/cygdrive/c/cygwin64/bin:$PATH
+echo `pwd`
+VERSION=""
+#ARCH=""
+#VC_VERSION=""
+
+script_name=$(basename $0)
+
+usage()
+{
+ echo <<EOF
+ $script_name <filename or URL>
+
+Local file mode:
+ $script_name OpenRTM-bin.zip
+
+Download mode
+ $script_name http://<OpenRTM bin URL>/OpenRTM-X.Y.Z-winXX-vcX.zip
+
+EOF
+}
+
+download_openrtm_binpkg()
+{
+ wget $DOWNLOAD_URL
+}
+
+find_openrtm_binpkg()
+{
+ VERSION=`echo $LOCAL_FILE | sed 's/OpenRTM-aist-\([0-9\.]*\)-.*.zip/\1/'`
+ ARCH=`echo $LOCAL_FILE | sed 's/OpenRTM-.*-win\([0-9]*\)-.*.zip/\1/'`
+ VC_VERSION=`echo $LOCAL_FILE | sed 's/OpenRTM.*-vc\([0-9]*\).*.zip/\1/'`
+ OPENRTM_PKG=$LOCAL_FILE
+ echo "VERSION: " $VERSION
+ RUNTIME_DIR=OpenRTM_runtime/${VERSION}_vc$VC_VERSION
+ DEVEL_DIR=OpenRTM_devel/${VERSION}_vc$VC_VERSION
+ EXAMPLE_DIR=OpenRTM_example/${VERSION}_vc$VC_VERSION
+ DOC_DIR=OpenRTM_doc/${VERSION}_vc$VC_VERSION
+}
+
+extract_package()
+{
+ find -maxdepth 1 -type d -name 'OpenRTM-*' -exec rm -rf {} \;
+ unzip -x $OPENRTM_PKG
+ OPENRTM_DIR=`find -maxdepth 1 -type d -name 'OpenRTM-*'`
+}
+
+cleanup_dirs()
+{
+ OPENRTM_DIR=`find -maxdepth 1 -type d -name 'OpenRTM-*'`
+ rm -rf OpenRTM_runtime
+ rm -rf OpenRTM_examples
+ rm -rf OpenRTM_devel
+ rm -rf OpenRTM_doc
+}
+
+create_dirs()
+{
+ mkdir -p $RUNTIME_DIR/{bin,etc,ext/sdo}
+ mkdir -p $EXAMPLE_DIR//examples/C++
+ mkdir -p $DEVEL_DIR/{cmake,coil,lib,rtm/idl,utils/rtc-template}
+ mkdir -p $DOC_DIR/doc/C++
+ find . -type d -exec chmod 755 {} \;
+ find . -type f -exec chmod 644 {} \;
+}
+
+copy_runtime_files()
+{
+ if test "x$OPENRTM_DIR" = "x" ; then
+ echo "Variable OPENRTM_DIR is not set. Aborting"
+ exit -1
+ fi
+ cp $OPENRTM_DIR/AUTHORS $RUNTIME_DIR/
+ cp $OPENRTM_DIR/ChangeLog $RUNTIME_DIR/
+ cp $OPENRTM_DIR/COPYING.LIB $RUNTIME_DIR/
+ cp $OPENRTM_DIR/COPYRIGHT $RUNTIME_DIR/
+ cp $OPENRTM_DIR/INSTALL.jp $RUNTIME_DIR/
+ cp $OPENRTM_DIR/README $RUNTIME_DIR/
+ cp $OPENRTM_DIR/README.jp $RUNTIME_DIR/
+ cp $OPENRTM_DIR/THIS_IS_OPENRTM* $RUNTIME_DIR/
+
+ cp $OPENRTM_DIR/bin/*.dll $RUNTIME_DIR/bin/
+ cp $OPENRTM_DIR/bin/*.exe $RUNTIME_DIR/bin/
+ cp $OPENRTM_DIR/bin/*.py $RUNTIME_DIR/bin/
+ cp $OPENRTM_DIR/bin/*.bat $RUNTIME_DIR/bin/
+ cp $OPENRTM_DIR/bin/rtc.conf $RUNTIME_DIR/bin/
+ cp RTM_ROOT_dir.wxsctrl $RUNTIME_DIR/
+ cp OpenRTM_bin_dir.wxsctrl $RUNTIME_DIR/bin/
+
+ cp $OPENRTM_DIR/etc/rtc.conf.sample $RUNTIME_DIR/etc/
+
+ cp $OPENRTM_DIR/components/ComponentObserverConsumer.dll $RUNTIME_DIR/ext/sdo
+}
+
+copy_devel_files()
+{
+ if test "x$OPENRTM_DIR" = "x" ; then
+ echo "Variable OPENRTM_DIR is not set. Aborting"
+ exit -1
+ fi
+ cp -r $OPENRTM_DIR/cmake $DEVEL_DIR
+ cp $OPENRTM_DIR/coil/*.h $DEVEL_DIR/coil
+ cp $OPENRTM_DIR/coil/*.cpp $DEVEL_DIR/coil
+ cp $OPENRTM_DIR/bin/*.lib $DEVEL_DIR/lib
+ cp $OPENRTM_DIR/rtm/*.h $DEVEL_DIR/rtm
+ cp $OPENRTM_DIR/rtm/*.cpp $DEVEL_DIR/rtm
+ cp $OPENRTM_DIR/rtm/*.txt $DEVEL_DIR/rtm
+ cp $OPENRTM_DIR/rtm/idl/*.idl $DEVEL_DIR/rtm/idl
+ cp $OPENRTM_DIR/rtm/idl/*.cc $DEVEL_DIR/rtm/idl
+ cp $OPENRTM_DIR/rtm/idl/*.cpp $DEVEL_DIR/rtm/idl
+ cp $OPENRTM_DIR/rtm/idl/*.h $DEVEL_DIR/rtm/idl
+ cp $OPENRTM_DIR/rtm/idl/*.hh $DEVEL_DIR/rtm/idl
+ cp -r $OPENRTM_DIR/utils/rtc-template $DEVEL_DIR/utils/
+}
+
+copy_example_files()
+{
+ if test "x$OPENRTM_DIR" = "x" ; then
+ echo "Variable OPENRTM_DIR is not set. Aborting"
+ exit -1
+ fi
+ ORG_EX=$OPENRTM_DIR/examples/
+ DST_EX=$EXAMPLE_DIR/examples/C++
+ cp $OPENRTM_DIR/components/*.dll $EXAMPLE_DIR/examples/C++
+ rm -f $EXAMPLEL_DIR/examples/C++/ComponentObserverConsumer.dll
+ cp $OPENRTM_DIR/components/*.exe $EXAMPLE_DIR/examples/C++
+
+ cp $ORG_EX/SimpleIO/rtc.conf $DST_EX/
+ cp $ORG_EX/Composite/rtc_win32.conf $DST_EX/rtc_composite.conf
+ cp $ORG_EX/Composite/composite.conf $DST_EX/
+ cp $ORG_EX/ConfigSample/configsample.conf $DST_EX/
+}
+
+copy_doc_files()
+{
+ if test "x$OPENRTM_DIR" = "x" ; then
+ echo "Variable OPENRTM_DIR is not set. Aborting"
+ exit -1
+ fi
+ cp -r $OPENRTM_DIR/docs/* $DOC_DIR/doc/C++
+}
+
+#==============================
+# main
+#==============================
+
+if test $# != 1; then
+ usage
+ exit -1
+fi
+arg1=`echo $1 | grep '^http'`
+if test "x$arg1" != "x"; then
+ DOWNLOAD_URL=$1
+ download_omniorb_binpkg
+ LOCAL_FILE=`basename $DOWNLOAD_URL`
+else
+ LOCAL_FILE=$1
+fi
+if test ! -f $LOCAL_FILE ; then
+ echo "No such file: " $LOCAL_FILE
+ echo "Aborting."
+ exit -1
+fi
+
+find_openrtm_binpkg
+extract_package
+cleanup_dirs
+create_dirs
+copy_runtime_files
+copy_devel_files
+copy_example_files
+copy_doc_files
+
+# end of ecript
+#==============================
Copied: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props (from rev 2531, trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2014-03-29 08:09:18 UTC (rev 2540)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Label="UserMacros">
+ <omni_dllver>$(OMNI_DLLVER)</omni_dllver>
+ <omnithread_dllver>$(OMNITHREAD_DLLVER)</omnithread_dllver>
+ <rtm_dllver>$(RTM_DLLVER)</rtm_dllver>
+ <rtm_version>$(RTM_VERSION)</rtm_version>
+ <coil_dllver>$(COIL_DLLVER)</coil_dllver>
+ <coil_lib>coil$(coil_dllver).lib</coil_lib>
+ <coil_libd>coil$(coil_dllver)d.lib</coil_libd>
+ <omni_includes>$(omni_root)\include</omni_includes>
+ <omni_libdir>$(omni_root)\lib\x86_win32</omni_libdir>
+ <omni_bin>$(omni_root)\bin\x86_win32</omni_bin>
+ <omni_lib>omniORB$(omni_dllver)_rt.lib;omniDynamic$(omni_dllver)_rt.lib;omnithread$(omnithread_dllver)_rt.lib</omni_lib>
+ <omni_libd>omniORB$(omni_dllver)_rtd.lib;omniDynamic$(omni_dllver)_rtd.lib;omnithread$(omnithread_dllver)_rtd.lib</omni_libd>
+ <rtm_includes>$(rtm_root);$(rtm_root)\rtm\idl</rtm_includes>
+ <rtm_libdir>$(rtm_root)\bin</rtm_libdir>
+ <rtm_bin>$(rtm_root)\bin;$(rtm_root)\build</rtm_bin>
+ <rtm_path>$(rtm_bin);$(omni_bin)</rtm_path>
+ <rtm_libd>RTC$(rtm_dllver)d.lib;$(coil_libd);$(omni_libd);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_libd)</rtm_libd>
+ <rtm_lib>RTC$(rtm_dllver).lib;$(coil_lib);$(omni_lib);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_lib)</rtm_lib>
+ <rtm_idlc>omniidl</rtm_idlc>
+ <rtm_idlflags>-bcxx -Wba -nf -I $(SolutionDir)\rtm\idl</rtm_idlflags>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <_PropertySheetDisplayName>OpenRTM-aist-$(RTM_SHORTVER)</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(omni_includes);$(rtm_includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <AdditionalLibraryDirectories>$(omni_libdir);$(rtm_libdir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <BuildMacro Include="omni_root">
+ <Value>$(omni_root)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_dllver">
+ <Value>$(omni_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omnithread_dllver">
+ <Value>$(omnithread_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_root">
+ <Value>$(rtm_root)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_dllver">
+ <Value>$(rtm_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_version">
+ <Value>$(rtm_version)</Value>
+ </BuildMacro>
+ <BuildMacro Include="coil_dllver">
+ <Value>$(coil_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_includes">
+ <Value>$(omni_includes)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_libdir">
+ <Value>$(omni_libdir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_bin">
+ <Value>$(omni_bin)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_lib">
+ <Value>$(omni_lib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_libd">
+ <Value>$(omni_libd)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_includes">
+ <Value>$(rtm_includes)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_libdir">
+ <Value>$(rtm_libdir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_bin">
+ <Value>$(rtm_bin)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_path">
+ <Value>$(rtm_path)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_libd">
+ <Value>$(rtm_libd)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_lib">
+ <Value>$(rtm_lib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_idlc">
+ <Value>$(rtm_idlc)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_idlflags">
+ <Value>$(rtm_idlflags)</Value>
+ </BuildMacro>
+ <BuildMacro Include="coil_lib">
+ <Value>$(coil_lib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="coil_libd">
+ <Value>$(coil_libd)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
Copied: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops (from rev 2531, trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2014-03-29 08:09:18 UTC (rev 2540)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="OpenRTM-aist-%RTM_SHORTVER%"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes)"
+ PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
+ />
+ <UserMacro
+ Name="omni_root"
+ Value="%OMNI_ROOT%"
+ />
+ <UserMacro
+ Name="omni_dllver"
+ Value="%OMNI_DLLVER%"
+ />
+ <UserMacro
+ Name="omnithread_dllver"
+ Value="%OMNITHREAD_DLLVER%"
+ />
+ <UserMacro
+ Name="rtm_root"
+ Value="%RTM_ROOT%"
+ />
+ <UserMacro
+ Name="rtm_dllver"
+ Value="%RTM_DLLVER%"
+ />
+ <UserMacro
+ Name="rtm_version"
+ Value="%RTM_VERSION%"
+ />
+ <UserMacro
+ Name="coil_dllver"
+ Value="%COIL_DLLVER%"
+ />
+ <!-- omniORB macros -->
+ <UserMacro
+ Name="omni_includes"
+ Value=""$(omni_root)\include""
+ />
+ <UserMacro
+ Name="omni_libdir"
+ Value=""$(omni_root)\lib\x86_win32""
+ />
+ <UserMacro
+ Name="omni_bin"
+ Value=""$(omni_root)\bin\x86_win32""
+ />
+ <UserMacro
+ Name="omni_lib"
+ Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
+ />
+ <UserMacro
+ Name="omni_libd"
+ Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
+ />
+ <!-- OpenRTM-aist macros -->
+ <UserMacro
+ Name="rtm_includes"
+ Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
+ />
+ <UserMacro
+ Name="rtm_libdir"
+ Value=""$(rtm_root)\bin""
+ />
+ <UserMacro
+ Name="rtm_bin"
+ Value=""$(rtm_root)\bin";"$(rtm_root)\build""
+ />
+ <UserMacro
+ Name="rtm_path"
+ Value="$(rtm_bin);$(omni_bin)"
+ />
+ <UserMacro
+ Name="rtm_libd"
+ Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+ />
+ <UserMacro
+ Name="rtm_lib"
+ Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+ />
+ <UserMacro
+ Name="rtm_idlc"
+ Value="omniidl"
+ />
+ <UserMacro
+ Name="rtm_idlflags"
+ Value="-bcxx -Wba -nf -I"$(SolutionDir)\rtm\idl""
+ />
+ <!-- coil macros -->
+ <UserMacro
+ Name="coil_lib"
+ Value="coil$(coil_dllver).lib"
+ />
+ <UserMacro
+ Name="coil_libd"
+ Value="coil$(coil_dllver)d.lib"
+ />
+
+</VisualStudioPropertySheet>
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.props
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.props 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.props 2014-03-29 08:09:18 UTC (rev 2540)
@@ -7,7 +7,7 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <_PropertySheetDisplayName>OpenRTM-aist-1.0</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>OpenRTM-aist-%RTM_SHORTVER%</_PropertySheetDisplayName>
</PropertyGroup>
<ItemGroup>
<BuildMacro Include="rtm_root">
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.vsprops 2014-03-28 15:44:19 UTC (rev 2539)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.vsprops 2014-03-29 08:09:18 UTC (rev 2540)
@@ -2,7 +2,7 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="OpenRTM-aist-1.0"
+ Name="OpenRTM-aist-$(RTM_SHORTVER)"
>
<UserMacro
Name="rtm_root"
More information about the openrtm-commit
mailing list