[openrtm-commit:00069] r2086 - in trunk/OpenRTM-aist: examples/AutoTest examples/Composite examples/ConfigSample examples/ExtTrigger examples/SeqIO examples/SimpleIO examples/SimpleService src/lib/coil/ace src/lib/coil/tests src/lib/coil/tests/Condition src/lib/coil/tests/DynamicLib src/lib/coil/tests/Factory src/lib/coil/tests/File src/lib/coil/tests/Guard src/lib/coil/tests/Listener src/lib/coil/tests/Logger src/lib/coil/tests/Mutex src/lib/coil/tests/OS src/lib/coil/tests/PeriodicTask src/lib/coil/tests/Properties src/lib/coil/tests/Signal src/lib/coil/tests/Singleton src/lib/coil/tests/Task src/lib/coil/tests/Time src/lib/coil/tests/TimeValue src/lib/coil/tests/Timer src/lib/coil/tests/UUID src/lib/coil/tests/stringutil src/lib/coil/win32 src/lib/coil/win32/coil src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy src/lib/doil/utils/omniidl_be/tests/ExecutionContextProxy src/lib/doil/utils/omniidl_be/tests/OrganizationProxy src/lib/doil/utils/omniidl_be/tests/PortServiceProxy src/lib/rtc/corba/idl src/lib/rtm src/lib/rtm/idl src/lib/rtm/tests/ManagerServant utils/rtcd utils/rtcprof win32/OpenRTM-aist win32/OpenRTM-aist/coil win32/OpenRTM-aist/etc win32/OpenRTM-aist/examples/USBCamera
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 5月 9日 (月) 13:46:15 JST
Author: fsi-katami
Date: 2011-05-09 13:46:15 +0900 (Mon, 09 May 2011)
New Revision: 2086
Modified:
trunk/OpenRTM-aist/examples/AutoTest/Makefile.am
trunk/OpenRTM-aist/examples/Composite/Makefile.am
trunk/OpenRTM-aist/examples/ConfigSample/Makefile.am
trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am
trunk/OpenRTM-aist/examples/SeqIO/Makefile.am
trunk/OpenRTM-aist/examples/SimpleIO/Makefile.am
trunk/OpenRTM-aist/examples/SimpleService/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/ace/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Condition/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/DynamicLib/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Factory/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/File/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Guard/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Listener/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Logger/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Mutex/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/OS/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/PeriodicTask/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Properties/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Signal/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Singleton/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Task/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Time/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/TimeValue/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/Timer/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/tests/stringutil/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/win32/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am
trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextProxy/Makefile.am
trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am
trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/PortServiceProxy/Makefile.am
trunk/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp
trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
trunk/OpenRTM-aist/utils/rtcd/Makefile.am
trunk/OpenRTM-aist/utils/rtcprof/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/coil/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am
Log:
For vc2010. refs 1915
Modified: trunk/OpenRTM-aist/examples/AutoTest/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/AutoTest/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/examples/AutoTest/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -138,7 +138,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/AutoTest
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -224,6 +224,48 @@
--header $(CONSUMER_H)
qkc -sm $(win32_builddir)/AutoTestOutDll_vc9.vcproj
+vc10proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "AutoTestInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestIn_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(PROVIDER_COMP_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/AutoTestIn_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "AutoTestIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestInDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(PROVIDER_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/AutoTestInDll_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "AutoTestOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestOut_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/AutoTestOut_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "AutoTestOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestOutDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/AutoTestOutDll_vc10.vcxproj
+
dist-hook:
Modified: trunk/OpenRTM-aist/examples/Composite/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/Composite/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/examples/Composite/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -112,7 +112,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/Composite
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -260,6 +260,79 @@
--source Composite.cpp
qkc -sm $(win32_builddir)/Composite_vc9.vcproj
+vc10proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "ControllerComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Controller_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Controller.cpp ControllerComp.cpp \
+ --header Controller.h
+ qkc -sm $(win32_builddir)/Controller_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "Controller" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ControllerDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Controller.cpp \
+ --header Controller.h
+ qkc -sm $(win32_builddir)/ControllerDll_vc10.vcxproj
+
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "MotorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Motor_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Motor.cpp MotorComp.cpp \
+ --header Motor.h
+ qkc -sm $(win32_builddir)/Motor_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "Motor" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MotorDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Motor.cpp \
+ --header Motor.h
+ qkc -sm $(win32_builddir)/MotorDll_vc10.vcxproj
+
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "SensorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Sensor_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Sensor.cpp SensorComp.cpp \
+ --header Sensor.h
+ qkc -sm $(win32_builddir)/Sensor_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "Sensor" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SensorDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Sensor.cpp \
+ --header Sensor.h
+ qkc -sm $(win32_builddir)/SensorDll_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "Composite" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Composite_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Composite.cpp
+ qkc -sm $(win32_builddir)/Composite_vc10.vcxproj
+
dist-hook: lst vcproj
clean-local:
Modified: trunk/OpenRTM-aist/examples/ConfigSample/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/ConfigSample/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/examples/ConfigSample/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -70,7 +70,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/ConfigSample/
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -116,6 +116,27 @@
--header ConfigSample.h VectorConvert.h
qkc -sm $(win32_builddir)/ConfigSampleDll_vc9.vcproj
+vc10proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "ConfigSampleComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConfigSample_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConfigSample.cpp ConfigSampleComp.cpp \
+ --header ConfigSample.h VectorConvert.h
+ qkc -sm $(win32_builddir)/ConfigSample_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "ConfigSample" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConfigSampleDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConfigSample.cpp \
+ --header ConfigSample.h VectorConvert.h
+ qkc -sm $(win32_builddir)/ConfigSampleDll_vc10.vcxproj
dist-hook: lst vcproj
Modified: trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -74,7 +74,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/ExtTrigger
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -160,6 +160,48 @@
--header ConsoleOut.h
qkc -sm $(win32_builddir)/ConsoleOutDll_vc9.vcproj
+vc10proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "ConsoleInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleIn_vc10.vcxproj \
+ --yaml ../rtc.vcxproj.yaml \
+ --source ConsoleIn.cpp ConsoleInComp.cpp \
+ --header ConsoleIn.h
+ qkc -sm $(win32_builddir)/ConsoleIn_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "ConsoleIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleInDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcxproj.yaml \
+ --source ConsoleIn.cpp \
+ --header ConsoleIn.h
+ qkc -sm $(win32_builddir)/ConsoleInDll_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "ConsoleOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOut_vc10.vcxproj \
+ --yaml ../rtc.vcxproj.yaml \
+ --source ConsoleOut.cpp ConsoleOutComp.cpp \
+ --header ConsoleOut.h
+ qkc -sm $(win32_builddir)/ConsoleOut_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "ConsoleOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOutDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcxproj.yaml \
+ --source ConsoleOut.cpp \
+ --header ConsoleOut.h
+ qkc -sm $(win32_builddir)/ConsoleOutDll_vc10.vcxproj
+
dist-hook: lst
clean-local:
Modified: trunk/OpenRTM-aist/examples/SeqIO/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/SeqIO/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/examples/SeqIO/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -86,7 +86,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SeqIO
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -172,6 +172,48 @@
--header SeqOut.h
qkc -sm $(win32_builddir)/SeqOutDll_vc9.vcproj
+vc10proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "SeqInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqIn_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source SeqIn.cpp SeqInComp.cpp \
+ --header SeqIn.h
+ qkc -sm $(win32_builddir)/SeqIn_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "SeqIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqInDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source SeqIn.cpp \
+ --header SeqIn.h
+ qkc -sm $(win32_builddir)/SeqInDll_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "SeqOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqOut_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source SeqOut.cpp SeqOutComp.cpp \
+ --header SeqOut.h
+ qkc -sm $(win32_builddir)/SeqOut_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "SeqOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqOutDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source SeqOut.cpp \
+ --header SeqOut.h
+ qkc -sm $(win32_builddir)/SeqOutDll_vc10.vcxproj
+
dist-hook: lst vcproj
clean-local:
Modified: trunk/OpenRTM-aist/examples/SimpleIO/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleIO/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/examples/SimpleIO/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -97,7 +97,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SimpleIO
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -183,6 +183,48 @@
--header ConsoleOut.h
qkc -sm $(win32_builddir)/ConsoleOutDll_vc9.vcproj
+vc10proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "ConsoleInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleIn_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleIn.cpp ConsoleInComp.cpp \
+ --header ConsoleIn.h
+ qkc -sm $(win32_builddir)/ConsoleIn_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "ConsoleIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleInDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleIn.cpp \
+ --header ConsoleIn.h
+ qkc -sm $(win32_builddir)/ConsoleInDll_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "ConsoleOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOut_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleOut.cpp ConsoleOutComp.cpp \
+ --header ConsoleOut.h
+ qkc -sm $(win32_builddir)/ConsoleOut_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "ConsoleOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOutDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleOut.cpp \
+ --header ConsoleOut.h
+ qkc -sm $(win32_builddir)/ConsoleOutDll_vc10.vcxproj
+
dist-hook: lst vcproj
clean-local:
Modified: trunk/OpenRTM-aist/examples/SimpleService/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleService/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/examples/SimpleService/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -150,7 +150,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SimpleService
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -236,6 +236,48 @@
--header $(CONSUMER_H)
qkc -sm $(win32_builddir)/MyServiceConsumerDll_vc9.vcproj
+vc10proj:
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "MyServiceProviderComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceProvider_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(PROVIDER_COMP_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/MyServiceProvider_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "MyServiceProvider" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceProviderDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(PROVIDER_SRC) \
+ --header $(PROVIDER_H)
+ qkc -sm $(win32_builddir)/MyServiceProviderDll_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "MyServiceConsumerComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceConsumer_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/MyServiceConsumer_vc10.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --projectname "MyServiceConsumer" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceConsumerDll_vc10.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H)
+ qkc -sm $(win32_builddir)/MyServiceConsumerDll_vc10.vcxproj
+
dist-hook: lst vcproj
Modified: trunk/OpenRTM-aist/src/lib/coil/ace/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/ace/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/ace/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -24,7 +24,8 @@
#------------------------------------------------------------
win32_builddir = .
-sln: coil_ace_vc8.sln coil_ace_vc9.sln
+sln: coil_ace_vc8.sln coil_ace_vc9.sln coil_ace_vc10.sln
+
vcproj:
(cd coil ; make vcproj)
@@ -44,3 +45,12 @@
--out coil_ace_vc9.sln \
`find ./ -name '*_vc9.vcproj'`
qkc -ms coil_ace_vc9.sln
+
+coil_ace_vc10.sln: coil_ace.sln.dep vcproj
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC10 \
+ --dep coil_ace.sln.dep \
+ --out coil_ace_vc10.sln \
+ `find ./ -name '*_vc10.vcproj'`
+ qkc -ms coil_ace_vc10.sln
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Condition/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Condition/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Condition/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -59,7 +59,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Condition_vc8.vcproj Condition_vc9.vcproj
+vcproj: Condition_vc8.vcproj Condition_vc9.vcproj Condition_vc10.vcproj
Condition_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -85,4 +85,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Condition_vc9.vcproj
+Condition_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname ConditionTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Condition_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/Condition_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/DynamicLib/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/DynamicLib/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/DynamicLib/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -69,7 +69,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: DynamicLib_vc8.vcproj DynamicLib_vc9.vcproj DynamicLib_libDynamicLib_vc8.vcproj DynamicLib_libDynamicLib_vc9.vcproj
+vcproj: DynamicLib_vc8.vcproj DynamicLib_vc9.vcproj DynamicLib_vc10.vcproj DynamicLib_libDynamicLib_vc8.vcproj DynamicLib_libDynamicLib_vc9.vcproj DynamicLib_libDynamicLib_vc10.vcproj
DynamicLib_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -95,6 +95,17 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/DynamicLib_vc9.vcproj
+DynamicLib_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname DynamicLibTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/DynamicLib_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/DynamicLib_vc10.vcproj
+
DynamicLib_libDynamicLib_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname DynamicLibTestDll \
@@ -121,3 +132,14 @@
qkc -sm $(win32_builddir)/DynamicLib_libDynamicLib_vc9.vcproj
+DynamicLib_libDynamicLib_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname DynamicLibTestDll \
+ --type DLL \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/DynamicLib_libDynamicLib_vc10.vcproj \
+ --yaml ../coil_test_dll.vcproj.yaml \
+ --source $(libDynamicLib_la_SOURCES)
+ qkc -sm $(win32_builddir)/DynamicLib_libDynamicLib_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Factory/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Factory/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Factory/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -63,7 +63,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Factory_vc8.vcproj Factory_vc9.vcproj Factory_libPluginC_vc8.vcproj Factory_libPluginC_vc9.vcproj
+vcproj: Factory_vc8.vcproj Factory_vc9.vcproj Factory_vc10.vcproj Factory_libPluginC_vc8.vcproj Factory_libPluginC_vc9.vcproj Factory_libPluginC_vc10.vcproj
@@ -91,6 +91,17 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Factory_vc9.vcproj
+Factory_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname FactoryTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Factory_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/Factory_vc10.vcproj
+
Factory_libPluginC_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname FactoryTest_libPluginC \
@@ -116,5 +127,16 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Factory_libPluginC_vc9.vcproj
+Factory_libPluginC_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname FactoryTest_libPluginC \
+ --type DLL \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Factory_libPluginC_vc10.vcproj \
+ --yaml ./coil_test_dll.vcproj.yaml \
+ --source $(libPluginC_la_SOURCES)
+ qkc -sm $(win32_builddir)/Factory_libPluginC_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/File/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/File/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/File/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -55,7 +55,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: File_vc8.vcproj File_vc9.vcproj
+vcproj: File_vc8.vcproj File_vc9.vcproj File_vc10.vcproj
File_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -81,4 +81,16 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/File_vc9.vcproj
+File_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname FileTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/File_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/File_vc10.vcproj
+
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Guard/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Guard/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Guard/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -59,7 +59,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Guard_vc8.vcproj Guard_vc9.vcproj
+vcproj: Guard_vc8.vcproj Guard_vc9.vcproj Guard_vc10.vcproj
Guard_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -85,4 +85,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Guard_vc9.vcproj
+Guard_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname GuardTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Guard_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/Guard_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Listener/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Listener/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Listener/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -56,7 +56,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Listener_vc8.vcproj Listener_vc9.vcproj
+vcproj: Listener_vc8.vcproj Listener_vc9.vcproj Listener_vc10.vcproj
Listener_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -82,4 +82,16 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Listener_vc9.vcproj
+Listener_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname ListenerTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Listener_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/Listener_vc10.vcproj
+
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Logger/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Logger/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Logger/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -63,7 +63,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Logger_vc8.vcproj Logger_vc9.vcproj
+vcproj: Logger_vc8.vcproj Logger_vc9.vcproj Logger_vc10.vcproj
Logger_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -89,4 +89,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Logger_vc9.vcproj
+Logger_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname LoggerTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Logger_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/Logger_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -41,13 +41,16 @@
coiltest_config.vsprops \
coiltest_vc8.sln \
coiltest_vc9.sln
+# coiltest_vc10.sln
#------------------------------------------------------------
# sln file build rules
#------------------------------------------------------------
win32_builddir = .
+#sln: coiltest_vc8.sln coiltest_vc9.sln coiltest_vc10.sln
sln: coiltest_vc8.sln coiltest_vc9.sln
+
vcproj:
(for testdir in $(SUBDIRS) ; do cd $$testdir ; make vcproj ; cd .. ; done)
@@ -68,3 +71,12 @@
`find ./ -name '*_vc9.vcproj'`
qkc -ms coiltest_vc9.sln
+#coiltest_vc10.sln: coil_test.sln.dep vcproj
+# $(top_srcdir)/build/slntool.py \
+ --vcversion VC10 \
+ --dep coil_test.sln.dep \
+ --out coiltest_vc10.sln \
+ `find ./ -name '*_vc10.vcproj'`
+# qkc -ms coiltest_vc10.sln
+
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Mutex/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Mutex/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Mutex/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -62,7 +62,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Mutex_vc8.vcproj Mutex_vc9.vcproj
+vcproj: Mutex_vc8.vcproj Mutex_vc9.vcproj Mutex_vc10.vcproj
Mutex_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -88,4 +88,16 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Mutex_vc9.vcproj
+Mutex_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname MutexTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Mutex_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+# --header $(TEST_H)
+ qkc -sm $(win32_builddir)/Mutex_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/OS/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/OS/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/OS/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -56,7 +56,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: OS_vc8.vcproj OS_vc9.vcproj
+vcproj: OS_vc8.vcproj OS_vc9.vcproj OS_vc10.vcproj
OS_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -82,4 +82,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/OS_vc9.vcproj
+OS_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname OSTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/OS_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/OS_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/PeriodicTask/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/PeriodicTask/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/PeriodicTask/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -59,7 +59,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: PeriodicTask_vc8.vcproj PeriodicTask_vc9.vcproj
+vcproj: PeriodicTask_vc8.vcproj PeriodicTask_vc9.vcproj PeriodicTask_vc10.vcproj
PeriodicTask_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -85,4 +85,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/PeriodicTask_vc9.vcproj
+PeriodicTask_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname PeriodicTaskTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/PeriodicTask_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/PeriodicTask_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Properties/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Properties/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Properties/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -88,7 +88,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Properties_vc8.vcproj Properties_vc9.vcproj
+vcproj: Properties_vc8.vcproj Properties_vc9.vcproj Properties_vc10.vcproj
Properties_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -114,5 +114,18 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Properties_vc9.vcproj
+Properties_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname PropertiesTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Properties_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/Properties_vc10.vcproj
+
+
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Signal/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Signal/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Signal/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -59,7 +59,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Signal_vc8.vcproj Signal_vc9.vcproj
+vcproj: Signal_vc8.vcproj Signal_vc9.vcproj Signal_vc10.vcproj
Signal_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -85,4 +85,16 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Signal_vc9.vcproj
+Signal_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname SignalTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Signal_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/Signal_vc10.vcproj
+
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Singleton/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Singleton/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Singleton/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -56,7 +56,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Singleton_vc8.vcproj Singleton_vc9.vcproj
+vcproj: Singleton_vc8.vcproj Singleton_vc9.vcproj Singleton_vc10.vcproj
Singleton_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -82,4 +82,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Singleton_vc9.vcproj
+Singleton_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname SingletonTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Singleton_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/Singleton_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Task/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Task/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Task/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -59,7 +59,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Task_vc8.vcproj Task_vc9.vcproj
+vcproj: Task_vc8.vcproj Task_vc9.vcproj Task_vc10.vcproj
Task_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -85,4 +85,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Task_vc9.vcproj
+Task_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname TaskTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Task_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/Task_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Time/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Time/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Time/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -62,7 +62,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Time_vc8.vcproj Time_vc9.vcproj
+vcproj: Time_vc8.vcproj Time_vc9.vcproj Time_vc10.vcproj
Time_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -88,4 +88,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Time_vc9.vcproj
+Time_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname TimeTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Time_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/Time_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/TimeValue/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/TimeValue/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/TimeValue/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -57,7 +57,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: TimeValue_vc8.vcproj TimeValue_vc9.vcproj
+vcproj: TimeValue_vc8.vcproj TimeValue_vc9.vcproj TimeValue_vc10.vcproj
TimeValue_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -83,4 +83,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/TimeValue_vc9.vcproj
+TimeValue_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname TimeValueTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/TimeValue_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/TimeValue_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/Timer/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/Timer/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/Timer/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -61,7 +61,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Timer_vc8.vcproj Timer_vc9.vcproj
+vcproj: Timer_vc8.vcproj Timer_vc9.vcproj Timer_vc10.vcproj
Timer_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -87,4 +87,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/Timer_vc9.vcproj
+Timer_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname TimerTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/Timer_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/Timer_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -59,7 +59,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: UUID_vc8.vcproj UUID_vc9.vcproj
+vcproj: UUID_vc8.vcproj UUID_vc9.vcproj UUID_vc10.vcproj
UUID_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -85,4 +85,14 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/UUID_vc9.vcproj
+UUID_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname UUIDTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/UUID_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/UUID_vc10.vcproj
Modified: trunk/OpenRTM-aist/src/lib/coil/tests/stringutil/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/tests/stringutil/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/tests/stringutil/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -54,7 +54,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: stringutil_vc8.vcproj stringutil_vc9.vcproj
+vcproj: stringutil_vc8.vcproj stringutil_vc9.vcproj stringutil_vc10.vcproj
stringutil_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -80,4 +80,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/stringutil_vc9.vcproj
+stringutil_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname stringutilTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/stringutil_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/stringutil_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -17,14 +17,15 @@
coil_config.vsprops \
coil_distbuild.vsprops \
coil_vc8.sln \
- coil_vc9.sln
+ coil_vc9.sln \
+ coil_vc10.sln
#------------------------------------------------------------
# sln file build rules
#------------------------------------------------------------
win32_builddir = .
-sln: coil_vc8.sln coil_vc9.sln
+sln: coil_vc8.sln coil_vc9.sln coil_vc10.sln
vcproj:
(cd coil ; make vcproj)
@@ -46,3 +47,11 @@
`find ./ -name '*_vc9.vcproj'`
qkc -ms coil_vc9.sln
+coil_vc10.sln: coil.sln.dep vcproj
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC10 \
+ --dep coil.sln.dep \
+ --out coil_vc10.sln \
+ `find ./ -name '*_vc10.vcxproj'`
+ qkc -ms coil_vc10.sln
+
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -74,6 +74,7 @@
rm -f *~
rm -f $(COIL_COMMON_SRC) $(COIL_COMMON_H)
rm -f *.vcproj
+ rm -f *.vcxproj
rm -f *.user
rm -f *.def
rm -f *.lst
@@ -83,6 +84,7 @@
$(COIL_ALL) \
libcoil_vc8.vcproj \
libcoil_vc9.vcproj \
+ libcoil_vc10.vcxproj \
libcoil.vcproj.yaml
#------------------------------------------------------------
@@ -97,7 +99,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: libcoil_vc8.vcproj libcoil_vc9.vcproj
+vcproj: libcoil_vc8.vcproj libcoil_vc9.vcproj libcoil_vc10.vcxproj
libcoil_vc8.vcproj: libcoil.vcproj.yaml $(COIL_ALL)
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -121,6 +123,17 @@
--header $(COIL_H)
qkc -sm $(win32_builddir)/libcoil_vc9.vcproj
+libcoil_vc10.vcxproj: libcoil.vcproj.yaml $(COIL_ALL)
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/libcoil_vc10.vcxproj \
+ --yaml libcoil.vcproj.yaml \
+ --source $(COIL_SRC) \
+ --header $(COIL_H)
+ qkc -sm $(win32_builddir)/libcoil_vc10.vcxproj
+
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -87,7 +87,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: ConfigurationProxy_vc8.vcproj ConfigurationProxy_vc9.vcproj
+vcproj: ConfigurationProxy_vc8.vcproj ConfigurationProxy_vc9.vcproj ConfigurationProxy_vc10.vcproj
ConfigurationProxy_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -113,4 +113,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/ConfigurationProxy_vc9.vcproj
+ConfigurationProxy_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname ConfigurationProxyTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/ConfigurationProxy_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/ConfigurationProxy_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextProxy/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextProxy/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextProxy/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -87,8 +87,9 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: ExecutionContextProxy_vc8.vcproj ExecutionContextProxy_vc9.vcproj
+vcproj: ExecutionContextProxy_vc8.vcproj ExecutionContextProxy_vc9.vcproj ExecutionContextProxy_vc10.vcproj
+
ExecutionContextProxy_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname ExecutionContextProxyTest \
@@ -114,3 +115,14 @@
qkc -sm $(win32_builddir)/ExecutionContextProxy_vc9.vcproj
+ExecutionContextProxy_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname ExecutionContextProxyTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/ExecutionContextProxy_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/ExecutionContextProxy_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -87,8 +87,9 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: OrganizationProxy_vc8.vcproj OrganizationProxy_vc9.vcproj
+vcproj: OrganizationProxy_vc8.vcproj OrganizationProxy_vc9.vcproj OrganizationProxy_vc10.vcproj
+
OrganizationProxy_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname OrganizationProxyTest \
@@ -114,3 +115,14 @@
qkc -sm $(win32_builddir)/OrganizationProxy_vc9.vcproj
+OrganizationProxy_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname OrganizationProxyTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/OrganizationProxy_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/OrganizationProxy_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/PortServiceProxy/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/PortServiceProxy/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/PortServiceProxy/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -88,8 +88,9 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: PortServiceProxy_vc8.vcproj PortServiceProxy_vc9.vcproj
+vcproj: PortServiceProxy_vc8.vcproj PortServiceProxy_vc9.vcproj PortServiceProxy_vc10.vcproj
+
PortServiceProxy_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname PortServiceProxyTest \
@@ -115,3 +116,15 @@
qkc -sm $(win32_builddir)/PortServiceProxy_vc9.vcproj
+PortServiceProxy_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname PortServiceProxyTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/PortServiceProxy_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/PortServiceProxy_vc10.vcproj
+
+
Modified: trunk/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -154,7 +154,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -178,6 +178,17 @@
--header $(SKEL_H)
qkc -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc9.vcproj
+vc10proj: libRTCSkel.vcproj.yaml
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type LIB \
+ --vcversion "10.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcproj \
+ --yaml libRTCSkel.vcproj.yaml \
+ --source $(SKEL_CPP) \
+ --header $(SKEL_H)
+ qkc -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcproj
+
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/rtm/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -101,7 +101,6 @@
RTC_SRC = \
- version.h \
$(UTIL_SRC) $(MGR_SRC) $(COMP_SRC) $(PORT_SRC)
@@ -165,7 +164,7 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj: libRTC.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -189,6 +188,17 @@
--header $(rtmheader_HEADERS)
qkc -sm $(win32_builddir)/rtm/libRTC_vc9.vcproj
+vc10proj: libRTC.vcproj.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "10.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/libRTC_vc10.vcxproj \
+ --yaml libRTC.vcproj.yaml \
+ --source $(RTC_SRC) \
+ --header $(rtmheader_HEADERS)
+ qkc -sm $(win32_builddir)/rtm/libRTC_vc10.vcxproj
+
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp 2011-05-09 04:46:15 UTC (rev 2086)
@@ -19,6 +19,10 @@
#include <rtm/SystemLogger.h>
#include <rtm/Manager.h>
+#if defined(_MSC_VER)
+#define snprintf _snprintf
+#endif
+
namespace RTC
{
const char* Logger::m_levelString[] =
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -213,7 +213,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -237,6 +237,17 @@
--header $(SKEL_H)
qkc -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc9.vcproj
+vc10proj: libRTCSkel.vcproj.yaml
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type LIB \
+ --vcversion "10.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcxproj \
+ --yaml libRTCSkel.vcproj.yaml \
+ --source $(SKEL_CPP) \
+ --header $(SKEL_H)
+ qkc -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcxproj
+
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -199,7 +199,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: ManagerServant_vc8.vcproj ManagerServant_vc9.vcproj
+vcproj: ManagerServant_vc8.vcproj ManagerServant_vc9.vcproj ManagerServant_vc10.vcproj
ManagerServant_vc8.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -225,4 +225,15 @@
# --header $(TEST_H)
qkc -sm $(win32_builddir)/ManagerServant_vc9.vcproj
+ManagerServant_vc10.vcproj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --projectname ManagerServantTest \
+ --type EXE \
+ --vcversion "10.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/ManagerServant_vc10.vcproj \
+ --yaml ../coil_test.vcproj.yaml \
+ --source $(TEST_SRC)
+ qkc -sm $(win32_builddir)/ManagerServant_vc10.vcproj
+
Modified: trunk/OpenRTM-aist/utils/rtcd/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/rtcd/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/utils/rtcd/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -29,7 +29,7 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj: rtcd.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -52,6 +52,16 @@
--yaml rtcd.yaml \
--source $(rtcd_SOURCES)
# qkc -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) \
+ --out $(win32_builddir)/utils/rtcd/rtcd_vc10.vcxproj \
+ --yaml rtcd.yaml \
+ --source $(rtcd_SOURCES)
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: trunk/OpenRTM-aist/utils/rtcprof/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/rtcprof/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/utils/rtcprof/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -29,7 +29,7 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj: rtcprof.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -52,6 +52,16 @@
--yaml rtcprof.yaml \
--source $(rtcprof_SOURCES)
# qkc -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) \
+ --out $(win32_builddir)/utils/rtcprof/rtcprof_vc10.vcxproj \
+ --yaml rtcprof.yaml \
+ --source $(rtcprof_SOURCES)
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -12,9 +12,11 @@
rm -rf components
rm -f coil_distbuild.vsprops
rm -f coil_config.vsprops
+ rm -f coil_distbuild.props
+ rm -f coil_config.props
-sln: OpenRTM-aist_vc8.sln OpenRTM-aist_vc9.sln
+sln: OpenRTM-aist_vc8.sln OpenRTM-aist_vc9.sln OpenRTM-aist_vc10.sln
OpenRTM-aist_vc8.sln: OpenRTM-aist.sln.dep
$(top_srcdir)/build/slntool.py \
@@ -32,14 +34,29 @@
`find ./ -name '*_vc9.vcproj' \! -name 'USB*.vcproj'`
qkc -ms OpenRTM-aist_vc9.sln
-vsprops: coil_distbuild.vsprops coil_config.vsprops
+OpenRTM-aist_vc10.sln:
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC10 \
+ --dep OpenRTM-aist.sln.dep \
+ --out OpenRTM-aist_vc10.sln \
+ `find ./ -name '*_vc10.vcxproj' \! -name 'USB*.vcxproj'`
+ qkc -ms OpenRTM-aist_vc10.sln
+vsprops: coil_distbuild.vsprops coil_config.vsprops coil_distbuild.props coil_config.props
+
+
coil_distbuild.vsprops:
cp -p $(top_srcdir)/src/lib/coil/win32/coil_distbuild.vsprops .
coil_config.vsprops:
cp -p $(top_srcdir)/src/lib/coil/win32/coil_config.vsprops .
+coil_distbuild.props:
+ cp -p $(top_srcdir)/src/lib/coil/win32/coil_distbuild.props .
+
+coil_config.props:
+ cp -p $(top_srcdir)/src/lib/coil/win32/coil_config.props .
+
dist-hook: clean-local sln vsprops
EXTRA_DIST = \
@@ -47,6 +64,7 @@
RunAtFirst.py \
autobuild_vc8.bat \
autobuild_vc9.bat \
+ autobuild_vc10.bat \
rtm_distbuild.vsprops \
coil_distbuild.vsprops \
coil_config.vsprops
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/coil/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/coil/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/coil/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -7,12 +7,13 @@
clean-local:
rm -rf Debug Release
rm -f *~ *.idl *.cpp *.h *.cc *.hh
- rm -f *.sln *.suo *.ncb *.user *.vcproj *.def
+ rm -f *.sln *.suo *.ncb *.user *.vcproj *.def *.vcxproj
src:
cp -p $(top_srcdir)/src/lib/coil/win32/coil/*.cpp .
cp -p $(top_srcdir)/src/lib/coil/win32/coil/*.h .
cp -p $(top_srcdir)/src/lib/coil/win32/coil/*.vcproj .
+ cp -p $(top_srcdir)/src/lib/coil/win32/coil/*.vcxproj .
dist-hook: src
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -21,4 +21,5 @@
etc.yaml \
rtm_config_omni407.vsprops \
rtm_config_omni412.vsprops \
- rtm_config_omni414.vsprops
+ rtm_config_omni414.vsprops \
+ rtm_config_omni414.props
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am 2011-05-09 04:46:15 UTC (rev 2086)
@@ -7,10 +7,10 @@
clean-local:
rm -rf USBCameraAcquire USBCameraAcquireComp
rm -rf USBCameraMonitor USBCameraMonitorComp
- rm -rf *.vcproj *.user *.ncb *.suo *.sln *.lst
+ rm -rf *.vcproj *.user *.ncb *.suo *.sln *.lst *.vcxproj
-vcproj: vc8proj vc9proj
+vcproj: vc8proj vc9proj vc10proj
vc8proj: USBCameraAcquireComp_vc8.vcproj USBCameraAcquire_vc8.vcproj \
USBCameraMonitorComp_vc8.vcproj USBCameraMonitor_vc8.vcproj
@@ -18,6 +18,9 @@
vc9proj: USBCameraAcquireComp_vc9.vcproj USBCameraAcquire_vc9.vcproj\
USBCameraMonitorComp_vc9.vcproj USBCameraMonitor_vc9.vcproj
+vc10proj: USBCameraAcquireComp_vc10.vcxproj USBCameraAcquire_vc10.vcxproj\
+ USBCameraMonitorComp_vc10.vcxproj USBCameraMonitor_vc10.vcxproj
+
USBCameraAcquireComp_vc8.vcproj:
$(top_srcdir)/build/vcprojtool.py vcproj \
--type RTCEXE \
@@ -100,8 +103,49 @@
--header USBCameraMonitor.h
qkc -sm USBCameraMonitor_vc9.vcproj
-sln: USBCamera_vc8.sln USBCamera_vc9.sln
+USBCameraAcquireComp_vc10.vcxproj:
+ $(top_srcdir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "10.00" \
+ --projectname "USBCameraAcquireComp" \
+ --version $(RTM_VERSION) \
+ --out USBCameraAcquireComp_vc10.vcxproj \
+ --source USBCameraAcquire.cpp USBCameraAcquireComp.cpp \
+ --header USBCameraAcquire.h
+ qkc -sm USBCameraAcquireComp_vc10.vcxproj
+USBCameraAcquire_vc10.vcxproj:
+ $(top_srcdir)/build/vcxprojtool.py vcxproj \
+ --type RTCDLL \
+ --vcversion "10.00" \
+ --projectname "USBCameraAcquire" \
+ --version $(RTM_VERSION) \
+ --out USBCameraAcquire_vc10.vcxproj \
+ --source USBCameraAcquire.cpp \
+ --header USBCameraAcquire.h
+ qkc -sm USBCameraAcquire_vc10.vcxproj
+USBCameraMonitorComp_vc10.vcxproj:
+ $(top_srcdir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "10.00" \
+ --projectname "USBCameraMonitorComp" \
+ --version $(RTM_VERSION) \
+ --out USBCameraMonitorComp_vc10.vcxproj \
+ --source USBCameraMonitor.cpp USBCameraMonitorComp.cpp \
+ --header USBCameraMonitor.h
+ qkc -sm USBCameraMonitorComp_vc10.vcxproj
+USBCameraMonitor_vc10.vcxproj:
+ $(top_srcdir)/build/vcxprojtool.py vcxproj \
+ --type RTCDLL \
+ --vcversion "10.00" \
+ --projectname "USBCameraMonitor" \
+ --version $(RTM_VERSION) \
+ --out USBCameraMonitor_vc10.vcxproj \
+ --source USBCameraMonitor.cpp \
+ --header USBCameraMonitor.h
+ qkc -sm USBCameraMonitor_vc10.vcxproj
+sln: USBCamera_vc8.sln USBCamera_vc9.sln USBCamera_vc10.sln
+
USBCamera_vc8.sln: vc8proj
$(top_srcdir)/build/slntool.py \
--vcversion VC8 \
@@ -116,6 +160,13 @@
`find ./ -name '*_vc9.vcproj'`
qkc -ms USBCamera_vc9.sln
+USBCamera_vc10.sln: vc10proj
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC10 \
+ --out USBCamera_vc10.sln \
+ `find ./ -name '*_vc10.vcxproj'`
+ qkc -ms USBCamera_vc10.sln
+
dist-hook: vcproj sln lst
EXTRA_DIST = \
@@ -130,12 +181,17 @@
USBCameraAcquireComp_vc8.vcproj \
USBCameraAcquire_vc9.vcproj \
USBCameraAcquireComp_vc9.vcproj \
+ USBCameraAcquire_vc10.vcxproj \
+ USBCameraAcquireComp_vc10.vcxproj \
USBCameraMonitor_vc8.vcproj \
USBCameraMonitorComp_vc8.vcproj \
USBCameraMonitor_vc9.vcproj \
USBCameraMonitorComp_vc9.vcproj \
+ USBCameraMonitor_vc10.vcxproj \
+ USBCameraMonitorComp_vc10.vcxproj \
USBCamera_vc8.sln \
USBCamera_vc9.sln \
+ USBCamera_vc10.sln \
rtc.conf
lst:
openrtm-commit メーリングリストの案内