[openrtm-commit:02965] r3101 - in branches/RELENG_1_2/OpenRTM-aist: . build src/ext/logger/fluentbit_stream src/lib/coil/build src/lib/rtm/ext win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 12月 10日 (日) 09:12:42 JST
Author: n-ando
Date: 2017-12-10 09:12:42 +0900 (Sun, 10 Dec 2017)
New Revision: 3101
Modified:
branches/RELENG_1_2/OpenRTM-aist/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py
branches/RELENG_1_2/OpenRTM-aist/build/slntool.py
branches/RELENG_1_2/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/build/slntool.py
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/librtmCamera.vcproj.yaml
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
merged changes from trunk/OpenRTM-aist r2956-2964, r2968-2973, r2977 during 2017-03:
[build,->RELENG_1_2] Add lacked include path for fluentbit_stream. refs #3974
[build,->RELENG_1_2] Add lacked include path for fluentbit_stream. refs #3974
[build,->RELENG_1_2] Add lacked library path for fluentbit_stream. refs #3979
[compat,build,->RELENG_1_2] vc15 (vc2017) has been supported.
[compat,build,->RELENG_1_2] vc15 (vc2017) has been supported.
[compat,->RELENG_1_2] Links of rtmCamera and rtmManipulator have been added to OpenRTMConfig.cmake. refs #3889
[compat,bugfix,->RELENG_1_2] Dependency on the library has been changed due to a build error in vc 2008.
[compat,bugfix,->RELENG_1_2] Fixed r2962.
[compat,bugfix,->RELENG_1_2] Modified slntool.py
[compat,bugfix,->RELENG_1_2] Modified librtmCamera.vcproj.yaml and librtmManipulator.vcproj.yaml.
[compat,bugfix,->RELENG_1_2] Modified librtmCamera.vcproj.yaml and librtmManipulator.vcproj.yaml.
[compat,bugfix,->RELENG_1_2] Modified cmakeconfgen.py
[compat,bugfix,->RELENG_1_2] Modified librtmCamera.vcproj.yaml and librtmManipulator.vcproj.yaml.
[compat,bugfix,->RELENG_1_2] Modified librtmCamera.vcproj.yaml and librtmManipulator.vcproj.yaml.
[compat,bugfix,->RELENG_1_2] Modified cmakeconfgen.py
[build,->RELENG_1_2] Update mbedtls include path (2.4.1->2.4.2)
Modified: branches/RELENG_1_2/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/Makefile.am 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/Makefile.am 2017-12-10 00:12:42 UTC (rev 3101)
@@ -9,7 +9,7 @@
SUBDIRS = build src utils examples etc $(DOCS) win32
-export VC_VERSION := 10 11 12 14
+export VC_VERSION := 10 11 12 14 15
DIST_SUBDIRS = packages $(SUBDIRS)
Modified: branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py 2017-12-10 00:12:42 UTC (rev 3101)
@@ -221,7 +221,9 @@
omni_libs = process_lib(dict["omni_lib"], "optimized")
omni_libs += ";" + process_lib(dict["omni_libd"], "debug")
rtm_libs = process_lib(dict["rtm_lib"], "optimized")
+ rtm_libs += ";" + process_lib(dict["rtm_ext_lib"], "optimized")
rtm_libs += ";" + process_lib(dict["rtm_libd"], "debug")
+ rtm_libs += ";" + process_lib(dict["rtm_ext_libd"], "debug")
dict["omniorb_cflags"] = omni_cflags
dict["omniorb_include_dirs"] = dict["omni_includes"]
Modified: branches/RELENG_1_2/OpenRTM-aist/build/slntool.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/slntool.py 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/build/slntool.py 2017-12-10 00:12:42 UTC (rev 3101)
@@ -28,6 +28,7 @@
"VC11": {"sln": "12.00", "vc": "2012"},
"VC12": {"sln": "13.00", "vc": "2013"},
"VC14": {"sln": "14.00", "vc": "2015"},
+ "VC15": {"sln": "15.00", "vc": "2017"},
}
sln_template = """Microsoft Visual Studio Solution File, Format Version %s
# Visual Studio %s
@@ -82,7 +83,7 @@
slntool.py --dep dep_file [--outfile outfile] vcproj_files...
Options:
- --vcversion: Visual C++'s version [VC8|VC9|VC10|VC11|VC12|VC14]
+ --vcversion: Visual C++'s version [VC8|VC9|VC10|VC11|VC12|VC14|VC15]
--dep: dependency file
--out or --output: output file name
@@ -118,6 +119,7 @@
"VC11": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
"VC12": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
"VC14": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
+ "VC15": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
}
re_guid = re.compile(regexs[vcversion]["guid"])
re_name = re.compile(regexs[vcversion]["name"])
@@ -178,6 +180,8 @@
i += 1
return (vcversion, depfile, outfile, flist)
+
+
def get_slnyaml(depfile, projfiles, vcversion="VC8"):
depdict = get_dependencies(depfile)
projs = []
@@ -225,8 +229,21 @@
return -1
return 0
- projs.sort(depsort)
+ #projs.sort(depsort)
+
+ def insertProj(pj, projs):
+ for num in range(0, len(projs)):
+ if depsort(pj, projs[num]) == -1:
+ projs.insert(num, pj)
+ return
+ projs.append(pj)
+
+ ret_projs = []
for pj in projs:
+ insertProj(pj, ret_projs)
+ projs = ret_projs
+
+ for pj in projs:
list = """ - Name: %s
FileName: %s
GUID: &%s %s
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am 2017-12-10 00:12:42 UTC (rev 3101)
@@ -10,6 +10,9 @@
AM_CPPFLAGS= \
-I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/include \
-I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/monkey/include \
+ -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/mbedtls-2.4.2/include \
+ -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/msgpack-c-0b7cabd/include \
+ -I$(top_srcdir)/src/ext/logger/fluentbit_stream/fluent-bit/lib/flb_libco \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/coil/include \
-I$(top_srcdir)/src/lib/rtm/idl
@@ -52,7 +55,8 @@
module_LTLIBRARIES = FluentBit.la
FluentBit_la_SOURCES = FluentBit.cpp FluentBit.h
-FluentBit_la_LDFLAGS = -module -shared -lfluent-bit
+FluentBit_la_LDFLAGS = -module -shared -lfluent-bit \
+ -L$(top_builddir)/src/ext/logger/fluentbit_stream/fluent-bit/build/lib
FluentBit_la_LIBADD = \
$(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/build/slntool.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/build/slntool.py 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/build/slntool.py 2017-12-10 00:12:42 UTC (rev 3101)
@@ -27,7 +27,8 @@
"VC10": {"sln": "11.00", "vc": "2010"},
"VC11": {"sln": "12.00", "vc": "2012"},
"VC12": {"sln": "13.00", "vc": "2013"},
- "VC14": {"sln": "15.00", "vc": "2015"},
+ "VC14": {"sln": "14.00", "vc": "2015"},
+ "VC15": {"sln": "15.00", "vc": "2017"},
}
sln_template = """Microsoft Visual Studio Solution File, Format Version %s
# Visual Studio %s
@@ -82,7 +83,7 @@
slntool.py --dep dep_file [--outfile outfile] vcproj_files...
Options:
- --vcversion: Visual C++'s version [VC8|VC9|VC10|VC11|VC12|VC14]
+ --vcversion: Visual C++'s version [VC8|VC9|VC10|VC11|VC12|VC14|VC15]
--dep: dependency file
--out or --output: output file name
@@ -118,6 +119,7 @@
"VC11": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
"VC12": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
"VC14": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
+ "VC15": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
}
re_guid = re.compile(regexs[vcversion]["guid"])
re_name = re.compile(regexs[vcversion]["name"])
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/librtmCamera.vcproj.yaml
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/librtmCamera.vcproj.yaml 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/librtmCamera.vcproj.yaml 2017-12-10 00:12:42 UTC (rev 3101)
@@ -14,8 +14,8 @@
# Debug Configuration
#------------------------------------------------------------
- Name: "Debug|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ProjectName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -49,7 +49,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver)d $(rtm_shortver) rtmCamera$(rtm_dllver)d.def
- move rtmCamera$(rtm_dllver)d.def ..\
+ move rtmCamera$(rtm_dllver)d.def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib $(rtm_depend_libd)"
@@ -72,8 +72,8 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(ProjectName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -108,7 +108,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver)d $(rtm_shortver) rtmCamera$(rtm_dllver)d.def
- move rtmCamera$(rtm_dllver)d.def ..\
+ move rtmCamera$(rtm_dllver)d.def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
@@ -132,8 +132,8 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\rtmCamera$(rtm_dllver)d.lib"
copy "$(OutDir)\\rtmCamera$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
- Name: "Debug|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ProjectName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -167,7 +167,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver)d $(rtm_shortver) rtmCamera$(rtm_dllver)d.def
- move rtmCamera$(rtm_dllver)d.def ..\
+ move rtmCamera$(rtm_dllver)d.def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib $(rtm_depend_libd)"
@@ -190,8 +190,8 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(ProjectName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -226,7 +226,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver)d $(rtm_shortver) rtmCamera$(rtm_dllver)d.def
- move rtmCamera$(rtm_dllver)d.def ..\
+ move rtmCamera$(rtm_dllver)d.def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
@@ -253,8 +253,8 @@
# Release Configuration
#------------------------------------------------------------
- Name: "Release|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ProjectName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -283,7 +283,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move rtmCamera$(rtm_dllver).def ..\\
+ move rtmCamera$(rtm_dllver).def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib $(rtm_depend_lib)"
@@ -308,8 +308,8 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(ProjectName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -338,7 +338,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver) $(rtm_shortver) rtmCamera$(rtm_dllver).def
- move rtmCamera$(rtm_dllver).def ..\\
+ move rtmCamera$(rtm_dllver).def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
@@ -364,8 +364,8 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\rtmCamera$(rtm_dllver).lib"
copy "$(OutDir)\\rtmCamera$(rtm_dllver).dll" "$(SolutionDir)bin\\"
- Name: "Release|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ProjectName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -394,7 +394,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move rtmCamera$(rtm_dllver).def ..\\
+ move rtmCamera$(rtm_dllver).def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib $(rtm_depend_lib)"
@@ -419,8 +419,8 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(ProjectName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -449,7 +449,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver) $(rtm_shortver) rtmCamera$(rtm_dllver).def
- move rtmCamera$(rtm_dllver).def ..\\
+ move rtmCamera$(rtm_dllver).def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml 2017-12-10 00:12:42 UTC (rev 3101)
@@ -14,8 +14,8 @@
# Debug Configuration
#------------------------------------------------------------
- Name: "Debug|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ProjectName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -49,7 +49,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver)d $(rtm_shortver) rtmManipulator$(rtm_dllver)d.def
- move rtmManipulator$(rtm_dllver)d.def ..\
+ move rtmManipulator$(rtm_dllver)d.def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib $(rtm_depend_libd)"
@@ -72,8 +72,8 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(ProjectName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -108,7 +108,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver)d $(rtm_shortver) rtmManipulator$(rtm_dllver)d.def
- move rtmManipulator$(rtm_dllver)d.def ..\
+ move rtmManipulator$(rtm_dllver)d.def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
@@ -132,8 +132,8 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\rtmManipulator$(rtm_dllver)d.lib"
copy "$(OutDir)\\rtmManipulator$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
- Name: "Debug|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ProjectName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -167,7 +167,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver)d $(rtm_shortver) rtmManipulator$(rtm_dllver)d.def
- move rtmManipulator$(rtm_dllver)d.def ..\
+ move rtmManipulator$(rtm_dllver)d.def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib $(rtm_depend_libd)"
@@ -190,8 +190,8 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(ProjectName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -226,7 +226,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver)d $(rtm_shortver) rtmManipulator$(rtm_dllver)d.def
- move rtmManipulator$(rtm_dllver)d.def ..\
+ move rtmManipulator$(rtm_dllver)d.def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
@@ -253,8 +253,8 @@
# Release Configuration
#------------------------------------------------------------
- Name: "Release|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ProjectName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -283,7 +283,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move rtmManipulator$(rtm_dllver).def ..\\
+ move rtmManipulator$(rtm_dllver).def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib $(rtm_depend_lib)"
@@ -308,8 +308,8 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(ProjectName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -338,7 +338,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver) $(rtm_shortver) rtmManipulator$(rtm_dllver).def
- move rtmManipulator$(rtm_dllver).def ..\\
+ move rtmManipulator$(rtm_dllver).def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
@@ -364,8 +364,8 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\rtmManipulator$(rtm_dllver).lib"
copy "$(OutDir)\\rtmManipulator$(rtm_dllver).dll" "$(SolutionDir)bin\\"
- Name: "Release|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ProjectName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -394,7 +394,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move rtmManipulator$(rtm_dllver).def ..\\
+ move rtmManipulator$(rtm_dllver).def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib $(rtm_depend_lib)"
@@ -419,8 +419,8 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(ProjectName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(ProjectName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -449,7 +449,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver) $(rtm_shortver) rtmManipulator$(rtm_dllver).def
- move rtmManipulator$(rtm_dllver).def ..\\
+ move rtmManipulator$(rtm_dllver).def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-12-10 00:12:42 UTC (rev 3101)
@@ -17,7 +17,7 @@
rm -f coil_config.props
rm -f build.bat
-sln: OpenRTM-aist_vc9.sln OpenRTM-aist_vc10.sln OpenRTM-aist_vc11.sln OpenRTM-aist_vc12.sln OpenRTM-aist_vc14.sln
+sln: OpenRTM-aist_vc9.sln OpenRTM-aist_vc10.sln OpenRTM-aist_vc11.sln OpenRTM-aist_vc12.sln OpenRTM-aist_vc14.sln OpenRTM-aist_vc15.sln
OpenRTM-aist_vc9.sln:
$(top_srcdir)/build/slntool.py \
@@ -59,6 +59,14 @@
`find ./ -name '*_vc14.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
qkc -O- -ms OpenRTM-aist_vc14.sln
+OpenRTM-aist_vc15.sln:
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC15 \
+ --dep OpenRTM-aist.sln.dep \
+ --out OpenRTM-aist_vc15.sln \
+ `find ./ -name '*_vc15.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
+ qkc -O- -ms OpenRTM-aist_vc15.sln
+
vsprops: coil_distbuild.vsprops coil_config.vsprops coil_distbuild.props coil_config.props
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2017-12-10 00:12:42 UTC (rev 3101)
@@ -1,37 +1,38 @@
libcoil:
+libRTCSkel: libcoil
+librtmCamera: libcoil libRTCSkel
+librtmManipulator: libcoil libRTCSkel
libRTC: libcoil libRTCSkel
-librtmManipulator: libcoil libRTCSkel libRTC
-librtmCamera: libcoil libRTCSkel librtmManipulator libRTC
-rtcd: libcoil libRTC
-rtcprof: libcoil libRTC
-ComponentObserverConsumer: libcoil libRTC
-ConfigSampleComp: libcoil libRTC
-ConfigSample: libcoil libRTC
-ConsoleInComp: libcoil libRTC
-ConsoleIn: libcoil libRTC
-ConsoleOutComp: libcoil libRTC
-ConsoleOut: libcoil libRTC
-SeqInComp: libcoil libRTC
-SeqIn: libcoil libRTC
-SeqOutComp: libcoil libRTC
-SeqOut: libcoil libRTC
+rtcd: libcoil libRTCSkel libRTC
+rtcprof: libcoil libRTCSkel libRTC
+ComponentObserverConsumer: libcoil libRTCSkel libRTC
+ConfigSampleComp: libcoil libRTCSkel libRTC
+ConfigSample: libcoil libRTCSkel libRTC
+ConsoleInComp: libcoil libRTCSkel libRTC
+ConsoleIn: libcoil libRTCSkel libRTC
+ConsoleOutComp: libcoil libRTCSkel libRTC
+ConsoleOut: libcoil libRTCSkel libRTC
+SeqInComp: libcoil libRTCSkel libRTC
+SeqIn: libcoil libRTCSkel libRTC
+SeqOutComp: libcoil libRTCSkel libRTC
+SeqOut: libcoil libRTCSkel libRTC
MyServiceConsumerComp: libcoil libRTC
MyServiceConsumer: libcoil libRTC MyServiceConsumerComp
MyServiceProviderComp: libcoil libRTC MyServiceConsumerComp MyServiceConsumer
MyServiceProvider: libcoil libRTC MyServiceConsumerComp MyServiceConsumer MyServiceProviderComp
-Motor: libcoil libRTC
-MotorComp: libcoil libRTC
-Controller: libcoil libRTC
-ControllerComp: libcoil libRTC
-Sensor: libcoil libRTC
-SensorComp: libcoil libRTC
-Composite: libcoil libRTC
-FileNameservice: libcoil libRTC
-LogicalTimeTriggeredEC: libcoil libRTC
-LTTSample: libcoil libRTC
-LTTSampleComp: libcoil libRTC
-ExtConsoleIn: libcoil libRTC
-ExtConsoleInComp: libcoil libRTC
-ExtConsoleOut: libcoil libRTC
-ExtConsoleOutComp: libcoil libRTC
-ExtConnectorComp: libcoil libRTC
+Motor: libcoil libRTCSkel libRTC
+MotorComp: libcoil libRTCSkel libRTC
+Controller: libcoil libRTCSkel libRTC
+ControllerComp: libcoil libRTCSkel libRTC
+Sensor: libcoil libRTCSkel libRTC
+SensorComp: libcoil libRTCSkel libRTC
+Composite: libcoil libRTCSkel libRTC
+FileNameservice: libcoil libRTCSkel libRTC
+LogicalTimeTriggeredEC: libcoil libRTCSkel libRTC
+LTTSample: libcoil libRTCSkel libRTC
+LTTSampleComp: libcoil libRTCSkel libRTC
+ExtConsoleIn: libcoil libRTCSkel libRTC
+ExtConsoleInComp: libcoil libRTCSkel libRTC
+ExtConsoleOut: libcoil libRTCSkel libRTC
+ExtConsoleOutComp: libcoil libRTCSkel libRTC
+ExtConnectorComp: libcoil libRTCSkel libRTC
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2017-12-10 00:12:42 UTC (rev 3101)
@@ -124,6 +124,12 @@
set PLATFORMTOOL=/p:PlatformToolset=v140
goto MSBUILDx86
)
+if %VC_VERSION% == 15 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
+ set VCTOOLSET=15.0
+ set PLATFORMTOOL=/p:PlatformToolset=v141
+ goto MSBUILDx86
+ )
@rem ------------------------------------------------------------
@rem Build (VC2008 x86)
@@ -187,6 +193,12 @@
set PLATFORMTOOL=/p:PlatformToolset=v140
goto MSBUILDx64
)
+if /i %VC_VERSION% == 15 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+ set VCTOOLSET=15.0
+ set PLATFORMTOOL=/p:PlatformToolset=v141
+ goto MSBUILDx64
+ )
echo Visual Studio Dir: %VSINSTALLDIR%
echo LIB: %LIB%
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2017-12-10 00:12:42 UTC (rev 3101)
@@ -20,6 +20,8 @@
<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_ext_libd>$(rtm_ext_libd)</rtm_ext_libd>
+ <rtm_ext_lib>$(rtm_ext_lib)</rtm_ext_lib>
<rtm_idlc>omniidl</rtm_idlc>
<rtm_idlflags>-bcxx -Wba -nf -I $(SolutionDir)\rtm\idl</rtm_idlflags>
</PropertyGroup>
@@ -94,6 +96,12 @@
<BuildMacro Include="rtm_lib">
<Value>$(rtm_lib)</Value>
</BuildMacro>
+ <BuildMacro Include="rtm_ext_libd">
+ <Value>$(rtm_ext_libd)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_ext_lib">
+ <Value>$(rtm_ext_lib)</Value>
+ </BuildMacro>
<BuildMacro Include="rtm_idlc">
<Value>$(rtm_idlc)</Value>
</BuildMacro>
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2017-12-10 00:10:04 UTC (rev 3100)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2017-12-10 00:12:42 UTC (rev 3101)
@@ -85,19 +85,19 @@
/>
<UserMacro
Name="rtm_libd"
- Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) $(rtm_ext_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+ Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
/>
<UserMacro
Name="rtm_libd_x64"
- Value="RTC$(rtm_dllver_x64)d.lib $(coil_libd_x64) $(omni_libd) $(rtm_ext_libd_x64) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+ Value="RTC$(rtm_dllver_x64)d.lib $(coil_libd_x64) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
/>
<UserMacro
Name="rtm_lib"
- Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) $(rtm_ext_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+ Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
/>
<UserMacro
Name="rtm_lib_x64"
- Value="RTC$(rtm_dllver_x64).lib $(coil_lib_x64) $(omni_lib) $(rtm_ext_lib_x64) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+ Value="RTC$(rtm_dllver_x64).lib $(coil_lib_x64) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
/>
<UserMacro
Name="rtm_idlc"
More information about the openrtm-commit
mailing list