[openrtm-commit:02506] r2959 - in trunk/OpenRTM-aist: . build src/lib/coil/build win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 10日 (金) 14:32:40 JST
Author: kawauchi
Date: 2017-03-10 14:32:39 +0900 (Fri, 10 Mar 2017)
New Revision: 2959
Modified:
trunk/OpenRTM-aist/Makefile.am
trunk/OpenRTM-aist/build/slntool.py
trunk/OpenRTM-aist/src/lib/coil/build/slntool.py
trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
Log:
[compat,build,->RELENG_1_2] vc15 (vc2017) has been supported.
Modified: trunk/OpenRTM-aist/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/Makefile.am 2017-03-08 07:08:35 UTC (rev 2958)
+++ trunk/OpenRTM-aist/Makefile.am 2017-03-10 05:32:39 UTC (rev 2959)
@@ -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: trunk/OpenRTM-aist/build/slntool.py
===================================================================
--- trunk/OpenRTM-aist/build/slntool.py 2017-03-08 07:08:35 UTC (rev 2958)
+++ trunk/OpenRTM-aist/build/slntool.py 2017-03-10 05:32:39 UTC (rev 2959)
@@ -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"])
Modified: trunk/OpenRTM-aist/src/lib/coil/build/slntool.py
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/build/slntool.py 2017-03-08 07:08:35 UTC (rev 2958)
+++ trunk/OpenRTM-aist/src/lib/coil/build/slntool.py 2017-03-10 05:32:39 UTC (rev 2959)
@@ -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: trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-03-08 07:08:35 UTC (rev 2958)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-03-10 05:32:39 UTC (rev 2959)
@@ -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: trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2017-03-08 07:08:35 UTC (rev 2958)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2017-03-10 05:32:39 UTC (rev 2959)
@@ -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=v150
+ 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=v150
+ goto MSBUILDx64
+ )
echo Visual Studio Dir: %VSINSTALLDIR%
echo LIB: %LIB%
openrtm-commit メーリングリストの案内