[openrtm-commit:00080] r2111 - in trunk/OpenRTM-aist: . src/ext/sdo/observer win32/OpenRTM-aist win32/OpenRTM-aist/etc win32/OpenRTM-aist/installer
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 5月 23日 (月) 12:37:51 JST
Author: n-ando
Date: 2011-05-23 12:37:51 +0900 (Mon, 23 May 2011)
New Revision: 2111
Modified:
trunk/OpenRTM-aist/configure.ac
trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.vsprops
trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in
Log:
Now ComponentObserverConsumer is build in win32 environment.
It is also included in msi. refs #2129
Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac 2011-05-23 03:31:29 UTC (rev 2110)
+++ trunk/OpenRTM-aist/configure.ac 2011-05-23 03:37:51 UTC (rev 2111)
@@ -1723,6 +1723,9 @@
win32/OpenRTM-aist/examples/SeqIO/Makefile
win32/OpenRTM-aist/examples/SimpleService/Makefile
win32/OpenRTM-aist/examples/USBCamera/Makefile
+ win32/OpenRTM-aist/ext/Makefile
+ win32/OpenRTM-aist/ext/sdo/Makefile
+ win32/OpenRTM-aist/ext/sdo/observer/Makefile
win32/OpenRTM-aist/utils/Makefile
win32/OpenRTM-aist/utils/rtc-template/Makefile
win32/OpenRTM-aist/utils/rtcd/Makefile
Modified: trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2011-05-23 03:31:29 UTC (rev 2110)
+++ trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2011-05-23 03:37:51 UTC (rev 2111)
@@ -89,9 +89,54 @@
echo $(ALL_SRC) > src.lst
echo $(EXTRA_DIST) > other.lst
-dist-hook: lst
+#------------------------------------------------------------
+# Visual Studio Project
+#------------------------------------------------------------
+win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/sdo/observer
+PROJNAME=ComponentObserverConsumer
+vcproj: vc8proj vc9proj vc10proj
+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_SRC) \
+ --header $(OBSERVER_H)
+ qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj
+
+vc9proj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type DLL \
+ --vcversion "9.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(OBSERVER_SRC) \
+ --header $(OBSERVER_H)
+ qkc -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_SRC) \
+ --header $(OBSERVER_H)
+ qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj
+
+
+dist-hook: lst vcproj
+
+
clean_objs:
rm -f $(OBJS)
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2011-05-23 03:31:29 UTC (rev 2110)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2011-05-23 03:37:51 UTC (rev 2111)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = bin etc build docs examples utils coil rtm installer .
+SUBDIRS = bin etc build docs examples ext utils coil rtm installer .
clean-local:
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2011-05-23 03:31:29 UTC (rev 2110)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2011-05-23 03:37:51 UTC (rev 2111)
@@ -2,6 +2,7 @@
libRTC: libcoil libRTCSkel
rtcd: libcoil libRTC
rtcprof: libcoil libRTC
+ComponentObserverConsumer: libcoil libRTC
ConfigSampleComp: libcoil libRTC
ConfigSample: libcoil libRTC
ConsoleInComp: libcoil libRTC
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.vsprops 2011-05-23 03:31:29 UTC (rev 2110)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.vsprops 2011-05-23 03:37:51 UTC (rev 2111)
@@ -2,7 +2,7 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="OpenRTM-aist-1.0"
+ Name="OpenRTM-aist-1.1"
>
<Tool
Name="VCCLCompilerTool"
@@ -93,7 +93,7 @@
/>
<UserMacro
Name="rtm_idlflags"
- Value="-bcxx -Wba -nf"
+ Value="-bcxx -Wba -nf -I"$(SolutionDir)\rtm\idl""
/>
<!-- coil macros -->
<UserMacro
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in 2011-05-23 03:31:29 UTC (rev 2110)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in 2011-05-23 03:37:51 UTC (rev 2111)
@@ -219,15 +219,29 @@
</Directory>
</Directory>
+ <!-- extension -->
+ <Directory Id="ext" Name="ext">
+ <Directory Id="sdo" Name="sdo">
+ <Component Id="SDOService" Guid="{% SDOService.GUID %}">
+ {% for file in SDOService.Files %}
+ <File Id="{% file.Id %}"
+ Name="{% file.Name %}" DiskId="1"
+ Source="{% file.Source %}"/>
+ {% endfor %}
+ </Component>
+ </Directory>
+ </Directory>
+
<!-- examples -->
<Directory Id="examples" Name="examples">
<Directory Id="CXXexamples" Name="C++">
- <!-- OpenCV-RTC components -->
- <?if $(env.INCLUDE_OPENCV_RTC) = YES ?>
- <?include OpenCV-RTC_inc.wxs ?>
- <?endif ?>
- <!-- end of OpenCV-RTC -->
+ <!-- OpenCV-RTC components -->
+ <?if $(env.INCLUDE_OPENCV_RTC) = YES ?>
+ <?include OpenCV-RTC_inc.wxs ?>
+ <?endif ?>
+ <!-- end of OpenCV-RTC -->
+
<Component Id="Examples" Guid="{% Examples.GUID %}">
{% for file in Examples.Files %}
<File Id="{% file.Id %}"
openrtm-commit メーリングリストの案内