[openrtm-commit:01942] r2723 - in branches/RELENG_1_1/OpenRTM-aist: . build examples/Composite packages src/lib/coil src/lib/rtm src/lib/rtm/idl win32/OpenRTM-aist win32/OpenRTM-aist/rtm win32/OpenRTM-aist/rtm/idl/device_interfaces
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2016年 5月 24日 (火) 11:13:45 JST
Author: kawauchi
Date: 2016-05-24 11:13:45 +0900 (Tue, 24 May 2016)
New Revision: 2723
Added:
branches/RELENG_1_1/OpenRTM-aist/examples/Composite/rtc.composite.linux.conf
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ext/
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/ext/
Removed:
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/CameraCommonInterface.idl
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_Common.idl
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_DataTypes.idl
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_Middle.idl
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libCameraSkel.vcproj.yaml
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libManipulatorSkel.vcproj.yaml
Modified:
branches/RELENG_1_1/OpenRTM-aist/
branches/RELENG_1_1/OpenRTM-aist/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh
branches/RELENG_1_1/OpenRTM-aist/configure.ac
branches/RELENG_1_1/OpenRTM-aist/packages/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/device_interfaces/
Log:
[merge] r2715, 2717, 2719-2721 have been merged from trunk. src/lib/coil/ace/coil/Makefile.am excluded.
Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
- /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712
+ /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721
Modified: branches/RELENG_1_1/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/Makefile.am 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/Makefile.am 2016-05-24 02:13:45 UTC (rev 2723)
@@ -21,4 +21,10 @@
clean-local:
rm -f *~ *.core
+ rm -f build-arch-stamp build-indep-stamp
+ rm -f compile
+ rm -rf debian
+ rm -f OpenRTM-aist*.tar.gz
+ rm -f OpenRTM-aist*.tar.bz2
+ rm -f OpenRTM-aist*.zip
Modified: branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh 2016-05-24 02:13:45 UTC (rev 2723)
@@ -70,7 +70,7 @@
# コードネーム取得
#---------------------------------------
check_codename () {
- cnames="sarge etch lenny squeeze wheezy"
+ cnames="sarge etch lenny squeeze wheezy jessie"
for c in $cnames; do
if test -f "/etc/apt/sources.list"; then
res=`grep $c /etc/apt/sources.list`
Modified: branches/RELENG_1_1/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/configure.ac 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/configure.ac 2016-05-24 02:13:45 UTC (rev 2723)
@@ -1595,6 +1595,7 @@
src/lib/Makefile
src/lib/rtm/Makefile
src/lib/rtm/idl/Makefile
+ src/lib/rtm/ext/Makefile
src/lib/rtm/idl/device_interfaces/Makefile
src/lib/rtm/tests/Makefile
src/lib/rtm/tests/CORBA_IORUtil/Makefile
@@ -1696,6 +1697,7 @@
win32/OpenRTM-aist/utils/rtcprof/Makefile
win32/OpenRTM-aist/coil/Makefile
win32/OpenRTM-aist/rtm/Makefile
+ 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
Property changes on: branches/RELENG_1_1/OpenRTM-aist/configure.ac
___________________________________________________________________
Modified: svn:mergeinfo
- /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401,2409,2548-2555,2605,2677-2678,2681,2711-2712
+ /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401,2409,2548-2555,2605,2677-2678,2681,2711-2712,2715-2721
Copied: branches/RELENG_1_1/OpenRTM-aist/examples/Composite/rtc.composite.linux.conf (from rev 2721, trunk/OpenRTM-aist/examples/Composite/rtc.composite.linux.conf)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/Composite/rtc.composite.linux.conf (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/Composite/rtc.composite.linux.conf 2016-05-24 02:13:45 UTC (rev 2723)
@@ -0,0 +1,7 @@
+corba.nameservers: localhost
+naming.formats: %h.host_cxt/%n.rtc
+logger.enable: NO
+manager.modules.load_path: ./, ./rtc
+manager.modules.preload: Controller.so, Motor.so, Sensor.so
+manager.components.precreate: Controller, Motor, Sensor, PeriodicECSharedComposite
+composite.PeriodicECShared.PeriodicECSharedComposite0.config_file: composite.conf
Modified: branches/RELENG_1_1/OpenRTM-aist/packages/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/Makefile.am 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/Makefile.am 2016-05-24 02:13:45 UTC (rev 2723)
@@ -8,3 +8,6 @@
AUTOMAKE_OPTIONS = 1.4
SUBDIRS = deb rpm
+
+clean-local:
+ rm -f *.deb *.dsc *.changes *.tar.gz
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/Makefile.am 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/Makefile.am 2016-05-24 02:13:45 UTC (rev 2723)
@@ -20,3 +20,7 @@
clean-local:
rm -f config_coil.h
rm -f *~
+ rm -f compile
+ rm -rf coil-$(VERSION)
+ rm -f coil-$(VERSION).tar.gz
+ rm -f coil-$(VERSION).tar.bz2
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am 2016-05-24 02:13:45 UTC (rev 2723)
@@ -8,7 +8,7 @@
AUTOMAKE_OPTIONS = 1.4
ARTLIB = @ARTLIB@
-SUBDIRS = idl . @UNITTEST@
+SUBDIRS = idl . ext @UNITTEST@
AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/coil/include -I$(top_srcdir)/src/lib/rtm -I$(top_srcdir)/src/lib/rtm/idl
AM_LDFLAGS=-L$(top_builddir) -L$(top_builddir)/src/lib/rtm -L$(top_builddir)/src/lib/rtm/idl -L$(top_builddir)/src/lib/coil/lib
@@ -258,4 +258,4 @@
$(rtmheader_HEADERS) \
libRTC.vcproj.yaml
-DIST_SUBDIRS = idl tests
+DIST_SUBDIRS = idl ext tests
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h 2016-05-24 02:13:45 UTC (rev 2723)
@@ -138,6 +138,8 @@
#endif
m_value(value), m_onWrite(0), m_onWriteConvert(0)
{
+ addProperty("dataport.data_value", m_value);
+ m_propValueIndex = NVUtil::find_index(m_profile.properties, "dataport.data_value");
}
/*!
@@ -209,6 +211,7 @@
(*m_onWrite)(value);
RTC_TRACE(("OnWrite called"));
}
+ m_profile.properties[m_propValueIndex].value <<= value;
bool result(true);
std::vector<const char *> disconnect_ids;
@@ -490,6 +493,8 @@
coil::TimeMeasure m_cdrtime;
DataPortStatusList m_status;
+
+ CORBA::Long m_propValueIndex;
};
}; // namespace RTC
Deleted: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/CameraCommonInterface.idl
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/CameraCommonInterface.idl 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/CameraCommonInterface.idl 2016-05-24 02:13:45 UTC (rev 2723)
@@ -1,190 +0,0 @@
-/* version 2.0 */
-
-#ifndef CAMERACOMMONINTERFACE_IDL
-#define CAMERACOMMONINTERFACE_IDL
-
-#include "BasicDataType.idl"
-
-module Img {
- //============================================================
- // Definition of basic matrix for image.
- //============================================================
- typedef double Vec3[3];
- typedef double Mat44[4][4];
-
- //============================================================
- //Image Data Structure
- //============================================================
-
- //------------------------------------------------------------
- // Color Formats Definition
- // The parameters of CF_XXX are defined by this idl.
- // The other parameters are cited from FourCC definition.
- // To obtain the detail information about FourCC formats, please visit
- // following website:
- // http://www.fourcc.org/
- //------------------------------------------------------------
- enum ColorFormat
- {
- CF_UNKNOWN, //Unknown Color Format
- CF_RGB, //RGB raw data format
- CF_GRAY, //8bit gray image data format
- CF_JPEG, //JPEG image format
- CF_PNG, //PNG image format
-
- //Paramter definitions based on FourCC
- RGB, //Basic Windows bitmap format
- RLE8, //Run length encoded 8bpp RGB image
- RLE, //Run length encoded 4bpp RGB image
- RAW, //Uncompressed RGB bitmaps
- RGBA, //Raw RGB with alpha
- RGBT, //Raw RGB with a transparency field
- AYUV, //Combined YUV and alpha
- CLJR, //Cirrus Logic format with 4 pixels packed into a u_int32
- CYUV, //Essentially a copy of UYUV except that the sense of the height is reserved
- GREY, //Apparently a duplicate of Y800 and Y8
- IRAW, //Intel uncompressed YUV
- IUYV, //Interlaced version of UYUV
- IY41, //Interlaced version of Y41P
- IYU1, //12bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec.
- IYU2, //24 bit format used in mode 0 of the IEEE 1394 Digital Camera 1.04 spec.
- HDYC, //YUV 4:2:2 (Y sample at every pixel, U and V sampled at every second
- //pixel horizontally on each line)
- UYNV, //A direct copy of UYVY registered by NVidia to work around problems in
- //some old codecs which did not like hardware which offered more than 2
- //UYVY surfaces.
- UYVP, //YCbCr 4:2:2 extended precision 10-bits per component in U0Y0V0Y1 order
- V210, //10-bit 4:2:2 YCrCb equivalent to the Quicktime format of the same name
- V422, //This is an upside down version of UYVY
- V655, //16 bit YUV 4:2:2 format registered by Vitec Multimedia
- VYUV, //Duplicate of YUV2
- YUNV, //A direct copy of YUY2 registered by NVidia to work around problems in
- //some old codecs which did not like hardware which offered more than 2
- //YUY2 surfaces
- YVYU, //YUV 4:2:2 as for UYVY but with different component ordering within the
- //u_int32 macropixel
- Y41P, //YUV 4:1:1 with a packed, 6 byte/4 pixel macroblock structure
- Y211, //Packed YUV format with Y sampled at every second pixel across each line
- //and U and V sampled at every fourth pixel
- Y41T, //Format as for Y41P but the lsb of each Y component is used to signal pixel
- //transparency
- Y42T, //Format as for UYVY but the lsb of each Y component is used to signal
- //pixel transparency
- YUVP, //YCbCr 4:2:2 extended precision 10-bits per component in Y0U0Y1V0
- //order
- Y800, //Simple, single Y plane for monochrome images
- Y8, //Duplicate of Y800
- Y16 //16-bit uncompressed grayscale image
- };
-
- //============================================================
- // Camera Image Data Structure
- //============================================================
-
- //------------------------------------------------------------
- // Image Data Structure for still image
- //------------------------------------------------------------
- struct ImageData
- {
- long width;
- long height;
- ColorFormat format;
- sequence<octet> raw_data;
- };
-
- //------------------------------------------------------------
- // Camera Intrinsic Parameter Structure
- //------------------------------------------------------------
- struct CameraIntrinsicParameter
- {
- double matrix_element[5];
- sequence<double> distortion_coefficient;
- };
-
- //------------------------------------------------------------
- // Camera Image Structure
- //------------------------------------------------------------
- struct CameraImage
- {
- RTC::Time captured_time;
- ImageData image;
- CameraIntrinsicParameter intrinsic;
- Mat44 extrinsic;
- };
-
- //------------------------------------------------------------
- // Timed Camera Image Structure
- // This structure includes time stump.
- //------------------------------------------------------------
- struct TimedCameraImage
- {
- RTC::Time tm;
- CameraImage data;
- long error_code;
- };
-
- //============================================================
- // Multi Camera Image Data Structure
- //============================================================
-
- //------------------------------------------------------------
- // Multi Camera Image Structure
- //------------------------------------------------------------
- struct MultiCameraImage
- {
- sequence<CameraImage> image_seq;
- long camera_set_id;
- };
-
- //------------------------------------------------------------
- // Time Multi Camera Image Structure
- // This structure includes time stump.
- //------------------------------------------------------------
- struct TimedMultiCameraImage
- {
- RTC::Time tm;
- MultiCameraImage data;
- long error_code;
- };
-
- //============================================================
- // Camera Device Profile Structure
- //============================================================
- struct NamedValue
- {
- string name;
- string value;
- };
-
- typedef sequence<NamedValue> NVList;
-
- struct CameraDeviceProfile
- {
- string devtypeid;
- string guid;
- short unit;
- string vendor_name;
- string model_name;
- CameraIntrinsicParameter intrinsic;
- NVList properties;
- };
-
- //============================================================
- // Camera Control Service Interface
- //============================================================
-
- //------------------------------------------------------------
- // Camera Control Service Interface for image capture
- //------------------------------------------------------------
- interface CameraCaptureService
- {
- oneway void take_one_frame();
- oneway void take_multi_frames(in long num);
- oneway void start_continuous();
- oneway void stop_continuous();
- void getProfile(out CameraDeviceProfile profile);
- };
-}; /* module */
-
-#endif /* CAMERACOMMONINTERFACE_IDL */
-
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2016-05-24 02:13:45 UTC (rev 2723)
@@ -15,7 +15,11 @@
AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/rtm
AM_LDFLAGS=-L$(top_builddir)/src/lib/rtm -L$(top_builddir)/src/lib/rtm/idl
-RTCSKEL_SOURCES = \
+# RTM idl sources
+if ORB_IS_RTORB
+IDL_SOURCES = OpenRTM-aist.idl
+else
+IDL_SOURCES = \
SDOPackage.idl \
RTC.idl \
OpenRTM.idl \
@@ -24,23 +28,8 @@
DataPort.idl \
ExtendedDataTypes.idl \
InterfaceDataTypes.idl
-MANIPULATORSKEL_SOURCES = \
- ManipulatorCommonInterface_DataTypes.idl \
- ManipulatorCommonInterface_Common.idl \
- ManipulatorCommonInterface_Middle.idl
-CAMERASKEL_SOURCES = CameraCommonInterface.idl
-
-# RTM idl sources
-if ORB_IS_RTORB
-IDL_SOURCES = OpenRTM-aist.idl
-else
-IDL_SOURCES = \
- $(RTCSKEL_SOURCES) \
- $(MANIPULATORSKEL_SOURCES) \
- $(CAMERASKEL_SOURCES)
endif
-
SKEL_H = $(IDL_SOURCES:.idl=Skel.h)
SKEL_CPP = $(IDL_SOURCES:.idl=Skel.cpp)
STUB_H = $(IDL_SOURCES:.idl=Stub.h)
@@ -52,21 +41,6 @@
$(STUB_CPP) \
$(ORB_SRC)
-RTCSKEL_H = $(RTCSKEL_SOURCES:.idl=Skel.h)
-RTCSKEL_CPP = $(RTCSKEL_SOURCES:.idl=Skel.cpp)
-RTCSTUB_H = $(RTCSKEL_SOURCES:.idl=Stub.h)
-RTCSTUB_CPP = $(RTCSKEL_SOURCES:.idl=Stub.cpp)
-
-MANIPULATORSKEL_H = $(MANIPULATORSKEL_SOURCES:.idl=Skel.h)
-MANIPULATORSKEL_CPP = $(MANIPULATORSKEL_SOURCES:.idl=Skel.cpp)
-MANIPULATORSTUB_H = $(MANIPULATORSKEL_SOURCES:.idl=Stub.h)
-MANIPULATORSTUB_CPP = $(MANIPULATORSKEL_SOURCES:.idl=Stub.cpp)
-
-CAMERASKEL_H = $(CAMERASKEL_SOURCES:.idl=Skel.h)
-CAMERASKEL_CPP = $(CAMERASKEL_SOURCES:.idl=Skel.cpp)
-CAMERASTUB_H = $(CAMERASKEL_SOURCES:.idl=Stub.h)
-CAMERASTUB_CPP = $(CAMERASKEL_SOURCES:.idl=Stub.cpp)
-
if ORB_IS_TAO
ORB_SRC = $(TAO_SRC)
endif
@@ -106,24 +80,7 @@
BasicDataTypeSkel.h \
DataPortSkel.h \
ExtendedDataTypesSkel.h \
- InterfaceDataTypesSkel.h \
- ManipulatorCommonInterface_DataTypesSkel.h \
- ManipulatorCommonInterface_CommonSkel.h \
- ManipulatorCommonInterface_MiddleSkel.h \
- ImgSkel.h
-DUMMY_STUBS = \
- SDOPackageStub.h \
- RTCStub.h \
- OpenRTMStub.h \
- ManagerStub.h \
- BasicDataTypeStub.h \
- DataPortStub.h \
- ExtendedDataTypesStub.h \
- InterfaceDataTypesStub.h \
- ManipulatorCommonInterface_DataTypesStub.h \
- ManipulatorCommonInterface_CommonStub.h \
- ManipulatorCommonInterface_MiddleStub.h \
- ImgStub.h
+ InterfaceDataTypesSkel.h
ORB_SRC = $(RTORB_SRC)
endif
@@ -189,10 +146,6 @@
echo '#include "Manager.idl"' >> OpenRTM-aist.idl
echo '#include "DataPort.idl"' >> OpenRTM-aist.idl
echo '#include "InterfaceDataTypes.idl"' >> OpenRTM-aist.idl
- echo '#include "ManipulatorCommonInterface_DataTypes.idl"' >> OpenRTM-aist.idl
- echo '#include "ManipulatorCommonInterface_Common.idl"' >> OpenRTM-aist.idl
- echo '#include "ManipulatorCommonInterface_Middle.idl"' >> OpenRTM-aist.idl
- echo '#include "CameraCommonInterface.idl"' >> OpenRTM-aist.idl
idl-stamp: $(IDL_SOURCES)
@touch idl-stamp
@@ -238,8 +191,8 @@
nodist_libRTCSkel_la_SOURCES = OpenRTM-aistSkel.cpp
nodist_libRTCStub_la_SOURCES = OpenRTM-aistStub.cpp
else
-nodist_libRTCSkel_la_SOURCES = $(RTCSKEL_CPP)
-nodist_libRTCStub_la_SOURCES = $(RTCSTUB_CPP)
+nodist_libRTCSkel_la_SOURCES = $(SKEL_CPP)
+nodist_libRTCStub_la_SOURCES = $(STUB_CPP)
endif
libRTCSkel_la_LIBADD = $(LIBS)
@@ -247,23 +200,7 @@
#
#------------------------------------------------------------
-lib_LTLIBRARIES = \
- libManipulatorSkel.la \
- libManipulatorStub.la \
- libCameraSkel.la \
- libCameraStub.la
-libManipulatorSkel_la_SOURCES = $(MANIPULATORSKEL_CPP)
-libManipulatorStub_la_SOURCES = $(MANIPULATORSTUB_CPP)
-
-libCameraSkel_la_SOURCES = $(CAMERASKEL_CPP)
-libCameraStub_la_SOURCES = $(CAMERASTUB_CPP)
-
-libManipulatorSkel_la_LIBADD = $(LIBS)
-libManipulatorStub_la_LIBADD = $(LIBS)
-libCameraSkel_la_LIBADD = $(LIBS)
-libCameraStub_la_LIBADD = $(LIBS)
-
#------------------------------------------------------------
# File list for deb/ports packages
#------------------------------------------------------------
@@ -296,27 +233,9 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc9.vcproj \
--yaml libRTCSkel.vcproj.yaml \
- --source $(RTCSKEL_CPP) \
- --header $(RTCSKEL_H)
+ --source $(SKEL_CPP) \
+ --header $(SKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc9.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "9.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libManipulatorSkel_vc9.vcproj \
- --yaml libManipulatorSkel.vcproj.yaml \
- --source $(MANIPULATORSKEL_CPP) \
- --header $(MANIPULATORSKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libManipulatorSkel_vc9.vcproj
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "9.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libCameraSkel_vc9.vcproj \
- --yaml libCameraSkel.vcproj.yaml \
- --source $(CAMERASKEL_CPP) \
- --header $(CAMERASKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libCameraSkel_vc9.vcproj
vc10proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -325,27 +244,9 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcxproj \
--yaml libRTCSkel.vcproj.yaml \
- --source $(RTCSKEL_CPP) \
- --header $(RTCSKEL_H)
+ --source $(SKEL_CPP) \
+ --header $(SKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "10.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libManipulatorSkel_vc10.vcxproj \
- --yaml libManipulatorSkel.vcproj.yaml \
- --source $(MANIPULATORSKEL_CPP) \
- --header $(MANIPULATORSKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libManipulatorSkel_vc10.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "10.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libCameraSkel_vc10.vcxproj \
- --yaml libCameraSkel.vcproj.yaml \
- --source $(CAMERASKEL_CPP) \
- --header $(CAMERASKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libCameraSkel_vc10.vcxproj
vc11proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -354,27 +255,9 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc11.vcxproj \
--yaml libRTCSkel.vcproj.yaml \
- --source $(RTCSKEL_CPP) \
- --header $(RTCSKEL_H)
+ --source $(SKEL_CPP) \
+ --header $(SKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libManipulatorSkel_vc11.vcxproj \
- --yaml libManipulatorSkel.vcproj.yaml \
- --source $(MANIPULATORSKEL_CPP) \
- --header $(MANIPULATORSKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libManipulatorSkel_vc11.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libCameraSkel_vc11.vcxproj \
- --yaml libCameraSkel.vcproj.yaml \
- --source $(CAMERASKEL_CPP) \
- --header $(CAMERASKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libCameraSkel_vc11.vcxproj
vc12proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -383,57 +266,19 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc12.vcxproj \
--yaml libRTCSkel.vcproj.yaml \
- --source $(RTCSKEL_CPP) \
- --header $(RTCSKEL_H)
+ --source $(SKEL_CPP) \
+ --header $(SKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libManipulatorSkel_vc12.vcxproj \
- --yaml libManipulatorSkel.vcproj.yaml \
- --source $(MANIPULATORSKEL_CPP) \
- --header $(MANIPULATORSKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libManipulatorSkel_vc12.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libCameraSkel_vc12.vcxproj \
- --yaml libCameraSkel.vcproj.yaml \
- --source $(CAMERASKEL_CPP) \
- --header $(CAMERASKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libCameraSkel_vc12.vcxproj
vc14proj: libRTCSkel.vcproj.yaml
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
- --vcversion "14.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libRTCSkel_vc14.vcxproj \
- --yaml libRTCSkel.vcproj.yaml \
- --source $(RTCSKEL_CPP) \
- --header $(RTCSKEL_H)
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type LIB \
+ --vcversion "14.00" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/rtm/idl/libRTCSkel_vc14.vcxproj \
+ --yaml libRTCSkel.vcproj.yaml \
+ --source $(SKEL_CPP) \
+ --header $(SKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc14.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "14.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libManipulatorSkel_vc14.vcxproj \
- --yaml libManipulatorSkel.vcproj.yaml \
- --source $(MANIPULATORSKEL_CPP) \
- --header $(MANIPULATORSKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libManipulatorSkel_vc14.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "14.00" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libCameraSkel_vc14.vcxproj \
- --yaml libCameraSkel.vcproj.yaml \
- --source $(CAMERASKEL_CPP) \
- --header $(CAMERASKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libCameraSkel_vc14.vcxproj
-
-
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
@@ -457,4 +302,3 @@
libRTCSkel.vcproj.yaml
DIST_SUBDIRS = device_interfaces
-
Deleted: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_Common.idl
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_Common.idl 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_Common.idl 2016-05-24 02:13:45 UTC (rev 2723)
@@ -1,58 +0,0 @@
-/*
- Manipulator Common Interface (Common Commands)
- - This IDL is used as service port on RTC
- - This command specification is provided by Intelligent RT Software
- Project of JARA.
- rev. 20140205
-*/
-
-#ifndef MANIPULATORCOMMONINTERFACE_COMMON_IDL
-#define MANIPULATORCOMMONINTERFACE_COMMON_IDL
-
-#include "ManipulatorCommonInterface_DataTypes.idl"
-
-module JARA_ARM {
-
- enum AlarmType {
- FAULT,
- WARNING,
- UNKNOWN
- };
-
- struct Alarm {
- unsigned long code;
- AlarmType type;
- string description;
- };
-
- typedef sequence<Alarm> AlarmSeq;
- typedef sequence<LimitValue> LimitSeq;
-
- struct ManipInfo {
- string manufactur;
- string type;
- ULONG axisNum;
- ULONG cmdCycle;
- boolean isGripper;
- };
-
- const ULONG CONST_BINARY_00000001 = 0x01; //isServoOn
- const ULONG CONST_BINARY_00000010 = 0x02; //isMoving
- const ULONG CONST_BINARY_00000100 = 0x04; //isAlarmed
- const ULONG CONST_BINARY_00001000 = 0x08; //isBufferFull
-
- interface ManipulatorCommonInterface_Common {
- RETURN_ID clearAlarms();
- RETURN_ID getActiveAlarm(out AlarmSeq alarms);
- RETURN_ID getFeedbackPosJoint(out JointPos pos);
- RETURN_ID getManipInfo(out ManipInfo mInfo);
- RETURN_ID getSoftLimitJoint(out LimitSeq softLimit);
- RETURN_ID getState(out ULONG state);
- RETURN_ID servoOFF();
- RETURN_ID servoON();
- RETURN_ID setSoftLimitJoint(in LimitSeq softLimit);
- };
-};
-
-#endif // MANIPULATORCOMMONINTERFACE_COMMON_IDL
-
Deleted: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_DataTypes.idl
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_DataTypes.idl 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_DataTypes.idl 2016-05-24 02:13:45 UTC (rev 2723)
@@ -1,46 +0,0 @@
-/*
- Manipulator Common Interface (Data type defenition)
- - This IDL is used as service port on RTC
- - This command specification is provided by Intelligent RT Software
- Project of JARA.
- rev. 20140205
-*/
-
-#ifndef MANIPULATORCOMMONINTERFACE_DATATYPES_IDL
-#define MANIPULATORCOMMONINTERFACE_DATATYPES_IDL
-
-#include "BasicDataType.idl"
-
-module JARA_ARM {
-
- typedef sequence<double> DoubleSeq;
- typedef sequence<double> JointPos;
-
- struct LimitValue {
- double upper;
- double lower;
- };
-
- struct RETURN_ID{
- long id;
- string comment;
- };
-
- const long OK = 0;
- const long NG = -1;
- const long STATUS_ERR = -2;
- const long VALUE_ERR = -3;
- const long NOT_SV_ON_ERR = -4;
- const long FULL_MOTION_QUEUE_ERR = -5;
- const long NOT_IMPLEMENTED = -6;
-
- struct TimedJointPos {
- RTC::Time tm;
- JointPos pos;
- };
-
- typedef unsigned long ULONG;
-};
-
-#endif // MANIPULATORCOMMONINTERFACE_DATATYPES_IDL
-
Deleted: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_Middle.idl
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_Middle.idl 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/ManipulatorCommonInterface_Middle.idl 2016-05-24 02:13:45 UTC (rev 2723)
@@ -1,73 +0,0 @@
-/*
- Manipulator Common Interface (Middle Level Commands)
- - This IDL is used as service port on RTC
- - This command specification is provided by Intelligent RT Software
- Project of JARA.
- rev. 20140205
-*/
-
-#ifndef MANIPULATORCOMMONINTERFACE_MIDDLE_IDL
-#define MANIPULATORCOMMONINTERFACE_MIDDLE_IDL
-
-#include "ManipulatorCommonInterface_DataTypes.idl"
-
-module JARA_ARM {
-
- typedef double HgMatrix [3][4];
-
- struct CarPosWithElbow {
- HgMatrix carPos;
- double elbow;
- ULONG structFlag;
- };
-
- struct CartesianSpeed {
- double translation;
- double rotation;
- };
-
- interface ManipulatorCommonInterface_Middle {
- RETURN_ID closeGripper();
- RETURN_ID getBaseOffset(out HgMatrix offset);
- RETURN_ID getFeedbackPosCartesian(out CarPosWithElbow pos);
- RETURN_ID getMaxSpeedCartesian(out CartesianSpeed speed);
- RETURN_ID getMaxSpeedJoint(out DoubleSeq speed);
- RETURN_ID getMinAccelTimeCartesian(out double aclTime);
- RETURN_ID getMinAccelTimeJoint(out double aclTime);
- RETURN_ID getSoftLimitCartesian(out LimitValue xLimit,
- out LimitValue yLimit, out LimitValue zLimit );
- RETURN_ID moveGripper(in ULONG angleRatio);
- RETURN_ID moveLinearCartesianAbs(in CarPosWithElbow carPoint);
- RETURN_ID moveLinearCartesianRel(in CarPosWithElbow carPoint);
- RETURN_ID movePTPCartesianAbs(in CarPosWithElbow carPoint);
- RETURN_ID movePTPCartesianRel(in CarPosWithElbow carPoint);
- RETURN_ID movePTPJointAbs(in JointPos jointPoints);
- RETURN_ID movePTPJointRel(in JointPos jointPoints);
- RETURN_ID openGripper();
- RETURN_ID pause();
- RETURN_ID resume();
- RETURN_ID stop();
- RETURN_ID setAccelTimeCartesian(in double aclTime);
- RETURN_ID setAccelTimeJoint(in double aclTime);
- RETURN_ID setBaseOffset(in HgMatrix offset);
- RETURN_ID setControlPointOffset(in HgMatrix offset);
- RETURN_ID setMaxSpeedCartesian(in CartesianSpeed speed);
- RETURN_ID setMaxSpeedJoint(in DoubleSeq speed);
- RETURN_ID setMinAccelTimeCartesian(in double aclTime);
- RETURN_ID setMinAccelTimeJoint(in double aclTime);
- RETURN_ID setSoftLimitCartesian(in LimitValue xLimit,
- in LimitValue yLimit, in LimitValue zLimit);
- RETURN_ID setSpeedCartesian(in ULONG spdRatio);
- RETURN_ID setSpeedJoint(in ULONG spdRatio);
- RETURN_ID moveCircularCartesianAbs(in CarPosWithElbow carPointR,
- in CarPosWithElbow carPointT);
- RETURN_ID moveCircularCartesianRel(in CarPosWithElbow carPointR,
- in CarPosWithElbow carPointT);
- RETURN_ID setHome(in JointPos jointPoint);
- RETURN_ID getHome(out JointPos jointPoint);
- RETURN_ID goHome();
- };
-};
-
-#endif // MANIPULATORCOMMONINTERFACE_MIDDLE_IDL
-
Deleted: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libCameraSkel.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libCameraSkel.vcproj.yaml 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libCameraSkel.vcproj.yaml 2016-05-24 02:13:45 UTC (rev 2723)
@@ -1,476 +0,0 @@
-#
-# @brief VCProject configuration file for libCameraSkel
-# @date $Date$
-# @author Norkai Ando <n-ando at aist.go.jp>
-#
-ProjectType: "Visual C++"
-Version: "__VCVERSION__"
-Name: libCameraSkel
-ProjectGUID: __GUID__
-RootNamespace: libCameraSkel
-Keyword: "Win32Proj"
-Configurations:
-#------------------------------------------------------------
-# Debug Configuration
-#------------------------------------------------------------
- - Name: "Debug|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
- ConfigurationType: "2"
- InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
- CharacterSet: "0"
- VCPreBuildEventTool:
- - Key: CommandLine
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py CameraCommonInterface.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

- VCCLCompilerTool:
- - Key: Optimization
- Value: "0"
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
- - Key: MinimalRebuild
- Value: "true"
- - Key: BasicRuntimeChecks
- Value: "3"
- - Key: RuntimeLibrary
- Value: "3"
- - Key: UsePrecompiledHeader
- Value: "0"
- - Key: WarningLevel
- Value: "3"
- - Key: DebugInformationFormat
- Value: "4"
- VCPreLinkEventTool:
- - Key: CommandLine
- Value: |
- lib -out:"$(TargetDir)CameraSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py CameraSkel_static.lib CameraSkel$(rtm_dllver)d $(rtm_shortver) CameraSkel$(rtm_dllver)d.def
- move CameraSkel$(rtm_dllver)d.def ..\
- VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkeld.lib $(rtm_depend_libd)"
- - Key: OutputFile
- Value: "$(OutDir)\\CameraSkel$(rtm_dllver)d.dll"
- - Key: Version
- Value: $(rtm_shortver)
- - Key: LinkIncremental
- Value: "2"
- - Key: ModuleDefinitionFile
- Value: "$(TargetName).def"
- - Key: GenerateDebugInformation
- Value: "true"
- - Key: SubSystem
- Value: "2"
- - Key: TargetMachine
- Value: "1"
- VCPostBuildEventTool:
- - Key: CommandLine
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
- copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
- VC10_InheritedPropertySheets:
- - "$(SolutionDir)rtm_config.props"
- - "$(SolutionDir)rtm_distbuild.props"
- VC10_LinkIncrementalCondition: "true"
- VC10_VCPreBuildEventTool:
- - Key: Command
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py CameraCommonInterface.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

- VC10_VCCLCompilerTool:
- - Key: Optimization
- Value: "Disabled"
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
- - Key: MinimalRebuild
- Value: "true"
- - Key: BasicRuntimeChecks
- Value: "EnableFastChecks"
- - Key: RuntimeLibrary
- Value: "MultiThreadedDebugDLL"
- - Key: PrecompiledHeader
- Value: "NotUsing"
- - Key: WarningLevel
- Value: "Level3"
- - Key: DebugInformationFormat
- Value: "ProgramDatabase"
- VC10_VCPreLinkEventTool:
- - Key: Command
- Value: |
- lib -out:"$(TargetDir)CameraSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py CameraSkel_static.lib CameraSkel$(rtm_dllver)d $(rtm_shortver) CameraSkel$(rtm_dllver)d.def
- move CameraSkel$(rtm_dllver)d.def ..\
- VC10_VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
- - Key: OutputFile
- Value: "$(OutDir)\\CameraSkel$(rtm_dllver)d.dll"
- - Key: Version
- Value: $(rtm_shortver)
- - Key: LinkIncremental
- Value: "true"
- - Key: ModuleDefinitionFile
- Value: "CameraSkel$(rtm_dllver)d.def"
- - Key: GenerateDebugInformation
- Value: "true"
- - Key: SubSystem
- Value: "Windows"
- - Key: TargetMachine
- Value: "MachineX86"
- VC10_VCPostBuildEventTool:
- - Key: Command
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\CameraSkel$(rtm_dllver)d.lib"
- copy "$(OutDir)\\CameraSkel$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
- - Name: "Debug|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
- ConfigurationType: "2"
- InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
- CharacterSet: "0"
- VCPreBuildEventTool:
- - Key: CommandLine
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py CameraCommonInterface.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

- VCCLCompilerTool:
- - Key: Optimization
- Value: "0"
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
- - Key: MinimalRebuild
- Value: "true"
- - Key: BasicRuntimeChecks
- Value: "3"
- - Key: RuntimeLibrary
- Value: "3"
- - Key: UsePrecompiledHeader
- Value: "0"
- - Key: WarningLevel
- Value: "3"
- - Key: DebugInformationFormat
- Value: "4"
- VCPreLinkEventTool:
- - Key: CommandLine
- Value: |
- lib -out:"$(TargetDir)CameraSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py CameraSkel_static.lib CameraSkel$(rtm_dllver)d $(rtm_shortver) CameraSkel$(rtm_dllver)d.def
- move CameraSkel$(rtm_dllver)d.def ..\
- VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkeld.lib $(rtm_depend_libd)"
- - Key: OutputFile
- Value: "$(OutDir)\\CameraSkel$(rtm_dllver)d.dll"
- - Key: Version
- Value: $(rtm_shortver)
- - Key: LinkIncremental
- Value: "2"
- - Key: ModuleDefinitionFile
- Value: "$(TargetName).def"
- - Key: GenerateDebugInformation
- Value: "true"
- - Key: SubSystem
- Value: "2"
- - Key: TargetMachine
- Value: "1"
- VCPostBuildEventTool:
- - Key: CommandLine
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
- copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
- VC10_InheritedPropertySheets:
- - "$(SolutionDir)rtm_config.props"
- - "$(SolutionDir)rtm_distbuild.props"
- VC10_LinkIncrementalCondition: "true"
- VC10_VCPreBuildEventTool:
- - Key: Command
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py CameraCommonInterface.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

- VC10_VCCLCompilerTool:
- - Key: Optimization
- Value: "Disabled"
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
- - Key: MinimalRebuild
- Value: "true"
- - Key: BasicRuntimeChecks
- Value: "EnableFastChecks"
- - Key: RuntimeLibrary
- Value: "MultiThreadedDebugDLL"
- - Key: PrecompiledHeader
- Value: "NotUsing"
- - Key: WarningLevel
- Value: "Level3"
- - Key: DebugInformationFormat
- Value: "ProgramDatabase"
- VC10_VCPreLinkEventTool:
- - Key: Command
- Value: |
- lib -out:"$(TargetDir)CameraSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py CameraSkel_static.lib CameraSkel$(rtm_dllver)d $(rtm_shortver) CameraSkel$(rtm_dllver)d.def
- move CameraSkel$(rtm_dllver)d.def ..\
- VC10_VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
- - Key: OutputFile
- Value: "$(OutDir)\\CameraSkel$(rtm_dllver)d.dll"
- - Key: Version
- Value: $(rtm_shortver)
- - Key: LinkIncremental
- Value: "true"
- - Key: ModuleDefinitionFile
- Value: "CameraSkel$(rtm_dllver)d.def"
- - Key: GenerateDebugInformation
- Value: "true"
- - Key: SubSystem
- Value: "Windows"
- - Key: TargetMachine
- Value: "MachineX64"
- VC10_VCPostBuildEventTool:
- - Key: Command
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\CameraSkel$(rtm_dllver)d.lib"
- copy "$(OutDir)\\CameraSkel$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
-#------------------------------------------------------------
-# Release Configuration
-#------------------------------------------------------------
- - Name: "Release|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
- ConfigurationType: "2"
- InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
- CharacterSet: "0"
- WholeProgramOptimization: "0"
- VCPreBuildEventTool:
- - Key: CommandLine
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py CameraCommonInterface.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

- VCCLCompilerTool:
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
- - Key: RuntimeLibrary
- Value: "2"
- - Key: UsePrecompiledHeader
- Value: "0"
- - Key: WarningLevel
- Value: "3"
- - Key: DebugInformationFormat
- Value: "3"
- VCPreLinkEventTool:
- - Key: CommandLine
- Value: |
- lib -out:"$(TargetDir)CameraSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(OutDir)"
- start /wait cmd /c makedeffile.py CameraSkel_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move CameraSkel$(rtm_dllver).def ..\\
- VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkel.lib $(rtm_depend_lib)"
- - Key: OutputFile
- Value: "$(OutDir)\\CameraSkel$(rtm_dllver).dll"
- - Key: LinkIncremental
- Value: "1"
- - Key: ModuleDefinitionFile
- Value: "$(TargetName).def"
- - Key: GenerateDebugInformation
- Value: "false"
- - Key: SubSystem
- Value: "2"
- - Key: OptimizeReferences
- Value: "2"
- - Key: EnableCOMDATFolding
- Value: "2"
- - Key: TargetMachine
- Value: "1"
- VCPostBuildEventTool:
- - Key: CommandLine
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
- copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
- VC10_InheritedPropertySheets:
- - "$(SolutionDir)rtm_config.props"
- - "$(SolutionDir)rtm_distbuild.props"
- VC10_LinkIncrementalCondition: "false"
- VC10_VCPreBuildEventTool:
- - Key: Command
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py CameraCommonInterface.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

- VC10_VCCLCompilerTool:
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
- - Key: RuntimeLibrary
- Value: "MultiThreadedDLL"
- - Key: PrecompiledHeader
- Value: "NotUsing"
- - Key: WarningLevel
- Value: "Level3"
- - Key: DebugInformationFormat
- Value: "ProgramDatabase"
- VC10_VCPreLinkEventTool:
- - Key: Command
- Value: |
- lib -out:"$(TargetDir)CameraSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(OutDir)"
- start /wait cmd /c makedeffile.py CameraSkel_static.lib CameraSkel$(rtm_dllver) $(rtm_shortver) CameraSkel$(rtm_dllver).def
- move CameraSkel$(rtm_dllver).def ..\\
- VC10_VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
- - Key: OutputFile
- Value: "$(OutDir)\\CameraSkel$(rtm_dllver).dll"
- - Key: LinkIncremental
- Value: "false"
- - Key: ModuleDefinitionFile
- Value: "CameraSkel$(rtm_dllver).def"
- - Key: GenerateDebugInformation
- Value: "false"
- - Key: SubSystem
- Value: "Windows"
- - Key: OptimizeReferences
- Value: "true"
- - Key: EnableCOMDATFolding
- Value: "true"
- - Key: TargetMachine
- Value: "MachineX86"
- VC10_VCPostBuildEventTool:
- - Key: Command
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\CameraSkel$(rtm_dllver).lib"
- copy "$(OutDir)\\CameraSkel$(rtm_dllver).dll" "$(SolutionDir)bin\\"
- - Name: "Release|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
- ConfigurationType: "2"
- InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
- CharacterSet: "0"
- WholeProgramOptimization: "0"
- VCPreBuildEventTool:
- - Key: CommandLine
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py CameraCommonInterface.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

- VCCLCompilerTool:
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
- - Key: RuntimeLibrary
- Value: "2"
- - Key: UsePrecompiledHeader
- Value: "0"
- - Key: WarningLevel
- Value: "3"
- - Key: DebugInformationFormat
- Value: "3"
- VCPreLinkEventTool:
- - Key: CommandLine
- Value: |
- lib -out:"$(TargetDir)CameraSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(OutDir)"
- start /wait cmd /c makedeffile.py CameraSkel_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move CameraSkel$(rtm_dllver).def ..\\
- VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkel.lib $(rtm_depend_lib)"
- - Key: OutputFile
- Value: "$(OutDir)\\CameraSkel$(rtm_dllver).dll"
- - Key: LinkIncremental
- Value: "1"
- - Key: ModuleDefinitionFile
- Value: "$(TargetName).def"
- - Key: GenerateDebugInformation
- Value: "false"
- - Key: SubSystem
- Value: "2"
- - Key: OptimizeReferences
- Value: "2"
- - Key: EnableCOMDATFolding
- Value: "2"
- - Key: TargetMachine
- Value: "1"
- VCPostBuildEventTool:
- - Key: CommandLine
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
- copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
- VC10_InheritedPropertySheets:
- - "$(SolutionDir)rtm_config.props"
- - "$(SolutionDir)rtm_distbuild.props"
- VC10_LinkIncrementalCondition: "false"
- VC10_VCPreBuildEventTool:
- - Key: Command
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py CameraCommonInterface.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

- VC10_VCCLCompilerTool:
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
- - Key: RuntimeLibrary
- Value: "MultiThreadedDLL"
- - Key: PrecompiledHeader
- Value: "NotUsing"
- - Key: WarningLevel
- Value: "Level3"
- - Key: DebugInformationFormat
- Value: "ProgramDatabase"
- VC10_VCPreLinkEventTool:
- - Key: Command
- Value: |
- lib -out:"$(TargetDir)CameraSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(OutDir)"
- start /wait cmd /c makedeffile.py CameraSkel_static.lib CameraSkel$(rtm_dllver) $(rtm_shortver) CameraSkel$(rtm_dllver).def
- move CameraSkel$(rtm_dllver).def ..\\
- VC10_VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
- - Key: OutputFile
- Value: "$(OutDir)\\CameraSkel$(rtm_dllver).dll"
- - Key: LinkIncremental
- Value: "false"
- - Key: ModuleDefinitionFile
- Value: "CameraSkel$(rtm_dllver).def"
- - Key: GenerateDebugInformation
- Value: "false"
- - Key: SubSystem
- Value: "Windows"
- - Key: OptimizeReferences
- Value: "true"
- - Key: EnableCOMDATFolding
- Value: "true"
- - Key: TargetMachine
- Value: "MachineX64"
- VC10_VCPostBuildEventTool:
- - Key: Command
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\CameraSkel$(rtm_dllver).lib"
- copy "$(OutDir)\\CameraSkel$(rtm_dllver).dll" "$(SolutionDir)bin\\"
Deleted: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libManipulatorSkel.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libManipulatorSkel.vcproj.yaml 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/libManipulatorSkel.vcproj.yaml 2016-05-24 02:13:45 UTC (rev 2723)
@@ -1,508 +0,0 @@
-#
-# @brief VCProject configuration file for libManipulatorSkel
-# @date $Date: 2008-02-29 04:58:39 $
-# @author Norkai Ando <n-ando at aist.go.jp>
-#
-ProjectType: "Visual C++"
-Version: "__VCVERSION__"
-Name: libManipulatorSkel
-ProjectGUID: __GUID__
-RootNamespace: libManipulatorSkel
-Keyword: "Win32Proj"
-Configurations:
-#------------------------------------------------------------
-# Debug Configuration
-#------------------------------------------------------------
- - Name: "Debug|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
- ConfigurationType: "2"
- InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
- CharacterSet: "0"
- VCPreBuildEventTool:
- - Key: CommandLine
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- VCCLCompilerTool:
- - Key: Optimization
- Value: "0"
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
- - Key: MinimalRebuild
- Value: "true"
- - Key: BasicRuntimeChecks
- Value: "3"
- - Key: RuntimeLibrary
- Value: "3"
- - Key: UsePrecompiledHeader
- Value: "0"
- - Key: WarningLevel
- Value: "3"
- - Key: DebugInformationFormat
- Value: "4"
- VCPreLinkEventTool:
- - Key: CommandLine
- Value: |
- lib -out:"$(TargetDir)ManipulatorSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py ManipulatorSkel_static.lib ManipulatorSkel$(rtm_dllver)d $(rtm_shortver) ManipulatorSkel$(rtm_dllver)d.def
- move ManipulatorSkel$(rtm_dllver)d.def ..\
- VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkeld.lib $(rtm_depend_libd)"
- - Key: OutputFile
- Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver)d.dll"
- - Key: Version
- Value: $(rtm_shortver)
- - Key: LinkIncremental
- Value: "2"
- - Key: ModuleDefinitionFile
- Value: "$(TargetName).def"
- - Key: GenerateDebugInformation
- Value: "true"
- - Key: SubSystem
- Value: "2"
- - Key: TargetMachine
- Value: "1"
- VCPostBuildEventTool:
- - Key: CommandLine
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
- copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
- VC10_InheritedPropertySheets:
- - "$(SolutionDir)rtm_config.props"
- - "$(SolutionDir)rtm_distbuild.props"
- VC10_LinkIncrementalCondition: "true"
- VC10_VCPreBuildEventTool:
- - Key: Command
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- VC10_VCCLCompilerTool:
- - Key: Optimization
- Value: "Disabled"
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
- - Key: MinimalRebuild
- Value: "true"
- - Key: BasicRuntimeChecks
- Value: "EnableFastChecks"
- - Key: RuntimeLibrary
- Value: "MultiThreadedDebugDLL"
- - Key: PrecompiledHeader
- Value: "NotUsing"
- - Key: WarningLevel
- Value: "Level3"
- - Key: DebugInformationFormat
- Value: "ProgramDatabase"
- VC10_VCPreLinkEventTool:
- - Key: Command
- Value: |
- lib -out:"$(TargetDir)ManipulatorSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py ManipulatorSkel_static.lib ManipulatorSkel$(rtm_dllver)d $(rtm_shortver) ManipulatorSkel$(rtm_dllver)d.def
- move ManipulatorSkel$(rtm_dllver)d.def ..\
- VC10_VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
- - Key: OutputFile
- Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver)d.dll"
- - Key: Version
- Value: $(rtm_shortver)
- - Key: LinkIncremental
- Value: "true"
- - Key: ModuleDefinitionFile
- Value: "ManipulatorSkel$(rtm_dllver)d.def"
- - Key: GenerateDebugInformation
- Value: "true"
- - Key: SubSystem
- Value: "Windows"
- - Key: TargetMachine
- Value: "MachineX86"
- VC10_VCPostBuildEventTool:
- - Key: Command
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\ManipulatorSkel$(rtm_dllver)d.lib"
- copy "$(OutDir)\\ManipulatorSkel$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
- - Name: "Debug|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
- ConfigurationType: "2"
- InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
- CharacterSet: "0"
- VCPreBuildEventTool:
- - Key: CommandLine
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- VCCLCompilerTool:
- - Key: Optimization
- Value: "0"
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
- - Key: MinimalRebuild
- Value: "true"
- - Key: BasicRuntimeChecks
- Value: "3"
- - Key: RuntimeLibrary
- Value: "3"
- - Key: UsePrecompiledHeader
- Value: "0"
- - Key: WarningLevel
- Value: "3"
- - Key: DebugInformationFormat
- Value: "4"
- VCPreLinkEventTool:
- - Key: CommandLine
- Value: |
- lib -out:"$(TargetDir)ManipulatorSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py ManipulatorSkel_static.lib ManipulatorSkel$(rtm_dllver)d $(rtm_shortver) ManipulatorSkel$(rtm_dllver)d.def
- move ManipulatorSkel$(rtm_dllver)d.def ..\
- VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkeld.lib $(rtm_depend_libd)"
- - Key: OutputFile
- Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver)d.dll"
- - Key: Version
- Value: $(rtm_shortver)
- - Key: LinkIncremental
- Value: "2"
- - Key: ModuleDefinitionFile
- Value: "$(TargetName).def"
- - Key: GenerateDebugInformation
- Value: "true"
- - Key: SubSystem
- Value: "2"
- - Key: TargetMachine
- Value: "1"
- VCPostBuildEventTool:
- - Key: CommandLine
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
- copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
- VC10_InheritedPropertySheets:
- - "$(SolutionDir)rtm_config.props"
- - "$(SolutionDir)rtm_distbuild.props"
- VC10_LinkIncrementalCondition: "true"
- VC10_VCPreBuildEventTool:
- - Key: Command
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- VC10_VCCLCompilerTool:
- - Key: Optimization
- Value: "Disabled"
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
- - Key: MinimalRebuild
- Value: "true"
- - Key: BasicRuntimeChecks
- Value: "EnableFastChecks"
- - Key: RuntimeLibrary
- Value: "MultiThreadedDebugDLL"
- - Key: PrecompiledHeader
- Value: "NotUsing"
- - Key: WarningLevel
- Value: "Level3"
- - Key: DebugInformationFormat
- Value: "ProgramDatabase"
- VC10_VCPreLinkEventTool:
- - Key: Command
- Value: |
- lib -out:"$(TargetDir)ManipulatorSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py ManipulatorSkel_static.lib ManipulatorSkel$(rtm_dllver)d $(rtm_shortver) ManipulatorSkel$(rtm_dllver)d.def
- move ManipulatorSkel$(rtm_dllver)d.def ..\
- VC10_VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
- - Key: OutputFile
- Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver)d.dll"
- - Key: Version
- Value: $(rtm_shortver)
- - Key: LinkIncremental
- Value: "true"
- - Key: ModuleDefinitionFile
- Value: "ManipulatorSkel$(rtm_dllver)d.def"
- - Key: GenerateDebugInformation
- Value: "true"
- - Key: SubSystem
- Value: "Windows"
- - Key: TargetMachine
- Value: "MachineX64"
- VC10_VCPostBuildEventTool:
- - Key: Command
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\ManipulatorSkel$(rtm_dllver)d.lib"
- copy "$(OutDir)\\ManipulatorSkel$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
-#------------------------------------------------------------
-# Release Configuration
-#------------------------------------------------------------
- - Name: "Release|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
- ConfigurationType: "2"
- InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
- CharacterSet: "0"
- WholeProgramOptimization: "0"
- VCPreBuildEventTool:
- - Key: CommandLine
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- VCCLCompilerTool:
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
- - Key: RuntimeLibrary
- Value: "2"
- - Key: UsePrecompiledHeader
- Value: "0"
- - Key: WarningLevel
- Value: "3"
- - Key: DebugInformationFormat
- Value: "3"
- VCPreLinkEventTool:
- - Key: CommandLine
- Value: |
- lib -out:"$(TargetDir)ManipulatorSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(OutDir)"
- start /wait cmd /c makedeffile.py ManipulatorSkel_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move ManipulatorSkel$(rtm_dllver).def ..\\
- VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkel.lib $(rtm_depend_lib)"
- - Key: OutputFile
- Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver).dll"
- - Key: LinkIncremental
- Value: "1"
- - Key: ModuleDefinitionFile
- Value: "$(TargetName).def"
- - Key: GenerateDebugInformation
- Value: "false"
- - Key: SubSystem
- Value: "2"
- - Key: OptimizeReferences
- Value: "2"
- - Key: EnableCOMDATFolding
- Value: "2"
- - Key: TargetMachine
- Value: "1"
- VCPostBuildEventTool:
- - Key: CommandLine
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
- copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
- VC10_InheritedPropertySheets:
- - "$(SolutionDir)rtm_config.props"
- - "$(SolutionDir)rtm_distbuild.props"
- VC10_LinkIncrementalCondition: "false"
- VC10_VCPreBuildEventTool:
- - Key: Command
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- VC10_VCCLCompilerTool:
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
- - Key: RuntimeLibrary
- Value: "MultiThreadedDLL"
- - Key: PrecompiledHeader
- Value: "NotUsing"
- - Key: WarningLevel
- Value: "Level3"
- - Key: DebugInformationFormat
- Value: "ProgramDatabase"
- VC10_VCPreLinkEventTool:
- - Key: Command
- Value: |
- lib -out:"$(TargetDir)ManipulatorSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(OutDir)"
- start /wait cmd /c makedeffile.py ManipulatorSkel_static.lib ManipulatorSkel$(rtm_dllver) $(rtm_shortver) ManipulatorSkel$(rtm_dllver).def
- move ManipulatorSkel$(rtm_dllver).def ..\\
- VC10_VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
- - Key: OutputFile
- Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver).dll"
- - Key: LinkIncremental
- Value: "false"
- - Key: ModuleDefinitionFile
- Value: "ManipulatorSkel$(rtm_dllver).def"
- - Key: GenerateDebugInformation
- Value: "false"
- - Key: SubSystem
- Value: "Windows"
- - Key: OptimizeReferences
- Value: "true"
- - Key: EnableCOMDATFolding
- Value: "true"
- - Key: TargetMachine
- Value: "MachineX86"
- VC10_VCPostBuildEventTool:
- - Key: Command
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\ManipulatorSkel$(rtm_dllver).lib"
- copy "$(OutDir)\\ManipulatorSkel$(rtm_dllver).dll" "$(SolutionDir)bin\\"
- - Name: "Release|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
- ConfigurationType: "2"
- InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
- CharacterSet: "0"
- WholeProgramOptimization: "0"
- VCPreBuildEventTool:
- - Key: CommandLine
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- VCCLCompilerTool:
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
- - Key: RuntimeLibrary
- Value: "2"
- - Key: UsePrecompiledHeader
- Value: "0"
- - Key: WarningLevel
- Value: "3"
- - Key: DebugInformationFormat
- Value: "3"
- VCPreLinkEventTool:
- - Key: CommandLine
- Value: |
- lib -out:"$(TargetDir)ManipulatorSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(OutDir)"
- start /wait cmd /c makedeffile.py ManipulatorSkel_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move ManipulatorSkel$(rtm_dllver).def ..\\
- VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkel.lib $(rtm_depend_lib)"
- - Key: OutputFile
- Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver).dll"
- - Key: LinkIncremental
- Value: "1"
- - Key: ModuleDefinitionFile
- Value: "$(TargetName).def"
- - Key: GenerateDebugInformation
- Value: "false"
- - Key: SubSystem
- Value: "2"
- - Key: OptimizeReferences
- Value: "2"
- - Key: EnableCOMDATFolding
- Value: "2"
- - Key: TargetMachine
- Value: "1"
- VCPostBuildEventTool:
- - Key: CommandLine
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
- copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
- VC10_InheritedPropertySheets:
- - "$(SolutionDir)rtm_config.props"
- - "$(SolutionDir)rtm_distbuild.props"
- VC10_LinkIncrementalCondition: "false"
- VC10_VCPreBuildEventTool:
- - Key: Command
- Value: |
- set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- VC10_VCCLCompilerTool:
- - Key: PreprocessorDefinitions
- Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
- - Key: RuntimeLibrary
- Value: "MultiThreadedDLL"
- - Key: PrecompiledHeader
- Value: "NotUsing"
- - Key: WarningLevel
- Value: "Level3"
- - Key: DebugInformationFormat
- Value: "ProgramDatabase"
- VC10_VCPreLinkEventTool:
- - Key: Command
- Value: |
- lib -out:"$(TargetDir)ManipulatorSkel_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
- set PATH=%PATH%;$(rtm_path)
- cd "$(OutDir)"
- start /wait cmd /c makedeffile.py ManipulatorSkel_static.lib ManipulatorSkel$(rtm_dllver) $(rtm_shortver) ManipulatorSkel$(rtm_dllver).def
- move ManipulatorSkel$(rtm_dllver).def ..\\
- VC10_VCLinkerTool:
- - Key: AdditionalDependencies
- Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
- - Key: OutputFile
- Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver).dll"
- - Key: LinkIncremental
- Value: "false"
- - Key: ModuleDefinitionFile
- Value: "ManipulatorSkel$(rtm_dllver).def"
- - Key: GenerateDebugInformation
- Value: "false"
- - Key: SubSystem
- Value: "Windows"
- - Key: OptimizeReferences
- Value: "true"
- - Key: EnableCOMDATFolding
- Value: "true"
- - Key: TargetMachine
- Value: "MachineX64"
- VC10_VCPostBuildEventTool:
- - Key: Command
- Value: |
- copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\ManipulatorSkel$(rtm_dllver).lib"
- copy "$(OutDir)\\ManipulatorSkel$(rtm_dllver).dll" "$(SolutionDir)bin\\"
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2016-05-24 02:13:45 UTC (rev 2723)
@@ -9,6 +9,7 @@
clean-local:
rm -f *~ *.sln *.yaml *.ncb *.suo *.user
+ rm -f AUTHORS COPYING.LIB COPYRIGHT ChangeLog README README.jp
rm -rf components
rm -f coil_distbuild.vsprops
rm -f coil_config.vsprops
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2016-05-24 02:13:45 UTC (rev 2723)
@@ -1,7 +1,7 @@
libcoil:
libRTC: libcoil libRTCSkel
-libManipulatorSkel: libcoil libRTCSkel libRTC
-libCameraSkel: libcoil libRTCSkel libManipulatorSkel libRTC
+librtmManipulator: libcoil libRTCSkel libRTC
+librtmCamera: libcoil libRTCSkel librtmManipulator libRTC
rtcd: libcoil libRTC
rtcprof: libcoil libRTC
ComponentObserverConsumer: libcoil libRTC
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am 2016-05-23 04:23:36 UTC (rev 2722)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am 2016-05-24 02:13:45 UTC (rev 2723)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = idl .
+SUBDIRS = idl . ext
RTM_VERSION = @RTM_VERSION@
RTM_SHORT_VERSION = @RTM_SHORT_VERSION@
@@ -24,4 +24,4 @@
dist-hook: src
-EXTRA_DIST = config_rtc.h.in
\ No newline at end of file
+EXTRA_DIST = config_rtc.h.in
Property changes on: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/device_interfaces
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
More information about the openrtm-commit
mailing list