[openrtm-commit:01678] r2694 - in branches/RELENG_1_1/OpenRTM-aist: . build examples/AutoTest examples/Composite examples/ConfigSample examples/ExtTrigger examples/SeqIO examples/SimpleIO examples/SimpleService src/ext/sdo/observer src/lib/coil/build src/lib/coil/win32 src/lib/coil/win32/coil src/lib/rtm src/lib/rtm/idl utils/rtcd utils/rtcprof win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2016年 1月 14日 (木) 11:57:20 JST
Author: kawauchi
Date: 2016-01-14 11:57:20 +0900 (Thu, 14 Jan 2016)
New Revision: 2694
Modified:
branches/RELENG_1_1/OpenRTM-aist/
branches/RELENG_1_1/OpenRTM-aist/build/slntool.py
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/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am
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/src/ext/sdo/observer/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/slntool.py
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/rtm/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
Log:
[merge] r2689-2690 have been merged from trunk.?\227?\128?\128except local_service and logical_time.
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,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592,2605,2610,2626,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687
+ /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,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592,2605,2610,2626,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2690
Modified: branches/RELENG_1_1/OpenRTM-aist/build/slntool.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/slntool.py 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/build/slntool.py 2016-01-14 02:57:20 UTC (rev 2694)
@@ -27,6 +27,7 @@
"VC10": {"sln": "11.00", "vc": "2010"},
"VC11": {"sln": "12.00", "vc": "2012"},
"VC12": {"sln": "13.00", "vc": "2013"},
+ "VC14": {"sln": "14.00", "vc": "2015"},
}
sln_template = """Microsoft Visual Studio Solution File, Format Version %s
# Visual Studio %s
@@ -81,7 +82,7 @@
slntool.py --dep dep_file [--outfile outfile] vcproj_files...
Options:
- --vcversion: Visual C++'s version [VC8|VC9|VC10|VC11|VC12]
+ --vcversion: Visual C++'s version [VC8|VC9|VC10|VC11|VC12|VC14]
--dep: dependency file
--out or --output: output file name
@@ -116,6 +117,7 @@
"VC10": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
"VC11": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
"VC12": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
+ "VC14": {"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,2534-2539
+ /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,2689-2690
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/AutoTest/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/AutoTest/Makefile.am 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/AutoTest/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -138,7 +138,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/AutoTest
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -350,6 +350,48 @@
--header $(CONSUMER_H)
qkc -O- -sm $(win32_builddir)/AutoTestOutDll_vc12.vcxproj
+vc14proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "AutoTestInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestIn_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(PROVIDER_COMP_SRC) \
+ --header $(PROVIDER_H)
+ qkc -O- -sm $(win32_builddir)/AutoTestIn_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "AutoTestIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestInDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(PROVIDER_SRC) \
+ --header $(PROVIDER_H)
+ qkc -O- -sm $(win32_builddir)/AutoTestInDll_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "AutoTestOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestOut_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -O- -sm $(win32_builddir)/AutoTestOut_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "AutoTestOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestOutDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -O- -sm $(win32_builddir)/AutoTestOutDll_vc14.vcxproj
+
dist-hook:
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -112,7 +112,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/Composite
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -479,6 +479,79 @@
--source Composite.cpp
qkc -O- -sm $(win32_builddir)/Composite_vc12.vcxproj
+vc14proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "ControllerComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Controller_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Controller.cpp ControllerComp.cpp \
+ --header Controller.h
+ qkc -O- -sm $(win32_builddir)/Controller_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "Controller" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ControllerDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Controller.cpp \
+ --header Controller.h
+ qkc -O- -sm $(win32_builddir)/ControllerDll_vc14.vcxproj
+
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "MotorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Motor_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Motor.cpp MotorComp.cpp \
+ --header Motor.h
+ qkc -O- -sm $(win32_builddir)/Motor_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "Motor" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MotorDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Motor.cpp \
+ --header Motor.h
+ qkc -O- -sm $(win32_builddir)/MotorDll_vc14.vcxproj
+
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "SensorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Sensor_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Sensor.cpp SensorComp.cpp \
+ --header Sensor.h
+ qkc -O- -sm $(win32_builddir)/Sensor_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "Sensor" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SensorDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Sensor.cpp \
+ --header Sensor.h
+ qkc -O- -sm $(win32_builddir)/SensorDll_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "Composite" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Composite_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Composite.cpp
+ qkc -O- -sm $(win32_builddir)/Composite_vc14.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 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -70,7 +70,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/ConfigSample/
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -182,6 +182,28 @@
--header ConfigSample.h VectorConvert.h
qkc -O- -sm $(win32_builddir)/ConfigSampleDll_vc12.vcxproj
+vc14proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "ConfigSampleComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConfigSample_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConfigSample.cpp ConfigSampleComp.cpp \
+ --header ConfigSample.h VectorConvert.h
+ qkc -O- -sm $(win32_builddir)/ConfigSample_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "ConfigSample" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConfigSampleDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConfigSample.cpp \
+ --header ConfigSample.h VectorConvert.h
+ qkc -O- -sm $(win32_builddir)/ConfigSampleDll_vc14.vcxproj
+
dist-hook: lst vcproj
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -74,7 +74,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/ExtTrigger
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -202,6 +202,132 @@
--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.vcxproj.yaml \
+ --source ConsoleIn.cpp ConsoleInComp.cpp \
+ --header ConsoleIn.h
+ qkc -O- -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.vcxproj.yaml \
+ --source ConsoleIn.cpp \
+ --header ConsoleIn.h
+ qkc -O- -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.vcxproj.yaml \
+ --source ConsoleOut.cpp ConsoleOutComp.cpp \
+ --header ConsoleOut.h
+ qkc -O- -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.vcxproj.yaml \
+ --source ConsoleOut.cpp \
+ --header ConsoleOut.h
+ qkc -O- -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.vcxproj.yaml \
+ --source ConsoleIn.cpp ConsoleInComp.cpp \
+ --header ConsoleIn.h
+ qkc -O- -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.vcxproj.yaml \
+ --source ConsoleIn.cpp \
+ --header ConsoleIn.h
+ qkc -O- -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.vcxproj.yaml \
+ --source ConsoleOut.cpp ConsoleOutComp.cpp \
+ --header ConsoleOut.h
+ qkc -O- -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.vcxproj.yaml \
+ --source ConsoleOut.cpp \
+ --header ConsoleOut.h
+ qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc12.vcxproj
+
+vc14proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "ConsoleInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleIn_vc14.vcxproj \
+ --yaml ../rtc.vcxproj.yaml \
+ --source ConsoleIn.cpp ConsoleInComp.cpp \
+ --header ConsoleIn.h
+ qkc -O- -sm $(win32_builddir)/ConsoleIn_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "ConsoleIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleInDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcxproj.yaml \
+ --source ConsoleIn.cpp \
+ --header ConsoleIn.h
+ qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "ConsoleOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOut_vc14.vcxproj \
+ --yaml ../rtc.vcxproj.yaml \
+ --source ConsoleOut.cpp ConsoleOutComp.cpp \
+ --header ConsoleOut.h
+ qkc -O- -sm $(win32_builddir)/ConsoleOut_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "ConsoleOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOutDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcxproj.yaml \
+ --source ConsoleOut.cpp \
+ --header ConsoleOut.h
+ qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc14.vcxproj
+
dist-hook: lst
clean-local:
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -86,7 +86,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SeqIO
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -298,6 +298,48 @@
--header SeqOut.h
qkc -O- -sm $(win32_builddir)/SeqOutDll_vc12.vcxproj
+vc14proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "SeqInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqIn_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source SeqIn.cpp SeqInComp.cpp \
+ --header SeqIn.h
+ qkc -O- -sm $(win32_builddir)/SeqIn_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "SeqIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqInDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source SeqIn.cpp \
+ --header SeqIn.h
+ qkc -O- -sm $(win32_builddir)/SeqInDll_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "SeqOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqOut_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source SeqOut.cpp SeqOutComp.cpp \
+ --header SeqOut.h
+ qkc -O- -sm $(win32_builddir)/SeqOut_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "SeqOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqOutDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source SeqOut.cpp \
+ --header SeqOut.h
+ qkc -O- -sm $(win32_builddir)/SeqOutDll_vc14.vcxproj
+
dist-hook: lst vcproj
clean-local:
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -97,7 +97,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SimpleIO
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -309,6 +309,48 @@
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc12.vcxproj
+vc14proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "ConsoleInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleIn_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleIn.cpp ConsoleInComp.cpp \
+ --header ConsoleIn.h
+ qkc -O- -sm $(win32_builddir)/ConsoleIn_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "ConsoleIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleInDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleIn.cpp \
+ --header ConsoleIn.h
+ qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "ConsoleOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOut_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleOut.cpp ConsoleOutComp.cpp \
+ --header ConsoleOut.h
+ qkc -O- -sm $(win32_builddir)/ConsoleOut_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "ConsoleOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOutDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleOut.cpp \
+ --header ConsoleOut.h
+ qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc14.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 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SimpleService/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -154,7 +154,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SimpleService
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -366,6 +366,48 @@
--header $(CONSUMER_H)
qkc -O- -sm $(win32_builddir)/MyServiceConsumerDll_vc12.vcxproj
+vc14proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "MyServiceProviderComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceProvider_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(PROVIDER_COMP_SRC) \
+ --header $(PROVIDER_H)
+ qkc -O- -sm $(win32_builddir)/MyServiceProvider_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "MyServiceProvider" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceProviderDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(PROVIDER_SRC) \
+ --header $(PROVIDER_H)
+ qkc -O- -sm $(win32_builddir)/MyServiceProviderDll_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "MyServiceConsumerComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceConsumer_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -O- -sm $(win32_builddir)/MyServiceConsumer_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "MyServiceConsumer" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceConsumerDll_vc14.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -O- -sm $(win32_builddir)/MyServiceConsumerDll_vc14.vcxproj
+
dist-hook: lst vcproj
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 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -105,7 +105,7 @@
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/sdo/observer
PROJNAME=ComponentObserverConsumer
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -167,7 +167,18 @@
--header $(OBSERVER_WIN_H)
qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj
-
+vc14proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc14.vcxproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(OBSERVER_WIN_SRC) \
+ --header $(OBSERVER_WIN_H)
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc14.vcxproj
+
dist-hook: lst vcproj
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 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/slntool.py 2016-01-14 02:57:20 UTC (rev 2694)
@@ -27,6 +27,7 @@
"VC10": {"sln": "11.00", "vc": "2010"},
"VC11": {"sln": "12.00", "vc": "2012"},
"VC12": {"sln": "13.00", "vc": "2013"},
+ "VC14": {"sln": "15.00", "vc": "2015"},
}
sln_template = """Microsoft Visual Studio Solution File, Format Version %s
# Visual Studio %s
@@ -81,7 +82,7 @@
slntool.py --dep dep_file [--outfile outfile] vcproj_files...
Options:
- --vcversion: Visual C++'s version [VC8|VC9|VC10|VC11|VC12]
+ --vcversion: Visual C++'s version [VC8|VC9|VC10|VC11|VC12|VC14]
--dep: dependency file
--out or --output: output file name
@@ -116,6 +117,7 @@
"VC10": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
"VC11": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
"VC12": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
+ "VC14": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
}
re_guid = re.compile(regexs[vcversion]["guid"])
re_name = re.compile(regexs[vcversion]["name"])
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 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -20,14 +20,15 @@
coil_vc9.sln \
coil_vc10.sln \
coil_vc11.sln \
- coil_vc12.sln
+ coil_vc12.sln \
+ coil_vc14.sln
#------------------------------------------------------------
# sln file build rules
#------------------------------------------------------------
win32_builddir = .
-sln: coil_vc8.sln coil_vc9.sln coil_vc10.sln coil_vc11.sln coil_vc12.sln
+sln: coil_vc8.sln coil_vc9.sln coil_vc10.sln coil_vc11.sln coil_vc12.sln coil_vc14.sln
vcproj:
(cd coil ; make vcproj)
@@ -72,4 +73,12 @@
--out coil_vc12.sln \
`find ./ -name '*_vc12.vcxproj'`
qkc -O- -ms coil_vc12.sln
+
+coil_vc14.sln: coil.sln.dep vcproj
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC14 \
+ --dep coil.sln.dep \
+ --out coil_vc14.sln \
+ `find ./ -name '*_vc14.vcxproj'`
+ qkc -O- -ms coil_vc14.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 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -99,7 +99,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: libcoil_vc8.vcproj libcoil_vc9.vcproj libcoil_vc10.vcxproj libcoil_vc11.vcxproj libcoil_vc12.vcxproj
+vcproj: libcoil_vc8.vcproj libcoil_vc9.vcproj libcoil_vc10.vcxproj libcoil_vc11.vcxproj libcoil_vc12.vcxproj libcoil_vc14.vcxproj
libcoil_vc8.vcproj: libcoil.vcproj.yaml $(COIL_ALL)
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -155,6 +155,17 @@
--source $(COIL_SRC) \
--header $(COIL_H)
qkc -O- -sm $(win32_builddir)/libcoil_vc12.vcxproj
+
+libcoil_vc14.vcxproj: libcoil.vcproj.yaml $(COIL_ALL)
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/libcoil_vc14.vcxproj \
+ --yaml libcoil.vcproj.yaml \
+ --source $(COIL_SRC) \
+ --header $(COIL_H)
+ qkc -O- -sm $(win32_builddir)/libcoil_vc14.vcxproj
#------------------------------------------------------------
# for wxs file
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -166,7 +166,7 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj: libRTC.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -222,6 +222,17 @@
--source $(RTC_SRC) \
--header $(rtmheader_HEADERS)
qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc12.vcxproj
+
+vc14proj: libRTC.vcproj.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "14.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/libRTC_vc14.vcxproj \
+ --yaml libRTC.vcproj.yaml \
+ --source $(RTC_SRC) \
+ --header $(rtmheader_HEADERS)
+ qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc14.vcxproj
#------------------------------------------------------------
# for wxs file
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 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -213,7 +213,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -269,6 +269,17 @@
--source $(SKEL_CPP) \
--header $(SKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc12.vcxproj
+
+vc14proj: libRTCSkel.vcproj.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type LIB \
+ --vcversion "14.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/idl/libRTCSkel_vc14.vcxproj \
+ --yaml libRTCSkel.vcproj.yaml \
+ --source $(SKEL_CPP) \
+ --header $(SKEL_H)
+ qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc14.vcxproj
#------------------------------------------------------------
# for wxs file
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/Makefile.am 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtcd/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -29,7 +29,7 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj: rtcd.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -82,6 +82,17 @@
--out $(win32_builddir)/utils/rtcd/rtcd_vc12.vcxproj \
--yaml rtcd.yaml \
--source $(rtcd_SOURCES)
+
+vc14proj: rtcd.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "14.00" \
+ --projectname "rtcd" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/utils/rtcd/rtcd_vc14.vcxproj \
+ --yaml rtcd.yaml \
+ --source $(rtcd_SOURCES)
+
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/Makefile.am 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtcprof/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -29,7 +29,7 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
vc8proj: rtcprof.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -82,6 +82,17 @@
--out $(win32_builddir)/utils/rtcprof/rtcprof_vc12.vcxproj \
--yaml rtcprof.yaml \
--source $(rtcprof_SOURCES)
+
+vc14proj: rtcprof.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "14.00" \
+ --projectname "rtcprof" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/utils/rtcprof/rtcprof_vc14.vcxproj \
+ --yaml rtcprof.yaml \
+ --source $(rtcprof_SOURCES)
+
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2016-01-14 02:57:20 UTC (rev 2694)
@@ -16,7 +16,7 @@
rm -f coil_config.props
rm -f build.bat
-sln: OpenRTM-aist_vc8.sln OpenRTM-aist_vc9.sln OpenRTM-aist_vc10.sln OpenRTM-aist_vc11.sln OpenRTM-aist_vc12.sln
+sln: OpenRTM-aist_vc8.sln OpenRTM-aist_vc9.sln OpenRTM-aist_vc10.sln OpenRTM-aist_vc11.sln OpenRTM-aist_vc12.sln OpenRTM-aist_vc14.sln
OpenRTM-aist_vc8.sln: OpenRTM-aist.sln.dep
$(top_srcdir)/build/slntool.py \
@@ -57,6 +57,14 @@
--out OpenRTM-aist_vc12.sln \
`find ./ -name '*_vc12.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
qkc -O- -ms OpenRTM-aist_vc12.sln
+
+OpenRTM-aist_vc14.sln:
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC14 \
+ --dep OpenRTM-aist.sln.dep \
+ --out OpenRTM-aist_vc14.sln \
+ `find ./ -name '*_vc14.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
+ qkc -O- -ms OpenRTM-aist_vc14.sln
vsprops: coil_distbuild.vsprops coil_config.vsprops coil_distbuild.props coil_config.props
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2016-01-14 02:19:54 UTC (rev 2693)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2016-01-14 02:57:20 UTC (rev 2694)
@@ -40,7 +40,7 @@
if not DEFINED VC_VERSION set VC_VERSION=12
if not DEFINED PYTHON_DIR set PYTHON_DIR=c:\python27
if not DEFINED RTM_VERSION set RTM_VERSION=__VERSION__
-if not DEFINED OMNI_VERSION set OMNI_VERSION=4.2.0
+if not DEFINED OMNI_VERSION set OMNI_VERSION=4.2.1
if not DEFINED OMNITHREAD_VERSION set OMNITHREAD_VERSION=4.0
@rem ------------------------------------------------------------
@@ -112,6 +112,12 @@
set PLATFORMTOOL=/p:PlatformToolset=v120
goto MSBUILDx86
)
+if %VC_VERSION% == 14 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+ set VCTOOLSET=12.0
+ set PLATFORMTOOL=/p:PlatformToolset=v140
+ goto MSBUILDx86
+ )
@rem ------------------------------------------------------------
@rem Build (VC2008 x86)
@@ -169,6 +175,13 @@
set PLATFORMTOOL=/p:PlatformToolset=v120
goto MSBUILDx64
)
+if /i %VC_VERSION% == 14 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+ set VCTOOLSET=12.0
+ set PLATFORMTOOL=/p:PlatformToolset=v140
+ goto MSBUILDx64
+ )
+
echo Visual Studio Dir: %VSINSTALLDIR%
echo LIB: %LIB%
More information about the openrtm-commit
mailing list