[openrtm-commit:03225] r3242 - in branches/RELENG_1_2/OpenRTM-aist: src/ext/sdo/observer win32/OpenRTM-aist win32/OpenRTM-aist/ext/sdo

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-03-06 13:38:52 +0900 (Tue, 06 Mar 2018)
New Revision: 3242

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
   branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
   branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am
   branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh
Log:
[build,bugfix,->trunk] Build bug fixed.

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	2018-03-06 02:59:59 UTC (rev 3241)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am	2018-03-06 04:38:52 UTC (rev 3242)
@@ -118,43 +118,7 @@
 	echo $(ALL_SRC) > src.lst
 	echo $(EXTRA_DIST) > other.lst
 
-#------------------------------------------------------------
-# Visual Studio Project
-#------------------------------------------------------------
-win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/sdo/observer
-PROJNAME=ComponentObserverConsumer
 
-vcproj: vc9proj vcxproj
-
-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_WIN_SRC)                        \
-		--header $(OBSERVER_WIN_H)
-	qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
-
-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
-
-dist-hook: lst vcproj
-
-
 clean_objs:
 	rm -f $(OBJS)
 

Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep	2018-03-06 02:59:59 UTC (rev 3241)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep	2018-03-06 04:38:52 UTC (rev 3242)
@@ -5,7 +5,6 @@
 libRTC: libcoil libRTCSkel
 rtcd: libcoil libRTCSkel libRTC
 rtcprof: libcoil libRTCSkel libRTC
-ComponentObserverConsumer: libcoil libRTCSkel libRTC
 SSLTransport: libcoil libRTCSkel libRTC
 ConfigSampleComp: libcoil libRTCSkel libRTC
 ConfigSample: libcoil libRTCSkel libRTC

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	2018-03-06 02:59:59 UTC (rev 3241)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am	2018-03-06 04:38:52 UTC (rev 3242)
@@ -4,7 +4,7 @@
 ##
 ## $Id: Makefile.am 1680 2010-01-17 15:12:59Z n-ando $
 ##---------------------------------------------------------------------------
-SUBDIRS = observer logger .
+SUBDIRS = logger .
 
 clean-local:
 	rm -f *~

Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh	2018-03-06 02:59:59 UTC (rev 3241)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh	2018-03-06 04:38:52 UTC (rev 3242)
@@ -127,8 +127,6 @@
     cp OpenRTM_bin_dir.wxsctrl   $RUNTIME_DIR/bin/
 
     cp $OPENRTM_DIR/etc/rtc.conf.sample $RUNTIME_DIR/etc/
-
-    cp $OPENRTM_DIR/components/ComponentObserverConsumer.dll $RUNTIME_DIR/ext/sdo
 }
 
 copy_devel_files()
@@ -161,7 +159,6 @@
     ORG_EX=$OPENRTM_DIR/examples/
     DST_EX=$EXAMPLE_DIR/examples/C++
     cp $OPENRTM_DIR/components/*.dll  $EXAMPLE_DIR/examples/C++
-    rm -f $EXAMPLEL_DIR/examples/C++/ComponentObserverConsumer.dll
     cp $OPENRTM_DIR/components/*.exe  $EXAMPLE_DIR/examples/C++
 
     cp $ORG_EX/SimpleIO/rtc.conf              $DST_EX/