[openrtm-commit:02962] r3098 - in branches/RELENG_1_2/OpenRTM-aist: . examples/AutoTest examples/Composite examples/ConfigSample examples/ExtTrigger examples/SeqIO examples/SimpleIO examples/SimpleService src/ext/ec/logical_time src/ext/ec/logical_time/example src/ext/local_service/nameservice_file src/ext/sdo/observer src/lib/coil/ace src/lib/coil/ace/coil src/lib/coil/tests src/lib/coil/tests/AsyncInvoker 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/TimeMeasure 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/ext src/lib/rtm/idl src/lib/rtm/tests/ManagerServant utils/rtcd utils/rtcprof win32/OpenRTM-aist win32/OpenRTM-aist/bin win32/OpenRTM-aist/cmake win32/OpenRTM-aist/docs win32/OpenRTM-aist/etc win32/OpenRTM-aist/examples win32/OpenRTM-aist/examples/ExtTrigger win32/OpenRTM-aist/examples/USBCamera win32/OpenRTM-aist/ext/ec win32/OpenRTM-aist/ext/local_service win32/OpenRTM-aist/ext/sdo win32/OpenRTM-aist/utils/rtc-template
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 12月 10日 (日) 09:05:43 JST
Author: n-ando
Date: 2017-12-10 09:05:43 +0900 (Sun, 10 Dec 2017)
New Revision: 3098
Removed:
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.in
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/installer/
Modified:
branches/RELENG_1_2/OpenRTM-aist/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/configure.ac
branches/RELENG_1_2/OpenRTM-aist/examples/AutoTest/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/examples/Composite/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/examples/ConfigSample/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/examples/SeqIO/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/examples/SimpleIO/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/examples/SimpleService/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/ext/local_service/nameservice_file/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/ace/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/ace/coil/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/AsyncInvoker/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Condition/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/DynamicLib/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Factory/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/File/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Guard/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Listener/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Logger/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Mutex/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/OS/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/PeriodicTask/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Properties/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Signal/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Singleton/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Task/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Time/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/TimeMeasure/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/TimeValue/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Timer/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/stringutil/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextProxy/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/PortServiceProxy/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/utils/rtcd/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/utils/rtcprof/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/bin/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/docs/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/utils/rtc-template/Makefile.am
Log:
merged changes from trunk/OpenRTM-aist r2807-2812 during 2016-12:
[compat,bugfix,->RELENG_1_2] Definition of version.h has been modified. refs #3734
[compat,bugfix,->RELENG_1_2] Delete unnecessary file. refs #3709
[compat,->RELENG_1_2] Installer creation process has been deleted. refs #3436
[compat,->RELENG_1_2] Include guard has been added to version.h. refs #3734
[compat,->RELENG_1_2] Project file generation processing for Visual Studio has been organized. refs #3742
[compat,->RELENG_1_2] Setting for Visual Studio vc8 have been deleted. refs #3742
Modified: branches/RELENG_1_2/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -9,6 +9,8 @@
SUBDIRS = build src utils examples etc $(DOCS) win32
+export VC_VERSION := 10 11 12 14
+
DIST_SUBDIRS = packages $(SUBDIRS)
EXTRA_DIST = \
Modified: branches/RELENG_1_2/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/configure.ac 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/configure.ac 2017-12-10 00:05:43 UTC (rev 3098)
@@ -1712,8 +1712,6 @@
win32/OpenRTM-aist/rtm/ext/Makefile
win32/OpenRTM-aist/rtm/idl/Makefile
win32/OpenRTM-aist/rtm/idl/device_interfaces/Makefile
- win32/OpenRTM-aist/installer/Makefile
- win32/OpenRTM-aist/installer/Bitmaps/Makefile
])
Modified: branches/RELENG_1_2/OpenRTM-aist/examples/AutoTest/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/examples/AutoTest/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/examples/AutoTest/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -138,50 +138,8 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/AutoTest
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "AutoTestInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestIn_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(PROVIDER_COMP_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/AutoTestIn_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "AutoTestIn" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestInDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(PROVIDER_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/AutoTestInDll_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "AutoTestOutComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestOut_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -O- -sm $(win32_builddir)/AutoTestOut_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "AutoTestOut" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestOutDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -O- -sm $(win32_builddir)/AutoTestOutDll_vc8.vcproj
-
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
@@ -224,173 +182,49 @@
--header $(CONSUMER_H)
qkc -O- -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 -O- -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 -O- -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 -O- -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 -O- -sm $(win32_builddir)/AutoTestOutDll_vc10.vcxproj
-
-vc11proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "AutoTestInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestIn_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(PROVIDER_COMP_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/AutoTestIn_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "AutoTestIn" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestInDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(PROVIDER_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/AutoTestInDll_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "AutoTestOutComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestOut_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -O- -sm $(win32_builddir)/AutoTestOut_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "AutoTestOut" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestOutDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -O- -sm $(win32_builddir)/AutoTestOutDll_vc11.vcxproj
-
-vc12proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "AutoTestInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestIn_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(PROVIDER_COMP_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/AutoTestIn_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "AutoTestIn" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestInDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(PROVIDER_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/AutoTestInDll_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "AutoTestOutComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestOut_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -O- -sm $(win32_builddir)/AutoTestOut_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "AutoTestOut" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/AutoTestOutDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -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
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "AutoTestInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestIn_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(PROVIDER_COMP_SRC) \
+ --header $(PROVIDER_H) ; \
+ qkc -O- -sm $(win32_builddir)/AutoTestIn_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "AutoTestIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestInDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(PROVIDER_SRC) \
+ --header $(PROVIDER_H) ; \
+ qkc -O- -sm $(win32_builddir)/AutoTestInDll_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "AutoTestOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestOut_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H) ; \
+ qkc -O- -sm $(win32_builddir)/AutoTestOut_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "AutoTestOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/AutoTestOutDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H) ; \
+ qkc -O- -sm $(win32_builddir)/AutoTestOutDll_vc$${ver}.vcxproj ; \
+ done
dist-hook:
Modified: branches/RELENG_1_2/OpenRTM-aist/examples/Composite/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/examples/Composite/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/examples/Composite/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -113,81 +113,8 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/Composite
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "ControllerComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Controller_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source Controller.cpp ControllerComp.cpp \
- --header Controller.h
- qkc -O- -sm $(win32_builddir)/Controller_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "Controller" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ControllerDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source Controller.cpp \
- --header Controller.h
- qkc -O- -sm $(win32_builddir)/ControllerDll_vc8.vcproj
-
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "MotorComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Motor_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source Motor.cpp MotorComp.cpp \
- --header Motor.h
- qkc -O- -sm $(win32_builddir)/Motor_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "Motor" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MotorDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source Motor.cpp \
- --header Motor.h
- qkc -O- -sm $(win32_builddir)/MotorDll_vc8.vcproj
-
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "SensorComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Sensor_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source Sensor.cpp SensorComp.cpp \
- --header Sensor.h
- qkc -O- -sm $(win32_builddir)/Sensor_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "Sensor" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SensorDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source Sensor.cpp \
- --header Sensor.h
- qkc -O- -sm $(win32_builddir)/SensorDll_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "Composite" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Composite_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source Composite.cpp
- qkc -O- -sm $(win32_builddir)/Composite_vc8.vcproj
-
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
@@ -261,298 +188,81 @@
--source Composite.cpp
qkc -O- -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 -O- -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 -O- -sm $(win32_builddir)/ControllerDll_vc10.vcxproj
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "ControllerComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Controller_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Controller.cpp ControllerComp.cpp \
+ --header Controller.h ; \
+ qkc -O- -sm $(win32_builddir)/Controller_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "Controller" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ControllerDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Controller.cpp \
+ --header Controller.h ; \
+ qkc -O- -sm $(win32_builddir)/ControllerDll_vc$${ver}.vcxproj ; \
+ \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "MotorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Motor_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Motor.cpp MotorComp.cpp \
+ --header Motor.h ; \
+ qkc -O- -sm $(win32_builddir)/Motor_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "Motor" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MotorDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Motor.cpp \
+ --header Motor.h ; \
+ qkc -O- -sm $(win32_builddir)/MotorDll_vc$${ver}.vcxproj ; \
+ \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "SensorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Sensor_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Sensor.cpp SensorComp.cpp \
+ --header Sensor.h ; \
+ qkc -O- -sm $(win32_builddir)/Sensor_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "Sensor" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SensorDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source Sensor.cpp \
+ --header Sensor.h ; \
+ qkc -O- -sm $(win32_builddir)/SensorDll_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "Composite" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/Composite_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source Composite.cpp ; \
+ qkc -O- -sm $(win32_builddir)/Composite_vc$${ver}.vcxproj ; \
+ done
- $(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 -O- -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 -O- -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 -O- -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 -O- -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 -O- -sm $(win32_builddir)/Composite_vc10.vcxproj
-
-vc11proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "ControllerComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Controller_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source Controller.cpp ControllerComp.cpp \
- --header Controller.h
- qkc -O- -sm $(win32_builddir)/Controller_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "Controller" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ControllerDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source Controller.cpp \
- --header Controller.h
- qkc -O- -sm $(win32_builddir)/ControllerDll_vc11.vcxproj
-
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "MotorComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Motor_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source Motor.cpp MotorComp.cpp \
- --header Motor.h
- qkc -O- -sm $(win32_builddir)/Motor_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "Motor" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MotorDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source Motor.cpp \
- --header Motor.h
- qkc -O- -sm $(win32_builddir)/MotorDll_vc11.vcxproj
-
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "SensorComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Sensor_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source Sensor.cpp SensorComp.cpp \
- --header Sensor.h
- qkc -O- -sm $(win32_builddir)/Sensor_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "Sensor" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SensorDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source Sensor.cpp \
- --header Sensor.h
- qkc -O- -sm $(win32_builddir)/SensorDll_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "Composite" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Composite_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source Composite.cpp
- qkc -O- -sm $(win32_builddir)/Composite_vc11.vcxproj
-
-vc12proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "ControllerComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Controller_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source Controller.cpp ControllerComp.cpp \
- --header Controller.h
- qkc -O- -sm $(win32_builddir)/Controller_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "Controller" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ControllerDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source Controller.cpp \
- --header Controller.h
- qkc -O- -sm $(win32_builddir)/ControllerDll_vc12.vcxproj
-
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "MotorComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Motor_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source Motor.cpp MotorComp.cpp \
- --header Motor.h
- qkc -O- -sm $(win32_builddir)/Motor_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "Motor" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MotorDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source Motor.cpp \
- --header Motor.h
- qkc -O- -sm $(win32_builddir)/MotorDll_vc12.vcxproj
-
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "SensorComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Sensor_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source Sensor.cpp SensorComp.cpp \
- --header Sensor.h
- qkc -O- -sm $(win32_builddir)/Sensor_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "Sensor" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SensorDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source Sensor.cpp \
- --header Sensor.h
- qkc -O- -sm $(win32_builddir)/SensorDll_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "Composite" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/Composite_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source Composite.cpp
- qkc -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_2/OpenRTM-aist/examples/ConfigSample/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/examples/ConfigSample/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/examples/ConfigSample/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -70,30 +70,8 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/ConfigSample/
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "ConfigSampleComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConfigSample_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConfigSample.cpp ConfigSampleComp.cpp \
- --header ConfigSample.h VectorConvert.h
- qkc -O- -sm $(win32_builddir)/ConfigSample_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "ConfigSample" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConfigSampleDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source ConfigSample.cpp \
- --header ConfigSample.h VectorConvert.h
- qkc -O- -sm $(win32_builddir)/ConfigSampleDll_vc8.vcproj
-
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
@@ -116,94 +94,30 @@
--header ConfigSample.h VectorConvert.h
qkc -O- -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 -O- -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 -O- -sm $(win32_builddir)/ConfigSampleDll_vc10.vcxproj
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "ConfigSampleComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConfigSample_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConfigSample.cpp ConfigSampleComp.cpp \
+ --header ConfigSample.h VectorConvert.h ; \
+ qkc -O- -sm $(win32_builddir)/ConfigSample_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "ConfigSample" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConfigSampleDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConfigSample.cpp \
+ --header ConfigSample.h VectorConvert.h ; \
+ qkc -O- -sm $(win32_builddir)/ConfigSampleDll_vc$${ver}.vcxproj ; \
+ done
-vc11proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "ConfigSampleComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConfigSample_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConfigSample.cpp ConfigSampleComp.cpp \
- --header ConfigSample.h VectorConvert.h
- qkc -O- -sm $(win32_builddir)/ConfigSample_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "ConfigSample" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConfigSampleDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source ConfigSample.cpp \
- --header ConfigSample.h VectorConvert.h
- qkc -O- -sm $(win32_builddir)/ConfigSampleDll_vc11.vcxproj
-
-vc12proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "ConfigSampleComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConfigSample_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConfigSample.cpp ConfigSampleComp.cpp \
- --header ConfigSample.h VectorConvert.h
- qkc -O- -sm $(win32_builddir)/ConfigSample_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "ConfigSample" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConfigSampleDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source ConfigSample.cpp \
- --header ConfigSample.h VectorConvert.h
- qkc -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_2/OpenRTM-aist/examples/ExtTrigger/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -73,58 +73,8 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/ExtTrigger
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "ExtConsoleInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleIn_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConsoleIn.cpp ConsoleInComp.cpp \
- --header ConsoleIn.h
- qkc -O- -sm $(win32_builddir)/ConsoleIn_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "ExtConsoleIn" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleInDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source ConsoleIn.cpp \
- --header ConsoleIn.h
- qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "ExtConsoleOutComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleOut_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConsoleOut.cpp ConsoleOutComp.cpp \
- --header ConsoleOut.h
- qkc -O- -sm $(win32_builddir)/ConsoleOut_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "ExtConsoleOut" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleOutDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source ConsoleOut.cpp \
- --header ConsoleOut.h
- qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "ExtConnectorComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConnectorComp_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConnectorComp.cpp
-
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
@@ -175,206 +125,58 @@
--yaml ../rtc.vcproj.yaml \
--source ConnectorComp.cpp
-vc10proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "10.00" \
- --projectname "ExtConsoleInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleIn_vc10.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConsoleIn.cpp ConsoleInComp.cpp \
- --header ConsoleIn.h
- qkc -O- -sm $(win32_builddir)/ConsoleIn_vc10.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "10.00" \
- --projectname "ExtConsoleIn" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleInDll_vc10.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source ConsoleIn.cpp \
- --header ConsoleIn.h
- qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc10.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "10.00" \
- --projectname "ExtConsoleOutComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleOut_vc10.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConsoleOut.cpp ConsoleOutComp.cpp \
- --header ConsoleOut.h
- qkc -O- -sm $(win32_builddir)/ConsoleOut_vc10.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "10.00" \
- --projectname "ExtConsoleOut" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleOutDll_vc10.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source ConsoleOut.cpp \
- --header ConsoleOut.h
- qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc10.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "10.00" \
- --projectname "ExtConnectorComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConnectorComp_vc10.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConnectorComp.cpp
-
-vc11proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "ExtConsoleInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleIn_vc11.vcxproj \
- --yaml ../rtc.vcproj.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 "ExtConsoleIn" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleInDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.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 "ExtConsoleOutComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleOut_vc11.vcxproj \
- --yaml ../rtc.vcproj.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 "ExtConsoleOut" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleOutDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source ConsoleOut.cpp \
- --header ConsoleOut.h
- qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "ExtConnectorComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConnectorComp_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConnectorComp.cpp
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "ExtConsoleInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleIn_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleIn.cpp ConsoleInComp.cpp \
+ --header ConsoleIn.h ; \
+ qkc -O- -sm $(win32_builddir)/ConsoleIn_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "ExtConsoleIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleInDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleIn.cpp \
+ --header ConsoleIn.h ; \
+ qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "ExtConsoleOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOut_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleOut.cpp ConsoleOutComp.cpp \
+ --header ConsoleOut.h ; \
+ qkc -O- -sm $(win32_builddir)/ConsoleOut_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "ExtConsoleOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOutDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleOut.cpp \
+ --header ConsoleOut.h ; \
+ qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp ; \
+ done
-vc12proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "ExtConsoleInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleIn_vc12.vcxproj \
- --yaml ../rtc.vcproj.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 "ExtConsoleIn" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleInDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.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 "ExtConsoleOutComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleOut_vc12.vcxproj \
- --yaml ../rtc.vcproj.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 "ExtConsoleOut" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleOutDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source ConsoleOut.cpp \
- --header ConsoleOut.h
- qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "ExtConnectorComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConnectorComp_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConnectorComp.cpp
-
-vc14proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "14.00" \
- --projectname "ExtConsoleInComp" \
- --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 "ExtConsoleIn" \
- --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 "ExtConsoleOutComp" \
- --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 "ExtConsoleOut" \
- --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
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "14.00" \
- --projectname "ExtConnectorComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConnectorComp_vc14.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConnectorComp.cpp
-
dist-hook: lst vcproj
clean-local:
Modified: branches/RELENG_1_2/OpenRTM-aist/examples/SeqIO/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/examples/SeqIO/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/examples/SeqIO/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -86,50 +86,8 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SeqIO
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "SeqInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqIn_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source SeqIn.cpp SeqInComp.cpp \
- --header SeqIn.h
- qkc -O- -sm $(win32_builddir)/SeqIn_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "SeqIn" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqInDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source SeqIn.cpp \
- --header SeqIn.h
- qkc -O- -sm $(win32_builddir)/SeqInDll_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "SeqOutComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqOut_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source SeqOut.cpp SeqOutComp.cpp \
- --header SeqOut.h
- qkc -O- -sm $(win32_builddir)/SeqOut_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "SeqOut" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqOutDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source SeqOut.cpp \
- --header SeqOut.h
- qkc -O- -sm $(win32_builddir)/SeqOutDll_vc8.vcproj
-
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
@@ -172,174 +130,50 @@
--header SeqOut.h
qkc -O- -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 -O- -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 -O- -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 -O- -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 -O- -sm $(win32_builddir)/SeqOutDll_vc10.vcxproj
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "SeqInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqIn_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source SeqIn.cpp SeqInComp.cpp \
+ --header SeqIn.h ; \
+ qkc -O- -sm $(win32_builddir)/SeqIn_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "SeqIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqInDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source SeqIn.cpp \
+ --header SeqIn.h ; \
+ qkc -O- -sm $(win32_builddir)/SeqInDll_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "SeqOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqOut_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source SeqOut.cpp SeqOutComp.cpp \
+ --header SeqOut.h ; \
+ qkc -O- -sm $(win32_builddir)/SeqOut_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "SeqOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/SeqOutDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source SeqOut.cpp \
+ --header SeqOut.h ; \
+ qkc -O- -sm $(win32_builddir)/SeqOutDll_vc$${ver}.vcxproj ; \
+ done
-vc11proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "SeqInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqIn_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source SeqIn.cpp SeqInComp.cpp \
- --header SeqIn.h
- qkc -O- -sm $(win32_builddir)/SeqIn_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "SeqIn" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqInDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source SeqIn.cpp \
- --header SeqIn.h
- qkc -O- -sm $(win32_builddir)/SeqInDll_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "SeqOutComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqOut_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source SeqOut.cpp SeqOutComp.cpp \
- --header SeqOut.h
- qkc -O- -sm $(win32_builddir)/SeqOut_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "SeqOut" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqOutDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source SeqOut.cpp \
- --header SeqOut.h
- qkc -O- -sm $(win32_builddir)/SeqOutDll_vc11.vcxproj
-
-vc12proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "SeqInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqIn_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source SeqIn.cpp SeqInComp.cpp \
- --header SeqIn.h
- qkc -O- -sm $(win32_builddir)/SeqIn_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "SeqIn" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqInDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source SeqIn.cpp \
- --header SeqIn.h
- qkc -O- -sm $(win32_builddir)/SeqInDll_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "SeqOutComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqOut_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source SeqOut.cpp SeqOutComp.cpp \
- --header SeqOut.h
- qkc -O- -sm $(win32_builddir)/SeqOut_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "SeqOut" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/SeqOutDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source SeqOut.cpp \
- --header SeqOut.h
- qkc -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_2/OpenRTM-aist/examples/SimpleIO/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/examples/SimpleIO/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/examples/SimpleIO/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -96,50 +96,8 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SimpleIO
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "ConsoleInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleIn_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConsoleIn.cpp ConsoleInComp.cpp \
- --header ConsoleIn.h
- qkc -O- -sm $(win32_builddir)/ConsoleIn_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "ConsoleIn" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleInDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source ConsoleIn.cpp \
- --header ConsoleIn.h
- qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "ConsoleOutComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleOut_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConsoleOut.cpp ConsoleOutComp.cpp \
- --header ConsoleOut.h
- qkc -O- -sm $(win32_builddir)/ConsoleOut_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "ConsoleOut" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleOutDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source ConsoleOut.cpp \
- --header ConsoleOut.h
- qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc8.vcproj
-
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
@@ -182,174 +140,50 @@
--header ConsoleOut.h
qkc -O- -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 -O- -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 -O- -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 -O- -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 -O- -sm $(win32_builddir)/ConsoleOutDll_vc10.vcxproj
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "ConsoleInComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleIn_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleIn.cpp ConsoleInComp.cpp \
+ --header ConsoleIn.h ; \
+ qkc -O- -sm $(win32_builddir)/ConsoleIn_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "ConsoleIn" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleInDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleIn.cpp \
+ --header ConsoleIn.h ; \
+ qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "ConsoleOutComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOut_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConsoleOut.cpp ConsoleOutComp.cpp \
+ --header ConsoleOut.h ; \
+ qkc -O- -sm $(win32_builddir)/ConsoleOut_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "ConsoleOut" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConsoleOutDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source ConsoleOut.cpp \
+ --header ConsoleOut.h ; \
+ qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc$${ver}.vcxproj ; \
+ done
-vc11proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "ConsoleInComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/ConsoleIn_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source ConsoleIn.cpp ConsoleInComp.cpp \
- --header ConsoleIn.h
- qkc -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.vcproj.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.vcproj.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.vcproj.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.vcproj.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.vcproj.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.vcproj.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.vcproj.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.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_2/OpenRTM-aist/examples/SimpleService/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/examples/SimpleService/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/examples/SimpleService/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -154,50 +154,8 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SimpleService
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "MyServiceProviderComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceProvider_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(PROVIDER_COMP_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/MyServiceProvider_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "MyServiceProvider" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceProviderDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(PROVIDER_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/MyServiceProviderDll_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "MyServiceConsumerComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceConsumer_vc8.vcproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -O- -sm $(win32_builddir)/MyServiceConsumer_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "MyServiceConsumer" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceConsumerDll_vc8.vcproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -O- -sm $(win32_builddir)/MyServiceConsumerDll_vc8.vcproj
-
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
@@ -240,174 +198,50 @@
--header $(CONSUMER_H)
qkc -O- -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 -O- -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 -O- -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 -O- -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 -O- -sm $(win32_builddir)/MyServiceConsumerDll_vc10.vcxproj
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "MyServiceProviderComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceProvider_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(PROVIDER_COMP_SRC) \
+ --header $(PROVIDER_H) ; \
+ qkc -O- -sm $(win32_builddir)/MyServiceProvider_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "MyServiceProvider" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceProviderDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(PROVIDER_SRC) \
+ --header $(PROVIDER_H) ; \
+ qkc -O- -sm $(win32_builddir)/MyServiceProviderDll_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "$${ver}.00" \
+ --projectname "MyServiceConsumerComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceConsumer_vc$${ver}.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H) ; \
+ qkc -O- -sm $(win32_builddir)/MyServiceConsumer_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "MyServiceConsumer" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/MyServiceConsumerDll_vc$${ver}.vcxproj \
+ --yaml ../rtcdll.vcproj.yaml \
+ --source $(CONSUMER_COMP_SRC) \
+ --header $(CONSUMER_H) ; \
+ qkc -O- -sm $(win32_builddir)/MyServiceConsumerDll_vc$${ver}.vcxproj ; \
+ done
-vc11proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "MyServiceProviderComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceProvider_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(PROVIDER_COMP_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/MyServiceProvider_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "MyServiceProvider" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceProviderDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(PROVIDER_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/MyServiceProviderDll_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "11.00" \
- --projectname "MyServiceConsumerComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceConsumer_vc11.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -O- -sm $(win32_builddir)/MyServiceConsumer_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "MyServiceConsumer" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceConsumerDll_vc11.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -O- -sm $(win32_builddir)/MyServiceConsumerDll_vc11.vcxproj
-
-vc12proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "MyServiceProviderComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceProvider_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(PROVIDER_COMP_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/MyServiceProvider_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "MyServiceProvider" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceProviderDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(PROVIDER_SRC) \
- --header $(PROVIDER_H)
- qkc -O- -sm $(win32_builddir)/MyServiceProviderDll_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type EXE \
- --vcversion "12.00" \
- --projectname "MyServiceConsumerComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceConsumer_vc12.vcxproj \
- --yaml ../rtc.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -O- -sm $(win32_builddir)/MyServiceConsumer_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "MyServiceConsumer" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/MyServiceConsumerDll_vc12.vcxproj \
- --yaml ../rtcdll.vcproj.yaml \
- --source $(CONSUMER_COMP_SRC) \
- --header $(CONSUMER_H)
- qkc -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_2/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -108,20 +108,8 @@
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/ec/logical_time
PROJNAME=LogicalTimeTriggeredEC
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(OBSERVER_WIN_SRC) \
- --header $(OBSERVER_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj
-
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
@@ -134,54 +122,20 @@
--header $(OBSERVER_WIN_H)
qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
-vc10proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "10.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(OBSERVER_WIN_SRC) \
- --header $(OBSERVER_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(OBSERVER_WIN_SRC) \
+ --header $(OBSERVER_WIN_H) ; \
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj ; \
+ done
-vc11proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(OBSERVER_WIN_SRC) \
- --header $(OBSERVER_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj
-
-vc12proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(OBSERVER_WIN_SRC) \
- --header $(OBSERVER_WIN_H)
- qkc -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_2/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -59,30 +59,8 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/LTTSample
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc9proj vc10proj
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type EXE \
- --vcversion "8.00" \
- --projectname "LTTSampleComp" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/LTTSample_vc8.vcproj \
- --yaml $(top_builddir)/examples/rtc.vcproj.yaml \
- --source LTTSample.cpp LTTSampleComp.cpp LogicalTimeTriggeredECStub.cpp \
- --header LTTSample.h LogicalTimeTriggeredECStub.h
- qkc -O- -sm $(win32_builddir)/LTTSample_vc8.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "LTTSample" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/LTTSampleDll_vc8.vcproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source LTTSample.cpp \
- --header LTTSample.h
- qkc -O- -sm $(win32_builddir)/LTTSampleDll_vc8.vcproj
-
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/local_service/nameservice_file/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/local_service/nameservice_file/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/local_service/nameservice_file/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -37,20 +37,8 @@
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/local_service/nameservice_file
PROJNAME=FileNameservice
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(FILENAMESERVICE_SRC) \
- --header $(FILENAMESERVICE_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj
-
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
@@ -63,54 +51,20 @@
--header $(FILENAMESERVICE_H)
qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
-vc10proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "10.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(FILENAMESERVICE_SRC) \
- --header $(FILENAMESERVICE_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(FILENAMESERVICE_SRC) \
+ --header $(FILENAMESERVICE_H) ; \
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj ; \
+ done
-vc11proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(FILENAMESERVICE_SRC) \
- --header $(FILENAMESERVICE_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj
-
-vc12proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(FILENAMESERVICE_SRC) \
- --header $(FILENAMESERVICE_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 $(FILENAMESERVICE_SRC) \
- --header $(FILENAMESERVICE_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc14.vcxproj
-
#dist-hook: vcproj
clean-local:
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -105,20 +105,8 @@
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/sdo/observer
PROJNAME=ComponentObserverConsumer
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(OBSERVER_WIN_SRC) \
- --header $(OBSERVER_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj
-
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
@@ -131,54 +119,20 @@
--header $(OBSERVER_WIN_H)
qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
-vc10proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "10.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(OBSERVER_WIN_SRC) \
- --header $(OBSERVER_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(OBSERVER_WIN_SRC) \
+ --header $(OBSERVER_WIN_H) ; \
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj ; \
+ done
-vc11proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(OBSERVER_WIN_SRC) \
- --header $(OBSERVER_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj
-
-vc12proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(OBSERVER_WIN_SRC) \
- --header $(OBSERVER_WIN_H)
- qkc -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_2/OpenRTM-aist/src/lib/coil/ace/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/ace/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/ace/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -16,7 +16,6 @@
coil_ace.sln.dep \
coil_config.vsprops \
coil_distbuild.vsprops \
- coil_ace_vc8.sln \
coil_ace_vc9.sln
#------------------------------------------------------------
@@ -24,20 +23,12 @@
#------------------------------------------------------------
win32_builddir = .
-sln: coil_ace_vc8.sln coil_ace_vc9.sln coil_ace_vc10.sln
+sln: coil_ace_vc9.sln coil_ace_vc10.sln
vcproj:
(cd coil ; make vcproj)
-coil_ace_vc8.sln: coil_ace.sln.dep vcproj
- $(top_srcdir)/build/slntool.py \
- --vcversion VC8 \
- --dep coil_ace.sln.dep \
- --out coil_ace_vc8.sln \
- `find ./ -name '*_vc8.vcproj'`
- qkc -O- -ms coil_ace_vc8.sln
-
coil_ace_vc9.sln: coil_ace.sln.dep vcproj
$(top_srcdir)/build/slntool.py \
--vcversion VC9 \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/ace/coil/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/ace/coil/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/ace/coil/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -97,19 +97,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: libcoil_vc8.vcproj libcoil_vc9.vcproj
+vcproj: libcoil_vc9.vcproj
-libcoil_vc8.vcproj: libcoil.vcproj.yaml $(COIL_ALL)
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/libcoil_vc8.vcproj \
- --yaml libcoil.vcproj.yaml \
- --source $(COIL_SRC) \
- --header $(COIL_H)
- qkc -O- -sm $(win32_builddir)/libcoil_vc8.vcproj
-
libcoil_vc9.vcproj: libcoil.vcproj.yaml $(COIL_ALL)
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/AsyncInvoker/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/AsyncInvoker/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/AsyncInvoker/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -56,20 +56,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: AsyncInvoker_vc8.vcproj AsyncInvoker_vc9.vcproj
+vcproj: AsyncInvoker_vc9.vcproj
-AsyncInvoker_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname AsyncInvokerTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/AsyncInvoker_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/AsyncInvoker_vc8.vcproj
-
AsyncInvoker_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname AsyncInvokerTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Condition/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Condition/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Condition/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -59,20 +59,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Condition_vc8.vcproj Condition_vc9.vcproj Condition_vc10.vcproj
+vcproj: Condition_vc9.vcproj Condition_vc10.vcproj
-Condition_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname ConditionTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Condition_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Condition_vc8.vcproj
-
Condition_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname ConditionTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/DynamicLib/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/DynamicLib/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/DynamicLib/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -69,20 +69,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: DynamicLib_vc8.vcproj DynamicLib_vc9.vcproj DynamicLib_vc10.vcproj DynamicLib_libDynamicLib_vc8.vcproj DynamicLib_libDynamicLib_vc9.vcproj DynamicLib_libDynamicLib_vc10.vcproj
+vcproj: DynamicLib_vc9.vcproj DynamicLib_vc10.vcproj DynamicLib_libDynamicLib_vc9.vcproj DynamicLib_libDynamicLib_vc10.vcproj
-DynamicLib_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname DynamicLibTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/DynamicLib_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/DynamicLib_vc8.vcproj
-
DynamicLib_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname DynamicLibTest \
@@ -106,19 +94,7 @@
--source $(TEST_SRC)
qkc -O- -sm $(win32_builddir)/DynamicLib_vc10.vcproj
-DynamicLib_libDynamicLib_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname DynamicLibTestDll \
- --type DLL \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/DynamicLib_libDynamicLib_vc8.vcproj \
- --yaml ../coil_test_dll.vcproj.yaml \
- --source $(libDynamicLib_la_SOURCES)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/DynamicLib_libDynamicLib_vc8.vcproj
-
DynamicLib_libDynamicLib_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname DynamicLibTestDll \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Factory/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Factory/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Factory/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -63,22 +63,9 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Factory_vc8.vcproj Factory_vc9.vcproj Factory_vc10.vcproj Factory_libPluginC_vc8.vcproj Factory_libPluginC_vc9.vcproj Factory_libPluginC_vc10.vcproj
+vcproj: Factory_vc9.vcproj Factory_vc10.vcproj Factory_libPluginC_vc9.vcproj Factory_libPluginC_vc10.vcproj
-
-Factory_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname FactoryTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Factory_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Factory_vc8.vcproj
-
Factory_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname FactoryTest \
@@ -102,19 +89,6 @@
--source $(TEST_SRC)
qkc -O- -sm $(win32_builddir)/Factory_vc10.vcproj
-Factory_libPluginC_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname FactoryTest_libPluginC \
- --type DLL \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Factory_libPluginC_vc8.vcproj \
- --yaml ./coil_test_dll.vcproj.yaml \
- --source $(libPluginC_la_SOURCES)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Factory_libPluginC_vc8.vcproj
-
-
Factory_libPluginC_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname FactoryTest_libPluginC \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/File/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/File/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/File/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -55,20 +55,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: File_vc8.vcproj File_vc9.vcproj File_vc10.vcproj
+vcproj: File_vc9.vcproj File_vc10.vcproj
-File_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname FileTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/File_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/File_vc8.vcproj
-
File_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname FileTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Guard/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Guard/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Guard/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -59,20 +59,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Guard_vc8.vcproj Guard_vc9.vcproj Guard_vc10.vcproj
+vcproj: Guard_vc9.vcproj Guard_vc10.vcproj
-Guard_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname GuardTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Guard_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Guard_vc8.vcproj
-
Guard_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname GuardTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Listener/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Listener/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Listener/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -56,20 +56,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Listener_vc8.vcproj Listener_vc9.vcproj Listener_vc10.vcproj
+vcproj: Listener_vc9.vcproj Listener_vc10.vcproj
-Listener_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname ListenerTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Listener_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Listener_vc8.vcproj
-
Listener_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname ListenerTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Logger/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Logger/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Logger/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -63,20 +63,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Logger_vc8.vcproj Logger_vc9.vcproj Logger_vc10.vcproj
+vcproj: Logger_vc9.vcproj Logger_vc10.vcproj
-Logger_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname LoggerTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Logger_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Logger_vc8.vcproj
-
Logger_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname LoggerTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -39,7 +39,6 @@
coil_test.vcproj.yaml \
coil_test.sln.dep \
coiltest_config.vsprops \
- coiltest_vc8.sln \
coiltest_vc9.sln
# coiltest_vc10.sln
@@ -48,21 +47,12 @@
#------------------------------------------------------------
win32_builddir = .
-#sln: coiltest_vc8.sln coiltest_vc9.sln coiltest_vc10.sln
-sln: coiltest_vc8.sln coiltest_vc9.sln
+sln: coiltest_vc9.sln
vcproj:
(for testdir in $(SUBDIRS) ; do cd $$testdir ; make vcproj ; cd .. ; done)
-coiltest_vc8.sln: coil_test.sln.dep vcproj
- $(top_srcdir)/build/slntool.py \
- --vcversion VC8 \
- --dep coil_test.sln.dep \
- --out coiltest_vc8.sln \
- `find ./ -name '*_vc8.vcproj'`
- qkc -O- -ms coiltest_vc8.sln
-
coiltest_vc9.sln: coil_test.sln.dep vcproj
$(top_srcdir)/build/slntool.py \
--vcversion VC9 \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Mutex/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Mutex/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Mutex/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -62,20 +62,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Mutex_vc8.vcproj Mutex_vc9.vcproj Mutex_vc10.vcproj
+vcproj: Mutex_vc9.vcproj Mutex_vc10.vcproj
-Mutex_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname MutexTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Mutex_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Mutex_vc8.vcproj
-
Mutex_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname MutexTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/OS/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/OS/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/OS/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -56,20 +56,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: OS_vc8.vcproj OS_vc9.vcproj OS_vc10.vcproj
+vcproj: OS_vc9.vcproj OS_vc10.vcproj
-OS_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname OSTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/OS_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/OS_vc8.vcproj
-
OS_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname OSTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/PeriodicTask/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/PeriodicTask/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/PeriodicTask/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -59,20 +59,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: PeriodicTask_vc8.vcproj PeriodicTask_vc9.vcproj PeriodicTask_vc10.vcproj
+vcproj: PeriodicTask_vc9.vcproj PeriodicTask_vc10.vcproj
-PeriodicTask_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname PeriodicTaskTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/PeriodicTask_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/PeriodicTask_vc8.vcproj
-
PeriodicTask_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname PeriodicTaskTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Properties/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Properties/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Properties/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -88,20 +88,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Properties_vc8.vcproj Properties_vc9.vcproj Properties_vc10.vcproj
+vcproj: Properties_vc9.vcproj Properties_vc10.vcproj
-Properties_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname PropertiesTaskTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Properties_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Properties_vc8.vcproj
-
Properties_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname PropertiesTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Signal/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Signal/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Signal/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -59,20 +59,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Signal_vc8.vcproj Signal_vc9.vcproj Signal_vc10.vcproj
+vcproj: Signal_vc9.vcproj Signal_vc10.vcproj
-Signal_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname SignalTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Signal_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Signal_vc8.vcproj
-
Signal_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname SignalTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Singleton/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Singleton/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Singleton/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -56,20 +56,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Singleton_vc8.vcproj Singleton_vc9.vcproj Singleton_vc10.vcproj
+vcproj: Singleton_vc9.vcproj Singleton_vc10.vcproj
-Singleton_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname SingletonTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Singleton_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Singleton_vc8.vcproj
-
Singleton_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname SingletonTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Task/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Task/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Task/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -59,20 +59,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Task_vc8.vcproj Task_vc9.vcproj Task_vc10.vcproj
+vcproj: Task_vc9.vcproj Task_vc10.vcproj
-Task_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname TaskTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Task_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Task_vc8.vcproj
-
Task_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname TaskTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Time/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Time/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Time/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -62,20 +62,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Time_vc8.vcproj Time_vc9.vcproj Time_vc10.vcproj
+vcproj: Time_vc9.vcproj Time_vc10.vcproj
-Time_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname TimeTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Time_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Time_vc8.vcproj
-
Time_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname TimeTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/TimeMeasure/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/TimeMeasure/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/TimeMeasure/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -58,20 +58,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: TimeMeasure_vc8.vcproj TimeMeasure_vc9.vcproj
+vcproj: TimeMeasure_vc9.vcproj
-TimeMeasure_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname TimeMeasureTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/TimeMeasure_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/TimeMeasure_vc8.vcproj
-
TimeMeasure_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname TimeMeasureTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/TimeValue/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/TimeValue/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/TimeValue/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -57,20 +57,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: TimeValue_vc8.vcproj TimeValue_vc9.vcproj TimeValue_vc10.vcproj
+vcproj: TimeValue_vc9.vcproj TimeValue_vc10.vcproj
-TimeValue_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname TimeValueTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/TimeValue_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/TimeValue_vc8.vcproj
-
TimeValue_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname TimeValueTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Timer/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Timer/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/Timer/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -61,20 +61,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: Timer_vc8.vcproj Timer_vc9.vcproj Timer_vc10.vcproj
+vcproj: Timer_vc9.vcproj Timer_vc10.vcproj
-Timer_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname TimerTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/Timer_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/Timer_vc8.vcproj
-
Timer_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname TimerTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/UUID/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -59,20 +59,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: UUID_vc8.vcproj UUID_vc9.vcproj UUID_vc10.vcproj
+vcproj: UUID_vc9.vcproj UUID_vc10.vcproj
-UUID_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname UUIDTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/UUID_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/UUID_vc8.vcproj
-
UUID_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname UUIDTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/stringutil/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/stringutil/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/tests/stringutil/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -54,20 +54,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: stringutil_vc8.vcproj stringutil_vc9.vcproj stringutil_vc10.vcproj
+vcproj: stringutil_vc9.vcproj stringutil_vc10.vcproj
-stringutil_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname stringutilTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/stringutil_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/stringutil_vc8.vcproj
-
stringutil_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname stringutilTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -18,7 +18,6 @@
coil_config.props \
coil_distbuild.vsprops \
coil_distbuild.props \
- coil_vc8.sln \
coil_vc9.sln \
coil_vc10.sln \
coil_vc11.sln \
@@ -30,20 +29,12 @@
#------------------------------------------------------------
win32_builddir = .
-sln: coil_vc8.sln coil_vc9.sln coil_vc10.sln coil_vc11.sln coil_vc12.sln coil_vc14.sln
+sln: coil_vc9.sln coil_vc10.sln coil_vc11.sln coil_vc12.sln coil_vc14.sln
vcproj:
(cd coil ; make vcproj)
-coil_vc8.sln: coil.sln.dep vcproj
- $(top_srcdir)/build/slntool.py \
- --vcversion VC8 \
- --dep coil.sln.dep \
- --out coil_vc8.sln \
- `find ./ -name '*_vc8.vcproj'`
- qkc -O- -ms coil_vc8.sln
-
coil_vc9.sln: coil.sln.dep vcproj
$(top_srcdir)/build/slntool.py \
--vcversion VC9 \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -84,7 +84,6 @@
EXTRA_DIST = \
$(COIL_ALL) \
- libcoil_vc8.vcproj \
libcoil_vc9.vcproj \
libcoil_vc10.vcxproj \
libcoil.vcproj.yaml
@@ -101,19 +100,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: libcoil_vc8.vcproj libcoil_vc9.vcproj libcoil_vc10.vcxproj libcoil_vc11.vcxproj libcoil_vc12.vcxproj libcoil_vc14.vcxproj
+vcproj: libcoil_vc9.vcproj libcoil.vcxproj
-libcoil_vc8.vcproj: libcoil.vcproj.yaml $(COIL_ALL)
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/libcoil_vc8.vcproj \
- --yaml libcoil.vcproj.yaml \
- --source $(COIL_SRC) \
- --header $(COIL_H)
- qkc -O- -sm $(win32_builddir)/libcoil_vc8.vcproj
-
libcoil_vc9.vcproj: libcoil.vcproj.yaml $(COIL_ALL)
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
@@ -125,59 +113,18 @@
--header $(COIL_H)
qkc -O- -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 -O- -sm $(win32_builddir)/libcoil_vc10.vcxproj
+libcoil.vcxproj: libcoil.vcproj.yaml $(COIL_ALL)
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/libcoil_vc$${ver}.vcxproj \
+ --yaml libcoil.vcproj.yaml \
+ --source $(COIL_SRC) \
+ --header $(COIL_H) ; \
+ qkc -O- -sm $(win32_builddir)/libcoil_vc$${ver}.vcxproj ; \
+ done
-libcoil_vc11.vcxproj: libcoil.vcproj.yaml $(COIL_ALL)
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/libcoil_vc11.vcxproj \
- --yaml libcoil.vcproj.yaml \
- --source $(COIL_SRC) \
- --header $(COIL_H)
- qkc -O- -sm $(win32_builddir)/libcoil_vc11.vcxproj
+dist-hook: lst vcproj
-libcoil_vc12.vcxproj: libcoil.vcproj.yaml $(COIL_ALL)
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/libcoil_vc12.vcxproj \
- --yaml libcoil.vcproj.yaml \
- --source $(COIL_SRC) \
- --header $(COIL_H)
- qkc -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
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/../../../build/makewxs.py flist \
- -c COILs \
- -o $(top_srcdir)/../../../win32/OpenRTM-aist/installer/coils.yaml \
- -p ..\\coil \
- $(COIL_H) $(COIL_SRC)
-
-dist-hook: lst vcproj wxs
-
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -87,20 +87,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: ConfigurationProxy_vc8.vcproj ConfigurationProxy_vc9.vcproj ConfigurationProxy_vc10.vcproj
+vcproj: ConfigurationProxy_vc9.vcproj ConfigurationProxy_vc10.vcproj
-ConfigurationProxy_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname ConfigurationProxyTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/ConfigurationProxy_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/ConfigurationProxy_vc8.vcproj
-
ConfigurationProxy_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname ConfigurationProxyTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextProxy/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextProxy/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextProxy/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -87,21 +87,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: ExecutionContextProxy_vc8.vcproj ExecutionContextProxy_vc9.vcproj ExecutionContextProxy_vc10.vcproj
+vcproj: ExecutionContextProxy_vc9.vcproj ExecutionContextProxy_vc10.vcproj
-
-ExecutionContextProxy_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname ExecutionContextProxyTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/ExecutionContextProxy_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/ExecutionContextProxy_vc8.vcproj
-
ExecutionContextProxy_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname ExecutionContextProxyTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/OrganizationProxy/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -87,21 +87,9 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: OrganizationProxy_vc8.vcproj OrganizationProxy_vc9.vcproj OrganizationProxy_vc10.vcproj
+vcproj: OrganizationProxy_vc9.vcproj OrganizationProxy_vc10.vcproj
-OrganizationProxy_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname OrganizationProxyTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/OrganizationProxy_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/OrganizationProxy_vc8.vcproj
-
OrganizationProxy_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname OrganizationProxyTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/PortServiceProxy/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/PortServiceProxy/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/PortServiceProxy/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -88,21 +88,9 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: PortServiceProxy_vc8.vcproj PortServiceProxy_vc9.vcproj PortServiceProxy_vc10.vcproj
+vcproj: PortServiceProxy_vc9.vcproj PortServiceProxy_vc10.vcproj
-PortServiceProxy_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname PortServiceProxyTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/PortServiceProxy_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/PortServiceProxy_vc8.vcproj
-
PortServiceProxy_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname PortServiceProxyTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -154,19 +154,8 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc9proj vc10proj
-vc8proj: libRTCSkel.vcproj.yaml
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type LIB \
- --vcversion "8.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libRTCSkel_vc8.vcproj \
- --yaml libRTCSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc8.vcproj
-
vc9proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
--type LIB \
@@ -189,17 +178,8 @@
--header $(SKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcproj
-#------------------------------------------------------------
-# for wxs file
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c IDLs \
- -o $(win32_builddir)installer/idls.yaml \
- -p ..\\rtm\\idl \
- $(IDL_SOURCES) $(ALL_SRC)
-dist-hook: lst vcproj wxs
+dist-hook: lst vcproj
# Cleanup
clean-local:
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -15,13 +15,18 @@
# version.h would be generated from configure before lib build process.
BUILT_SOURCES = version.h version.txt config_rtc.h.org
-version.h:
+version.h: Makefile.am Makefile.in
echo '// This header file is automatically generated.' > $@
echo '// Do not edit this file.' >> $@
echo '' >> $@
+ echo '#ifndef INCLUDE_GUARD_VERSION_H' >> $@
+ echo '#define INCLUDE_GUARD_VERSION_H' >> $@
+ echo '' >> $@
echo 'static const char* openrtm_name = "'${PACKAGE}'-'${VERSION}'";' >> $@
echo 'static const char* openrtm_version = "'${VERSION}'";' >> $@
echo 'static const char* corba_name = "'${ORB}'";' >> $@
+ echo '' >> $@
+ echo '#endif // INCLUDE_GUARD_VERSION_H' >> $@
version.txt:
echo 'name = '${PACKAGE}'-'${VERSION} >> $@
@@ -180,19 +185,8 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj: libRTC.vcproj.yaml
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/libRTC_vc8.vcproj \
- --yaml libRTC.vcproj.yaml \
- --source $(RTC_SRC) \
- --header $(rtmheader_HEADERS)
- qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc8.vcproj
-
vc9proj: libRTC.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
@@ -204,71 +198,28 @@
--header $(rtmheader_HEADERS)
qkc -O- -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 -O- -sm $(win32_builddir)/rtm/libRTC_vc10.vcxproj
+vcxproj: libRTC.vcproj.yaml
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/libRTC_vc$${ver}.vcxproj \
+ --yaml libRTC.vcproj.yaml \
+ --source $(RTC_SRC) \
+ --header $(rtmheader_HEADERS) ; \
+ qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc$${ver}.vcxproj ; \
+ done
-vc11proj: libRTC.vcproj.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/libRTC_vc11.vcxproj \
- --yaml libRTC.vcproj.yaml \
- --source $(RTC_SRC) \
- --header $(rtmheader_HEADERS)
- qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc11.vcxproj
+dist-hook: lst vcproj
-vc12proj: libRTC.vcproj.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/libRTC_vc12.vcxproj \
- --yaml libRTC.vcproj.yaml \
- --source $(RTC_SRC) \
- --header $(rtmheader_HEADERS)
- qkc -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
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c Headers \
- -o $(win32_builddir)installer/headers.yaml \
- -p ..\\rtm \
- *.h version.txt
-
-
-
-dist-hook: lst vcproj wxs
-
clean-local:
rm -f config_rtc.h.org
rm -f *~ Makefile.old *core
rm -f *.lst
rm -f *.gch *.bak *.rpo *.sym lib*.*_pure_*
+ rm -f version.h version.txt
-
EXTRA_DIST = \
$(rtmheader_HEADERS) \
libRTC.vcproj.yaml
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ext/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -182,7 +182,7 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
vc9proj: librtmManipulator.vcproj.yaml librtmCamera.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -204,99 +204,30 @@
--header $(CAMERASKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/ext/librtmCamera_vc9.vcproj
-vc10proj: librtmManipulator.vcproj.yaml librtmCamera.vcproj.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "10.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/ext/librtmManipulator_vc10.vcxproj \
- --yaml librtmManipulator.vcproj.yaml \
- --source $(MANIPULATORSKEL_CPP) \
- --header $(MANIPULATORSKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/ext/librtmManipulator_vc10.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "10.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/ext/librtmCamera_vc10.vcxproj \
- --yaml librtmCamera.vcproj.yaml \
- --source $(CAMERASKEL_CPP) \
- --header $(CAMERASKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/ext/librtmCamera_vc10.vcxproj
+vcxproj: librtmManipulator.vcproj.yaml librtmCamera.vcproj.yaml
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/ext/librtmManipulator_vc$${ver}.vcxproj \
+ --yaml librtmManipulator.vcproj.yaml \
+ --source $(MANIPULATORSKEL_CPP) \
+ --header $(MANIPULATORSKEL_H) ; \
+ qkc -O- -sm $(win32_builddir)/rtm/ext/librtmManipulator_vc$${ver}.vcxproj ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/ext/librtmCamera_vc$${ver}.vcxproj \
+ --yaml librtmCamera.vcproj.yaml \
+ --source $(CAMERASKEL_CPP) \
+ --header $(CAMERASKEL_H) ; \
+ qkc -O- -sm $(win32_builddir)/rtm/ext/librtmCamera_vc$${ver}.vcxproj ; \
+ done
-vc11proj: librtmManipulator.vcproj.yaml librtmCamera.vcproj.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/ext/librtmManipulator_vc11.vcxproj \
- --yaml librtmManipulator.vcproj.yaml \
- --source $(MANIPULATORSKEL_CPP) \
- --header $(MANIPULATORSKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/ext/librtmManipulator_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/ext/librtmCamera_vc11.vcxproj \
- --yaml librtmCamera.vcproj.yaml \
- --source $(CAMERASKEL_CPP) \
- --header $(CAMERASKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/ext/librtmCamera_vc11.vcxproj
+dist-hook: lst vcproj
-vc12proj: librtmManipulator.vcproj.yaml librtmCamera.vcproj.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/ext/librtmManipulator_vc12.vcxproj \
- --yaml librtmManipulator.vcproj.yaml \
- --source $(MANIPULATORSKEL_CPP) \
- --header $(MANIPULATORSKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/ext/librtmManipulator_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/ext/librtmCamera_vc12.vcxproj \
- --yaml librtmCamera.vcproj.yaml \
- --source $(CAMERASKEL_CPP) \
- --header $(CAMERASKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/ext/librtmCamera_vc12.vcxproj
-
-vc14proj: librtmManipulator.vcproj.yaml librtmCamera.vcproj.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "14.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/ext/librtmManipulator_vc14.vcxproj \
- --yaml librtmManipulator.vcproj.yaml \
- --source $(MANIPULATORSKEL_CPP) \
- --header $(MANIPULATORSKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/ext/librtmManipulator_vc14.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "14.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/ext/librtmCamera_vc14.vcxproj \
- --yaml librtmCamera.vcproj.yaml \
- --source $(CAMERASKEL_CPP) \
- --header $(CAMERASKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/ext/librtmCamera_vc14.vcxproj
-
-
-#------------------------------------------------------------
-# for wxs file
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c IDLs \
- -o $(win32_builddir)installer/idls.yaml \
- -p ..\\rtm\\idl \
- $(IDL_SOURCES) $(ALL_SRC)
-
-dist-hook: lst vcproj wxs
-
# Cleanup
clean-local:
rm -f $(ALL_SRC) *~ *.core *.lst Makefile.old *.h *.c
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -219,19 +219,8 @@
#------------------------------------------------------------
win32_builddir=$(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj: libRTCSkel.vcproj.yaml
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type LIB \
- --vcversion "8.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libRTCSkel_vc8.vcproj \
- --yaml libRTCSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc8.vcproj
-
vc9proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
--type LIB \
@@ -243,59 +232,20 @@
--header $(SKEL_H)
qkc -O- -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 -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcxproj
-
-vc11proj: libRTCSkel.vcproj.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
- --vcversion "11.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libRTCSkel_vc11.vcxproj \
- --yaml libRTCSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc11.vcxproj
-
-vc12proj: libRTCSkel.vcproj.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
- --vcversion "12.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libRTCSkel_vc12.vcxproj \
- --yaml libRTCSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc12.vcxproj
-vc14proj: libRTCSkel.vcproj.yaml
+vcxproj: libRTCSkel.vcproj.yaml
+ for ver in $(VC_VERSION); do \
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type LIB \
- --vcversion "14.00" \
+ --vcversion "$${ver}.00" \
--version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libRTCSkel_vc14.vcxproj \
+ --out $(win32_builddir)/rtm/idl/libRTCSkel_vc$${ver}.vcxproj \
--yaml libRTCSkel.vcproj.yaml \
--source $(SKEL_CPP) \
- --header $(SKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc14.vcxproj
-#------------------------------------------------------------
-# for wxs file
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c IDLs \
- -o $(win32_builddir)installer/idls.yaml \
- -p ..\\rtm\\idl \
- $(IDL_SOURCES) $(ALL_SRC)
+ --header $(SKEL_H) ; \
+ qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc$${ver}.vcxproj ; \
+ done
-dist-hook: lst vcproj wxs
+dist-hook: lst vcproj
# Cleanup
clean-local:
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -225,20 +225,8 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: ManagerServant_vc8.vcproj ManagerServant_vc9.vcproj ManagerServant_vc10.vcproj
+vcproj: ManagerServant_vc9.vcproj ManagerServant_vc10.vcproj
-ManagerServant_vc8.vcproj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --projectname ManagerServantTest \
- --type EXE \
- --vcversion "8.00" \
- --version $(COIL_VERSION) \
- --out $(win32_builddir)/ManagerServant_vc8.vcproj \
- --yaml ../coil_test.vcproj.yaml \
- --source $(TEST_SRC)
-# --header $(TEST_H)
- qkc -O- -sm $(win32_builddir)/ManagerServant_vc8.vcproj
-
ManagerServant_vc9.vcproj:
$(top_builddir)/build/vcprojtool.py vcproj \
--projectname ManagerServantTest \
Modified: branches/RELENG_1_2/OpenRTM-aist/utils/rtcd/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/utils/rtcd/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/utils/rtcd/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -29,19 +29,8 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj: rtcd.yaml
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type RTCEXE \
- --vcversion "8.00" \
- --projectname "rtcd" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/utils/rtcd/rtcd_vc8.vcproj \
- --yaml rtcd.yaml \
- --source $(rtcd_SOURCES)
-# qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc8.vcproj
-
vc9proj: rtcd.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
--type RTCEXE \
@@ -51,60 +40,21 @@
--out $(win32_builddir)/utils/rtcd/rtcd_vc9.vcproj \
--yaml rtcd.yaml \
--source $(rtcd_SOURCES)
-# qkc -O- -sm $(win32_builddir)/rtm/rtcd_vc9.vcproj
-vc10proj: rtcd.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type RTCEXE \
- --vcversion "10.00" \
- --projectname "rtcd" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/utils/rtcd/rtcd_vc10.vcxproj \
- --yaml rtcd.yaml \
- --source $(rtcd_SOURCES)
+vcxproj: rtcd.yaml
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "$${ver}.00" \
+ --projectname "rtcd" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/utils/rtcd/rtcd_vc$${ver}.vcxproj \
+ --yaml rtcd.yaml \
+ --source $(rtcd_SOURCES) ; \
+ done
-vc11proj: rtcd.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type RTCEXE \
- --vcversion "11.00" \
- --projectname "rtcd" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/utils/rtcd/rtcd_vc11.vcxproj \
- --yaml rtcd.yaml \
- --source $(rtcd_SOURCES)
+dist-hook: lst vcproj
-vc12proj: rtcd.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type RTCEXE \
- --vcversion "12.00" \
- --projectname "rtcd" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/utils/rtcd/rtcd_vc12.vcxproj \
- --yaml rtcd.yaml \
- --source $(rtcd_SOURCES)
-
-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
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c Rtcd \
- -o $(win32_builddir)installer/rtcd.yaml \
- -p ..\\bin \
- $(bin_PROGRAMS).exe
-
-dist-hook: lst vcproj wxs
-
clean-local:
rm -rf rtcd
rm -rf *.o *~ *.core *.lst *.log
Modified: branches/RELENG_1_2/OpenRTM-aist/utils/rtcprof/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/utils/rtcprof/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/utils/rtcprof/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -29,19 +29,8 @@
#------------------------------------------------------------
win32_builddir = $(top_builddir)/win32/OpenRTM-aist/
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
+vcproj: vc9proj vcxproj
-vc8proj: rtcprof.yaml
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type RTCEXE \
- --vcversion "8.00" \
- --projectname "rtcprof" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/utils/rtcprof/rtcprof_vc8.vcproj \
- --yaml rtcprof.yaml \
- --source $(rtcprof_SOURCES)
-# qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc8.vcproj
-
vc9proj: rtcprof.yaml
$(top_builddir)/build/vcprojtool.py vcproj \
--type RTCEXE \
@@ -51,60 +40,21 @@
--out $(win32_builddir)/utils/rtcprof/rtcprof_vc9.vcproj \
--yaml rtcprof.yaml \
--source $(rtcprof_SOURCES)
-# qkc -O- -sm $(win32_builddir)/rtm/rtcprof_vc9.vcproj
-vc10proj: rtcprof.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type RTCEXE \
- --vcversion "10.00" \
- --projectname "rtcprof" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/utils/rtcprof/rtcprof_vc10.vcxproj \
- --yaml rtcprof.yaml \
- --source $(rtcprof_SOURCES)
+vcxproj: rtcprof.yaml
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type RTCEXE \
+ --vcversion "$${ver}.00" \
+ --projectname "rtcprof" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/utils/rtcprof/rtcprof_vc$${ver}.vcxproj \
+ --yaml rtcprof.yaml \
+ --source $(rtcprof_SOURCES) ; \
+ done
-vc11proj: rtcprof.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type RTCEXE \
- --vcversion "11.00" \
- --projectname "rtcprof" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/utils/rtcprof/rtcprof_vc11.vcxproj \
- --yaml rtcprof.yaml \
- --source $(rtcprof_SOURCES)
+dist-hook: lst vcproj
-vc12proj: rtcprof.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type RTCEXE \
- --vcversion "12.00" \
- --projectname "rtcprof" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/utils/rtcprof/rtcprof_vc12.vcxproj \
- --yaml rtcprof.yaml \
- --source $(rtcprof_SOURCES)
-
-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
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c Rtcprof \
- -o $(win32_builddir)installer/rtcprof.yaml \
- -p ..\\bin \
- $(bin_PROGRAMS).exe
-
-dist-hook: lst vcproj wxs
-
clean-local:
rm -rf rtcprof *.o *~ *core .libs *.lst
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = bin etc cmake build docs examples ext utils coil rtm installer .
+SUBDIRS = bin etc cmake build docs examples ext utils coil rtm .
clean-local:
@@ -17,16 +17,8 @@
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 OpenRTM-aist_vc14.sln
+sln: OpenRTM-aist_vc9.sln OpenRTM-aist_vc10.sln OpenRTM-aist_vc11.sln OpenRTM-aist_vc12.sln OpenRTM-aist_vc14.sln
-OpenRTM-aist_vc8.sln: OpenRTM-aist.sln.dep
- $(top_srcdir)/build/slntool.py \
- --vcversion VC8 \
- --dep OpenRTM-aist.sln.dep \
- --out OpenRTM-aist_vc8.sln \
- `find ./ -name '*_vc8.vcproj' \! -name 'USB*.vcproj' \! -name 'LTT*.vcproj' \! -name 'LogicalTime*.vcproj' \! -name 'FileName*.vcproj'`
- qkc -O- -ms OpenRTM-aist_vc8.sln
-
OpenRTM-aist_vc9.sln:
$(top_srcdir)/build/slntool.py \
--vcversion VC9 \
@@ -103,9 +95,6 @@
EXTRA_DIST = \
OpenRTM-aist.sln.dep \
- autobuild_vc8.bat \
- autobuild_vc9.bat \
- autobuild_vc10.bat \
coil_distbuild.vsprops \
coil_config.vsprops \
rtm_distbuild.vsprops \
Deleted: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat 2017-12-10 00:05:43 UTC (rev 3098)
@@ -1,73 +0,0 @@
- at rem
- at rem @brief Visual Studio automatic build script
- at rem @date $Date: 2008-03-06 06:55:42 $
- at rem @author Norkai Ando <n-ando at aist.go.jp>
- at rem
- at rem Copyright (C) 2008-2010
- at rem Noriaki Ando
- at rem Task-intelligence Research Group,
- at rem Intelligent Systems Research Institute,
- at rem National Institute of
- at rem Advanced Industrial Science and Technology (AIST), Japan
- at rem All rights reserved.
- at rem
- at rem $Id: autobuild_vc10.bat 726 2008-05-14 03:05:42Z n-ando $
- at rem
-
- at rem ------------------------------------------------------------
- at rem Notice:
- at rem omniORB should be under the following OMNI_ROOT directory.
- at rem RTSE should be under the following OMNI_ROOT directory.
- at rem ------------------------------------------------------------
- at set RTM_ROOT=%~dp0
- at set PATH="C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\";"C:\Program Files\Microsoft Visual Studio 10.0\VC\BIN";"c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319";"C:\Program Files\Microsoft Visual Studio 10.0\VC\vcpackages";%PATH%
- at set OMNI_ROOT=C:\distribution\omniORB-4.1.5_vc10
- at set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
- at set VC_VERSION=Visual C++ 2010
- at set OPENCV_ROOT=C:\distribution\OpenCV2.3
- at set OPENCV_RTC_ROOT=C:\distribution\ImageProcessing\opencv
- at set BOOST_ROOT=C:\Program Files\boost\boost_1_47
-
- at rem ============================================================
- at rem copy property sheet
- at rem ============================================================
-copy etc\rtm_config_omni415.vsprops rtm_config.vsprops
-copy etc\rtm_config_omni415.props rtm_config.props
-copy etc\rtm_config_omni415.props examples\USBCamera\rtm_config.props
-copy coil_config.props examples\USBCamera\coil_config.props
-
- at rem ============================================================
- at rem convert property sheet to cmake
- at rem ============================================================
-set TMP_PYTHONPATH=%PYTHONPATH%
-set PYTHONPATH=./bin;%PYTHONPATH%
-
-echo Generating rtm_config.cmake file
-build\vsprops2cmake.py rtm_config.vsprops
-move rtm_config.cmake cmake
-
-echo Generating OpenRTMConfig.cmake file
-build\cmakeconfgen.py rtm_config.vsprops
-move OpenRTMConfig.cmake cmake
-
-set PYTHONPATH=%TMP_PYTHONPATH%
-
- at rem ============================================================
- at rem build OpenRTM-aist
- at rem ============================================================
-
-msbuild /M:2 /t:rebuild /p:configuration=debug OpenRTM-aist_vc10.sln
-msbuild /M:2 /t:rebuild /p:configuration=release OpenRTM-aist_vc10.sln
-
- at rem ============================================================
- at rem build OpenCV-RTC
- at rem ============================================================
-
-cd %OPENCV_RTC_ROOT%
-call build_vc10.bat
-cd %RTM_ROOT%
-
-cd installer
-call autowix_vc10.cmd
-cd ..
-
Deleted: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat 2017-12-10 00:05:43 UTC (rev 3098)
@@ -1,69 +0,0 @@
- at rem
- at rem @brief Visual Studio automatic build script
- at rem @date $Date: 2008-03-06 06:55:42 $
- at rem @author Norkai Ando <n-ando at aist.go.jp>
- at rem
- at rem Copyright (C) 2008-2010
- at rem Noriaki Ando
- at rem Task-intelligence Research Group,
- at rem Intelligent Systems Research Institute,
- at rem National Institute of
- at rem Advanced Industrial Science and Technology (AIST), Japan
- at rem All rights reserved.
- at rem
- at rem $Id$
- at rem
-
- at rem ------------------------------------------------------------
- at rem Notice:
- at rem omniORB should be under the following OMNI_ROOT directory.
- at rem RTSE should be under the following OMNI_ROOT directory.
- at rem ------------------------------------------------------------
- at set RTM_ROOT=%~dp0
- at set PATH="C:\Program Files\Microsoft Visual Studio 8\VC\vcpackages";%PATH%
- at set OMNI_ROOT=C:\distribution\omniORB-4.1.4_vc8
- at set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
- at set VC_VERSION=Visual C++ 2005
- at set OPENCV_ROOT=C:\distribution\OpenCV2.1
- at set OPENCV_RTC_ROOT=C:\distribution\ImageProcessing\opencv
- at set BOOST_ROOT=C:\Program Files\boost\boost_1_47
-
- at rem ============================================================
- at rem copy property sheet
- at rem ============================================================
-copy etc\rtm_config_omni414.vsprops rtm_config.vsprops
-
- at rem ============================================================
- at rem convert property sheet to cmake
- at rem ============================================================
-set TMP_PYTHONPATH=%PYTHONPATH%
-set PYTHONPATH=./bin;%PYTHONPATH%
-
-echo Generating rtm_config.cmake file
-build\vsprops2cmake.py rtm_config.vsprops
-move rtm_config.cmake cmake
-
-echo Generating OpenRTMConfig.cmake file
-build\cmakeconfgen.py rtm_config.vsprops
-move OpenRTMConfig.cmake cmake
-
-set PYTHONPATH=%TMP_PYTHONPATH%
-
- at rem ============================================================
- at rem build OpenRTM-aist
- at rem ============================================================
-
-vcbuild /M2 /rebuild OpenRTM-aist_vc8.sln
-
- at rem ============================================================
- at rem build OpenCV-RTC
- at rem ============================================================
-
-cd %OPENCV_RTC_ROOT%
-call copyprops.bat
-vcbuild /M2 /rebuild OpenCV-RTC_vc8.sln
-cd %RTM_ROOT%
-
-cd installer
-call autowix.cmd
-cd ..
Deleted: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat 2017-12-10 00:05:43 UTC (rev 3098)
@@ -1,70 +0,0 @@
- at rem
- at rem @brief Visual Studio automatic build script
- at rem @date $Date: 2008-03-06 06:55:42 $
- at rem @author Norkai Ando <n-ando at aist.go.jp>
- at rem
- at rem Copyright (C) 2008-2010
- at rem Noriaki Ando
- at rem Task-intelligence Research Group,
- at rem Intelligent Systems Research Institute,
- at rem National Institute of
- at rem Advanced Industrial Science and Technology (AIST), Japan
- at rem All rights reserved.
- at rem
- at rem $Id: autobuild_vc8.bat 726 2008-05-14 03:05:42Z n-ando $
- at rem
-
- at rem ------------------------------------------------------------
- at rem Notice:
- at rem omniORB should be under the following OMNI_ROOT directory.
- at rem RTSE should be under the following OMNI_ROOT directory.
- at rem ------------------------------------------------------------
- at set RTM_ROOT=%~dp0
- at set PATH="C:\Program Files\Microsoft Visual Studio 9.0\VC\vcpackages";%PATH%
- at set OMNI_ROOT=C:\distribution\omniORB-4.1.4
- at set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
- at set VC_VERSION=Visual C++ 2008
- at set OPENCV_ROOT=C:\distribution\OpenCV2.1
- at set OPENCV_RTC_ROOT=C:\distribution\ImageProcessing\opencv
- at set BOOST_ROOT=C:\Program Files\boost\boost_1_47
-
- at rem ============================================================
- at rem copy property sheet
- at rem ============================================================
-copy etc\rtm_config_omni414.vsprops rtm_config.vsprops
-
- at rem ============================================================
- at rem convert property sheet to cmake
- at rem ============================================================
-set TMP_PYTHONPATH=%PYTHONPATH%
-set PYTHONPATH=./bin;%PYTHONPATH%
-
-echo Generating rtm_config.cmake file
-build\vsprops2cmake.py rtm_config.vsprops
-move rtm_config.cmake cmake
-
-echo Generating OpenRTMConfig.cmake file
-build\cmakeconfgen.py rtm_config.vsprops
-move OpenRTMConfig.cmake cmake
-
-set PYTHONPATH=%TMP_PYTHONPATH%
-
- at rem ============================================================
- at rem build OpenRTM-aist
- at rem ============================================================
-
-vcbuild /M2 /rebuild OpenRTM-aist_vc9.sln
-
- at rem ============================================================
- at rem build OpenCV-RTC
- at rem ============================================================
-
-cd %OPENCV_RTC_ROOT%
-call copyprops.bat
-vcbuild /M2 /rebuild OpenCV-RTC_vc9.sln
-cd %RTM_ROOT%
-
-cd installer
-call autowix.cmd
-cd ..
-
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/bin/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/bin/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/bin/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -6,16 +6,6 @@
##---------------------------------------------------------------------------
VER = $(RTM_SHORT_VERSION)
-WINLIBS = libRTCSkel.lib \
- libRTCSkeld.lib \
- RTC$(VER).l\ib \
- RTC$(VER)d.lib \
- RTC$(VER).dll \
- RTC$(VER)d.dll \
- coil$(VER).lib \
- coil$(VER)d.lib \
- coil$(VER).dll \
- coil$(VER)d.dll
clean-local:
rm -f *~ *.dll *.lib *.exe
@@ -25,19 +15,8 @@
cp -p $(top_srcdir)/build/*.py .
cp -p $(top_srcdir)/utils/rtm-skelwrapper/*.py .
cp -p $(top_srcdir)/utils/rtm-skelwrapper/rtm-skelwrapper rtm-skelwrapper.py
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c Libs \
- -o ../installer/libs.yaml \
- -p ..\\bin \
- $(WINLIBS)
- $(top_srcdir)/build/makewxs.py flist \
- -c Bin \
- -o ../installer/bin.yaml \
- -p ..\\bin \
- *.py *.bat rtc.conf $(WINLIBS)
-dist-hook: clean-local copy_scripts wxs
+dist-hook: clean-local copy_scripts
EXTRA_DIST = \
rtm-naming.bat \
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -71,13 +71,10 @@
rm -f OpenRTMConfig.cmake FindOpenRTM.cmake
rm -rf *~
-wxs:
- cp -p cmake.yaml ../installer/cmake.yaml
-
FindOpenRTM.cmake:
cp $(top_srcdir)/utils/cmake/FindOpenRTM.cmake .
-dist-hook: clean-local FindOpenRTM.cmake wxs
+dist-hook: clean-local FindOpenRTM.cmake
EXTRA_DIST = \
FindOpenRTM.cmake \
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/docs/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/docs/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/docs/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -17,29 +17,7 @@
IDLReference-en:
cp -p -r $(top_srcdir)/docs/IDLReference-en .
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c Classref_jp \
- -o ../installer/classref_jp.yaml \
- -p ..\\docs\\ClassReference\\html \
- ./ClassReference/html/*
- $(top_srcdir)/build/makewxs.py flist \
- -c Classref_en \
- -o ../installer/classref_en.yaml \
- -p ..\\docs\\ClassReference-en\\html \
- ./ClassReference-en/html/*
- $(top_srcdir)/build/makewxs.py flist \
- -c IDLref_jp \
- -o ../installer/idlref_jp.yaml \
- -p ..\\docs\\IDLReference\\html \
- ./IDLReference/html/*
- $(top_srcdir)/build/makewxs.py flist \
- -c IDLref_en \
- -o ../installer/idlref_en.yaml \
- -p ..\\docs\\IDLReference-en\\html \
- ./IDLReference-en/html/*
-
clean-local:
rm -rf *~ ClassReference ClassReference-en IDLReference IDLReference-en
-dist-hook: clean-local ClassReference ClassReference-en IDLReference IDLReference-en wxs
+dist-hook: clean-local ClassReference ClassReference-en IDLReference IDLReference-en
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -11,11 +11,8 @@
rtc.conf.sample:
cp -p $(top_srcdir)/etc/rtc.conf.sample .
-wxs:
- cp -p etc.yaml ../installer/etc.yaml
+dist-hook: clean-local rtc.conf.sample
-dist-hook: clean-local rtc.conf.sample wxs
-
EXTRA_DIST = \
rtc.conf.sample \
etc.yaml
Deleted: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.in
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.in 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.in 2017-12-10 00:05:43 UTC (rev 3098)
@@ -1,495 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
- if test -z '$(MAKELEVEL)'; then \
- false; \
- elif test -n '$(MAKE_HOST)'; then \
- true; \
- elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
- true; \
- else \
- false; \
- fi; \
-}
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = win32/OpenRTM-aist/examples/ExtTrigger
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/libtool.m4 $(top_srcdir)/openrtm.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/lib/rtm/config_rtc.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_ at AM_V@)
-am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_ at AM_V@)
-am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_ at AM_V@)
-am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-ARTLIB = @ARTLIB@
-ARTLINUX = @ARTLINUX@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COSNAMES = @COSNAMES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOCS = @DOCS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-IDLC = @IDLC@
-IDL_FLAGS = @IDL_FLAGS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LDSO = @LDSO@
-LDSOLIBS = @LDSOLIBS@
-LDSOOPTS = @LDSOOPTS@
-LIBOBJS = @LIBOBJS@
-LIBRARY = @LIBRARY@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-ORB = @ORB@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PYTHON_FLAGS = @PYTHON_FLAGS@
-RANLIB = @RANLIB@
-RTM_DESCRIPTION = @RTM_DESCRIPTION@
-RTM_MAJOR_VERSION = @RTM_MAJOR_VERSION@
-RTM_MINOR_VERSION = @RTM_MINOR_VERSION@
-RTM_REVISION_NUM = @RTM_REVISION_NUM@
-RTM_SHORT_VERSION = @RTM_SHORT_VERSION@
-RTM_VERSION = @RTM_VERSION@
-RTPREEMPTEC = @RTPREEMPTEC@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SOEXT = @SOEXT@
-STRIP = @STRIP@
-TARGET = @TARGET@
-UNITTEST = @UNITTEST@
-VERSION = @VERSION@
-WRAPPERS = @WRAPPERS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-coil_includedir = @coil_includedir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-rtm_datadir = @rtm_datadir@
-rtm_docdir = @rtm_docdir@
-rtm_ecdir = @rtm_ecdir@
-rtm_exampledir = @rtm_exampledir@
-rtm_idldir = @rtm_idldir@
-rtm_includedir = @rtm_includedir@
-rtm_libdir = @rtm_libdir@
-rtm_rtcdir = @rtm_rtcdir@
-rtm_rtmdir = @rtm_rtmdir@
-rtm_sdodir = @rtm_sdodir@
-rtm_svcdir = @rtm_svcdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu win32/OpenRTM-aist/examples/ExtTrigger/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu win32/OpenRTM-aist/examples/ExtTrigger/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- clean-local cscopelist-am ctags-am dist-hook distclean \
- distclean-generic distclean-libtool distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
- uninstall-am
-
-.PRECIOUS: Makefile
-
-clean-local:
- rm -rf Debug Release
- rm -rf *~ *.cpp *.h *.idl rtc.conf
- rm -rf *.vcproj *.vcxproj *.user *.ncb *.suo
- rm -rf ExtConnectorComp ExtConsoleIn ExtConsoleInComp ExtConsoleOut ExtConsoleOutComp
-
-src:
- cp -p $(top_srcdir)/examples/ExtTrigger/*.cpp .
- cp -p $(top_srcdir)/examples/ExtTrigger/*.h .
- cp -p $(top_srcdir)/examples/ExtTrigger/rtc.conf .
- qkc -O- -ms *.cpp
- qkc -O- -ms *.h
-
-dist-hook: src
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -6,12 +6,9 @@
##---------------------------------------------------------------------------
SUBDIRS = Composite ConfigSample ExtTrigger LTTSample SimpleIO SeqIO SimpleService USBCamera .
-wxs:
- cp -p *.yaml ../installer/
-
clean-local:
rm -f *~
-dist-hook: clean-local wxs
+dist-hook: clean-local
EXTRA_DIST = example.yaml lttsample.yaml
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/USBCamera/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -10,11 +10,8 @@
rm -rf *.vcproj *.user *.ncb *.suo *.sln *.lst *.vcxproj
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc9proj vc10proj
-vc8proj: USBCameraAcquireComp_vc8.vcproj USBCameraAcquire_vc8.vcproj \
- USBCameraMonitorComp_vc8.vcproj USBCameraMonitor_vc8.vcproj
-
vc9proj: USBCameraAcquireComp_vc9.vcproj USBCameraAcquire_vc9.vcproj\
USBCameraMonitorComp_vc9.vcproj USBCameraMonitor_vc9.vcproj
@@ -21,47 +18,6 @@
vc10proj: USBCameraAcquireComp_vc10.vcxproj USBCameraAcquire_vc10.vcxproj\
USBCameraMonitorComp_vc10.vcxproj USBCameraMonitor_vc10.vcxproj
-USBCameraAcquireComp_vc8.vcproj:
- $(top_srcdir)/build/vcprojtool.py vcproj \
- --type RTCEXE \
- --vcversion "8.00" \
- --projectname "USBCameraAcquireComp" \
- --version $(RTM_VERSION) \
- --out USBCameraAcquireComp_vc8.vcproj \
- --source USBCameraAcquire.cpp USBCameraAcquireComp.cpp \
- --header USBCameraAcquire.h
- qkc -O- -sm USBCameraAcquireComp_vc8.vcproj
-USBCameraAcquire_vc8.vcproj:
- $(top_srcdir)/build/vcprojtool.py vcproj \
- --type RTCDLL \
- --vcversion "8.00" \
- --projectname "USBCameraAcquire" \
- --version $(RTM_VERSION) \
- --out USBCameraAcquire_vc8.vcproj \
- --source USBCameraAcquire.cpp \
- --header USBCameraAcquire.h
- qkc -O- -sm USBCameraAcquire_vc8.vcproj
-USBCameraMonitorComp_vc8.vcproj:
- $(top_srcdir)/build/vcprojtool.py vcproj \
- --type RTCEXE \
- --vcversion "8.00" \
- --projectname "USBCameraMonitorComp" \
- --version $(RTM_VERSION) \
- --out USBCameraMonitorComp_vc8.vcproj \
- --source USBCameraMonitor.cpp USBCameraMonitorComp.cpp \
- --header USBCameraMonitor.h
- qkc -O- -sm USBCameraMonitorComp_vc8.vcproj
-USBCameraMonitor_vc8.vcproj:
- $(top_srcdir)/build/vcprojtool.py vcproj \
- --type RTCDLL \
- --vcversion "8.00" \
- --projectname "USBCameraMonitor" \
- --version $(RTM_VERSION) \
- --out USBCameraMonitor_vc8.vcproj \
- --source USBCameraMonitor.cpp \
- --header USBCameraMonitor.h
- qkc -O- -sm USBCameraMonitor_vc8.vcproj
-
USBCameraAcquireComp_vc9.vcproj:
$(top_srcdir)/build/vcprojtool.py vcproj \
--type RTCEXE \
@@ -144,15 +100,8 @@
--header USBCameraMonitor.h
qkc -O- -sm USBCameraMonitor_vc10.vcxproj
-sln: USBCamera_vc8.sln USBCamera_vc9.sln USBCamera_vc10.sln
+sln: USBCamera_vc9.sln USBCamera_vc10.sln
-USBCamera_vc8.sln: vc8proj
- $(top_srcdir)/build/slntool.py \
- --vcversion VC8 \
- --out USBCamera_vc8.sln \
- `find ./ -name '*_vc8.vcproj'`
- qkc -O- -ms USBCamera_vc8.sln
-
USBCamera_vc9.sln: vc9proj
$(top_srcdir)/build/slntool.py \
--vcversion VC9 \
@@ -177,19 +126,14 @@
USBCameraMonitor.cpp \
USBCameraMonitor.h \
USBCameraMonitorComp.cpp \
- USBCameraAcquire_vc8.vcproj \
- 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
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -6,13 +6,10 @@
##---------------------------------------------------------------------------
SUBDIRS = logical_time .
-wxs:
- cp -p logical_time.yaml ../../installer
-
clean-local:
rm -f *~
-dist-hook: clean-local wxs
+dist-hook: clean-local
EXTRA_DIST = logical_time.yaml
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -9,12 +9,9 @@
SUBDIRS = nameservice_file
-wxs:
- cp -p nameservice_file.yaml ../../installer/
-
clean-local:
rm -f *~
-dist-hook: clean-local wxs
+dist-hook: clean-local
-EXTRA_DIST = nameservice_file.yaml
\ No newline at end of file
+EXTRA_DIST = nameservice_file.yaml
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -6,12 +6,9 @@
##---------------------------------------------------------------------------
SUBDIRS = observer .
-wxs:
- cp -p sdo.yaml ../../installer/
-
clean-local:
rm -f *~
-dist-hook: clean-local wxs
+dist-hook: clean-local
EXTRA_DIST = sdo.yaml
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/utils/rtc-template/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/utils/rtc-template/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/utils/rtc-template/Makefile.am 2017-12-10 00:05:43 UTC (rev 3098)
@@ -12,11 +12,4 @@
cp -p $(top_srcdir)/utils/rtc-template/rtc-template rtc-template.py
cp -p $(top_srcdir)/utils/rtc-template/*.py .
-wxs: src
- $(top_srcdir)/build/makewxs.py flist \
- -c RtcTemplate \
- -o ../../installer/rtctemplate.yaml \
- -p ..\\utils\\rtc-template \
- *.py
-
-dist-hook: clean-local src wxs
+dist-hook: clean-local src
More information about the openrtm-commit
mailing list