[openrtm-commit:00699] r262 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: META-INF resource resource/100/CXX/build/cmake1 resource/100/CXX/build/cmake1/idl resource/100/CXX/build/cmake1/include resource/100/CXX/build/cmake1/include/foo resource/100/CXX/build/cmake1/src resource/100/CXX/build/cmake2 resource/100/CXX/build/cmake2/include resource/100/CXX/build/cmake2/include/foo resource/100/CXX/build/cmake2/src src/jp/go/aist/rtm/rtcbuilder src/jp/go/aist/rtm/rtcbuilder/generator/param/idl src/jp/go/aist/rtm/rtcbuilder/manager src/jp/go/aist/rtm/rtcbuilder/template src/jp/go/aist/rtm/rtcbuilder/template/cmake src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl src/jp/go/aist/rtm/rtcbuilder/template/cmake/include src/jp/go/aist/rtm/rtcbuilder/template/cmake/src src/jp/go/aist/rtm/rtcbuilder/template/common src/jp/go/aist/rtm/rtcbuilder/template/cpp test/jp/go/aist/rtm/rtcbuilder/_test test/jp/go/aist/rtm/rtcbuilder/_test/_100 test/jp/go/aist/rtm/rtcbuilder/_test/com
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 2月 11日 (土) 02:04:12 JST
Author: sakamoto
Date: 2012-02-11 02:04:12 +0900 (Sat, 11 Feb 2012)
New Revision: 262
Added:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/idl/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/idl/DAQService.idl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/idl/MyService.idl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/MyServiceSVC_impl.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/MyServiceSVC_impl.cpp
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/foo.cpp
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/fooComp.cpp
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildMultiSVC_impl.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildWithTypeSVC_impl.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildMultiSVC_impl.cpp
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildWithTypeSVC_impl.cpp
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/foo.cpp
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/fooComp.cpp
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.LESSER.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/CMakeCMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/License.rtf.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cmake_uninstall.cmake.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/config.cmake.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/config_version.cmake.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/pc.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/utils.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/wix.xsl.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/DocCMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/Doxyfile.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/conf.py.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/index.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/index_j.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl/IdlCMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncludeCMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_STAND_ALONE.vsl
Removed:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/CXX/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_042/
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/GenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/README.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/StringUtilTest.java
Log:
Update CMakeList.txt #2300
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF 2012-02-10 17:04:12 UTC (rev 262)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder; singleton:=true
-Bundle-Version: 1.1.0.rc2v20110725
+Bundle-Version: 1.1.0.rc3v20120209
Bundle-ClassPath: .,
lib/velocity-1.6.3-dep.jar
Bundle-Vendor: %providerName
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/idl/DAQService.idl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/idl/DAQService.idl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/idl/DAQService.idl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,40 @@
+// -*- IDL -*-
+/*!
+ * @file RTCService.idl
+ * @brief RTComponent ƒT[ƒrƒXƒCƒ“ƒ^[ƒtƒF[ƒX
+ * @date $Date: 2007/03/14 12:14:35 $
+ * @author Noriaki Ando <n-ando at aist.go.jp>
+ *
+ * Copyright (C) 2005
+ * Task-intelligence Research Group,
+ * Intelligent Systems Research Institute,
+ * National Institute of
+ * Advanced Industrial Science and Technology (AIST), Japan
+ *
+ * All rights reserved.
+ *
+ * $Id: DAQService.idl,v 1.1 2007/03/14 12:14:35 tsakamoto Exp $
+ *
+ */
+
+/*
+ * $Log: DAQService.idl,v $
+ * Revision 1.1 2007/03/14 12:14:35 tsakamoto
+ * ‘®«¶¬”Å
+ *
+ * Revision 1.1 2005/09/07 05:06:13 n-ando
+ * RTComponent's service management feature was added.
+ *
+ */
+
+#ifndef __RTCService_idl__
+#define __RTCService_idl__
+
+interface DAQService
+{
+ long setCommand(in long com, in double par);
+ short getCommand();
+ unsigned long checkDone();
+ void setDone();
+};
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/idl/MyService.idl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/idl/MyService.idl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/idl/MyService.idl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,6 @@
+interface MyService
+{
+ void setGain(in float gain);
+ float getGain();
+};
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/MyServiceSVC_impl.h (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/MyServiceSVC_impl.h 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,46 @@
+// -*-C++-*-
+/*!
+ * @file MyServiceSVC_impl.h
+ * @brief Service implementation header of MyService.idl
+ *
+ */
+
+#include "MyServiceSkel.h"
+
+#ifndef MYSERVICESVC_IMPL_H
+#define MYSERVICESVC_IMPL_H
+
+/*!
+ * @class MyServiceSVC_impl
+ * Example class implementing IDL interface MyService
+ */
+class MyServiceSVC_impl
+ : public virtual POA_MyService,
+ public virtual PortableServer::RefCountServantBase
+{
+ private:
+ // Make sure all instances are built on the heap by making the
+ // destructor non-public
+ //virtual ~MyServiceSVC_impl();
+
+ public:
+ /*!
+ * @brief standard constructor
+ */
+ MyServiceSVC_impl();
+ /*!
+ * @brief destructor
+ */
+ virtual ~MyServiceSVC_impl();
+
+ // attributes and operations
+ void setGain(CORBA::Float gain);
+ CORBA::Float getGain();
+
+};
+
+
+
+#endif // MYSERVICESVC_IMPL_H
+
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,297 @@
+// -*- C++ -*-
+/*!
+ * @file foo.h
+ * @brief test module
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#ifndef FOO_H
+#define FOO_H
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+#include <rtm/idl/BasicDataTypeSkel.h>
+#include <rtm/idl/ExtendedDataTypesSkel.h>
+#include <rtm/idl/InterfaceDataTypesSkel.h>
+
+// Service implementation headers
+// <rtc-template block="service_impl_h">
+#include "MyServiceSVC_impl.h"
+
+// </rtc-template>
+
+// Service Consumer stub headers
+// <rtc-template block="consumer_stub_h">
+#include "DAQServiceStub.h"
+
+// </rtc-template>
+
+using namespace RTC;
+
+/*!
+ * @class foo
+ * @brief test module
+ *
+ */
+class foo
+ : public RTC::DataFlowComponentBase
+{
+ public:
+ /*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+ foo(RTC::Manager* manager);
+
+ /*!
+ * @brief destructor
+ */
+ ~foo();
+
+ // <rtc-template block="public_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="public_operation">
+
+ // </rtc-template>
+
+ /***
+ *
+ * The initialize action (on CREATED->ALIVE transition)
+ * formaer rtc_init_entry()
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ virtual RTC::ReturnCode_t onInitialize();
+
+ /***
+ *
+ * The finalize action (on ALIVE->END transition)
+ * formaer rtc_exiting_entry()
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onFinalize();
+
+ /***
+ *
+ * The startup action when ExecutionContext startup
+ * former rtc_starting_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onStartup(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The shutdown action when ExecutionContext stop
+ * former rtc_stopping_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onShutdown(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The activated action (Active state entry action)
+ * former rtc_active_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The deactivated action (Active state exit action)
+ * former rtc_active_exit()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The execution action that is invoked periodically
+ * former rtc_active_do()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onExecute(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The aborting action when main logic error occurred.
+ * former rtc_aborting_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onAborting(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The error action in ERROR state
+ * former rtc_error_do()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onError(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The reset action that is invoked resetting
+ * This is same but different the former rtc_init_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The state update action that is invoked after onExecute() action
+ * no corresponding operation exists in OpenRTm-aist-0.2.0
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The action that is invoked when execution context's rate is changed
+ * no corresponding operation exists in OpenRTm-aist-0.2.0
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onRateChanged(RTC::UniqueId ec_id);
+
+
+ protected:
+ // <rtc-template block="protected_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="protected_operation">
+
+ // </rtc-template>
+
+ // DataInPort declaration
+ // <rtc-template block="inport_declare">
+ TimedShort m_InP1;
+ /*!
+ */
+ InPort<TimedShort> m_InP1In;
+ TimedLong m_InP2;
+ /*!
+ */
+ InPort<TimedLong> m_InP2In;
+
+ // </rtc-template>
+
+
+ // DataOutPort declaration
+ // <rtc-template block="outport_declare">
+ TimedInt m_OutP1;
+ /*!
+ */
+ OutPort<TimedInt> m_OutP1Out;
+ TimedFloat m_OutP2;
+ /*!
+ */
+ OutPort<TimedFloat> m_OutP2Out;
+
+ // </rtc-template>
+
+ // CORBA Port declaration
+ // <rtc-template block="corbaport_declare">
+ /*!
+ */
+ RTC::CorbaPort m_svPortPort;
+ /*!
+ */
+ RTC::CorbaPort m_cmPortPort;
+
+ // </rtc-template>
+
+ // Service declaration
+ // <rtc-template block="service_declare">
+ /*!
+ */
+ MyServiceSVC_impl m_acc;
+
+ // </rtc-template>
+
+ // Consumer declaration
+ // <rtc-template block="consumer_declare">
+ /*!
+ */
+ RTC::CorbaConsumer<DAQService> m_rate;
+
+ // </rtc-template>
+
+ private:
+ // <rtc-template block="private_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="private_operation">
+
+ // </rtc-template>
+
+};
+
+
+extern "C"
+{
+ DLL_EXPORT void fooInit(RTC::Manager* manager);
+};
+
+#endif // FOO_H
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/MyServiceSVC_impl.cpp (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/MyServiceSVC_impl.cpp 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,50 @@
+// -*-C++-*-
+/*!
+ * @file MyServiceSVC_impl.cpp
+ * @brief Service implementation code of MyService.idl
+ *
+ */
+
+#include "MyServiceSVC_impl.h"
+
+/*
+ * Example implementational code for IDL interface MyService
+ */
+MyServiceSVC_impl::MyServiceSVC_impl()
+{
+ // Please add extra constructor code here.
+}
+
+
+MyServiceSVC_impl::~MyServiceSVC_impl()
+{
+ // Please add extra destructor code here.
+}
+
+
+/*
+ * Methods corresponding to IDL attributes and operations
+ */
+void MyServiceSVC_impl::setGain(CORBA::Float gain)
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <void MyServiceSVC_impl::setGain(CORBA::Float gain)>"
+#endif
+}
+
+CORBA::Float MyServiceSVC_impl::getGain()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <CORBA::Float MyServiceSVC_impl::getGain()>"
+#endif
+ return 0;
+}
+
+
+
+// End of example implementational code
+
+
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/foo.cpp (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/foo.cpp 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,177 @@
+// -*- C++ -*-
+/*!
+ * @file foo.cpp
+ * @brief test module
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#include "foo.h"
+
+// Module specification
+// <rtc-template block="module_spec">
+static const char* foo_spec[] =
+ {
+ "implementation_id", "foo",
+ "type_name", "foo",
+ "description", "test module",
+ "version", "1.0.1",
+ "vendor", "TA",
+ "category", "sample",
+ "activity_type", "PERIODIC",
+ "kind", "DataFlowComponent",
+ "max_instance", "2",
+ "language", "C++",
+ "lang_type", "compile",
+ ""
+ };
+// </rtc-template>
+
+/*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+foo::foo(RTC::Manager* manager)
+ // <rtc-template block="initializer">
+ : RTC::DataFlowComponentBase(manager),
+ m_InP1In("InP1", m_InP1),
+ m_InP2In("InP2", m_InP2),
+ m_OutP1Out("OutP1", m_OutP1),
+ m_OutP2Out("OutP2", m_OutP2),
+ m_svPortPort("svPort"),
+ m_cmPortPort("cmPort")
+
+ // </rtc-template>
+{
+}
+
+/*!
+ * @brief destructor
+ */
+foo::~foo()
+{
+}
+
+
+
+RTC::ReturnCode_t foo::onInitialize()
+{
+ // Registration: InPort/OutPort/Service
+ // <rtc-template block="registration">
+ // Set InPort buffers
+ addInPort("InP1", m_InP1In);
+ addInPort("InP2", m_InP2In);
+
+ // Set OutPort buffer
+ addOutPort("OutP1", m_OutP1Out);
+ addOutPort("OutP2", m_OutP2Out);
+
+ // Set service provider to Ports
+ m_svPortPort.registerProvider("acc", "MyService", m_acc);
+
+ // Set service consumers to Ports
+ m_cmPortPort.registerConsumer("rate", "DAQService", m_rate);
+
+ // Set CORBA Service Ports
+ addPort(m_svPortPort);
+ addPort(m_cmPortPort);
+
+ // </rtc-template>
+
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t foo::onFinalize()
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onStartup(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onShutdown(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onActivated(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onDeactivated(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onExecute(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onAborting(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onError(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onReset(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onStateUpdate(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onRateChanged(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+
+
+extern "C"
+{
+
+ void fooInit(RTC::Manager* manager)
+ {
+ coil::Properties profile(foo_spec);
+ manager->registerFactory(profile,
+ RTC::Create<foo>,
+ RTC::Delete<foo>);
+ }
+
+};
+
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/fooComp.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/fooComp.cpp (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/src/fooComp.cpp 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,97 @@
+// -*- C++ -*-
+/*!
+ * @file fooComp.cpp
+ * @brief Standalone component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#include <rtm/Manager.h>
+#include <iostream>
+#include <string>
+#include <stdlib.h>
+#include "foo.h"
+
+
+void MyModuleInit(RTC::Manager* manager)
+{
+ fooInit(manager);
+ RTC::RtcBase* comp;
+
+ // Create a component
+ comp = manager->createComponent("foo");
+
+ if (comp==NULL)
+ {
+ std::cerr << "Component create failed." << std::endl;
+ abort();
+ }
+
+ // Example
+ // The following procedure is examples how handle RT-Components.
+ // These should not be in this function.
+
+ // Get the component's object reference
+// RTC::RTObject_var rtobj;
+// rtobj = RTC::RTObject::_narrow(manager->getPOA()->servant_to_reference(comp));
+
+ // Get the port list of the component
+// PortServiceList* portlist;
+// portlist = rtobj->get_ports();
+
+ // getting port profiles
+// std::cout << "Number of Ports: ";
+// std::cout << portlist->length() << std::endl << std::endl;
+// for (CORBA::ULong i(0), n(portlist->length()); i < n; ++i)
+// {
+// PortService_ptr port;
+// port = (*portlist)[i];
+// std::cout << "Port" << i << " (name): ";
+// std::cout << port->get_port_profile()->name << std::endl;
+//
+// RTC::PortInterfaceProfileList iflist;
+// iflist = port->get_port_profile()->interfaces;
+// std::cout << "---interfaces---" << std::endl;
+// for (CORBA::ULong i(0), n(iflist.length()); i < n; ++i)
+// {
+// std::cout << "I/F name: ";
+// std::cout << iflist[i].instance_name << std::endl;
+// std::cout << "I/F type: ";
+// std::cout << iflist[i].type_name << std::endl;
+// const char* pol;
+// pol = iflist[i].polarity == 0 ? "PROVIDED" : "REQUIRED";
+// std::cout << "Polarity: " << pol << std::endl;
+// }
+// std::cout << "---properties---" << std::endl;
+// NVUtil::dump(port->get_port_profile()->properties);
+// std::cout << "----------------" << std::endl << std::endl;
+// }
+
+ return;
+}
+
+int main (int argc, char** argv)
+{
+ RTC::Manager* manager;
+ manager = RTC::Manager::init(argc, argv);
+
+ // Initialize manager
+ manager->init(argc, argv);
+
+ // Set module initialization proceduer
+ // This procedure will be invoked in activateManager() function.
+ manager->setModuleInitProc(MyModuleInit);
+
+ // Activate manager and register to naming service
+ manager->activateManager();
+
+ // run the manager in blocking mode
+ // runManager(false) is the default.
+ manager->runManager();
+
+ // If you want to run the manager in non-blocking mode, do like this
+ // manager->runManager(true);
+
+ return 0;
+}
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildMultiSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildMultiSVC_impl.h (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildMultiSVC_impl.h 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,111 @@
+// -*-C++-*-
+/*!
+ * @file MyServiceChildMultiSVC_impl.h
+ * @brief Service implementation header of MyServiceChildMulti.idl
+ *
+ */
+
+#include "MyServiceParent1Skel.h"
+#include "MyServiceParent2Skel.h"
+
+#include "MyServiceChildMultiSkel.h"
+
+#ifndef MYSERVICECHILDMULTISVC_IMPL_H
+#define MYSERVICECHILDMULTISVC_IMPL_H
+
+/*!
+ * @class MyServiceSVC_impl
+ * Example class implementing IDL interface MyService
+ */
+class MyServiceSVC_impl
+ : public virtual POA_MyService,
+ public virtual PortableServer::RefCountServantBase
+{
+ private:
+ // Make sure all instances are built on the heap by making the
+ // destructor non-public
+ //virtual ~MyServiceSVC_impl();
+
+ public:
+ /*!
+ * @brief standard constructor
+ */
+ MyServiceSVC_impl();
+ /*!
+ * @brief destructor
+ */
+ virtual ~MyServiceSVC_impl();
+
+ // attributes and operations
+ EchoList1* get_echo_history();
+ ValueList1* get_value_history();
+
+};
+
+/*!
+ * @class MyService2SVC_impl
+ * Example class implementing IDL interface MyService2
+ */
+class MyService2SVC_impl
+ : public virtual POA_MyService2,
+ public virtual PortableServer::RefCountServantBase
+{
+ private:
+ // Make sure all instances are built on the heap by making the
+ // destructor non-public
+ //virtual ~MyService2SVC_impl();
+
+ public:
+ /*!
+ * @brief standard constructor
+ */
+ MyService2SVC_impl();
+ /*!
+ * @brief destructor
+ */
+ virtual ~MyService2SVC_impl();
+
+ // attributes and operations
+ void setGain(CORBA::Float gain);
+ CORBA::Float getGain();
+
+};
+
+/*!
+ * @class MyServiceChildSVC_impl
+ * Example class implementing IDL interface MyServiceChild
+ */
+class MyServiceChildSVC_impl
+ : public virtual POA_MyServiceChild,
+ public virtual PortableServer::RefCountServantBase
+{
+ private:
+ // Make sure all instances are built on the heap by making the
+ // destructor non-public
+ //virtual ~MyServiceChildSVC_impl();
+
+ public:
+ /*!
+ * @brief standard constructor
+ */
+ MyServiceChildSVC_impl();
+ /*!
+ * @brief destructor
+ */
+ virtual ~MyServiceChildSVC_impl();
+
+ // attributes and operations
+ void setPos(CORBA::Float pos);
+ EchoList1* getPos();
+ EchoList1* get_echo_history();
+ ValueList1* get_value_history();
+ void setGain(CORBA::Float gain);
+ CORBA::Float getGain();
+
+};
+
+
+
+#endif // MYSERVICECHILDMULTISVC_IMPL_H
+
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildWithTypeSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildWithTypeSVC_impl.h (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/MyServiceChildWithTypeSVC_impl.h 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,79 @@
+// -*-C++-*-
+/*!
+ * @file MyServiceChildWithTypeSVC_impl.h
+ * @brief Service implementation header of MyServiceChildWithType.idl
+ *
+ */
+
+#include "MyServiceParentWithTypeSkel.h"
+
+#include "MyServiceChildWithTypeSkel.h"
+
+#ifndef MYSERVICECHILDWITHTYPESVC_IMPL_H
+#define MYSERVICECHILDWITHTYPESVC_IMPL_H
+
+/*!
+ * @class MyServiceWithTypeSVC_impl
+ * Example class implementing IDL interface MyServiceWithType
+ */
+class MyServiceWithTypeSVC_impl
+ : public virtual POA_MyServiceWithType,
+ public virtual PortableServer::RefCountServantBase
+{
+ private:
+ // Make sure all instances are built on the heap by making the
+ // destructor non-public
+ //virtual ~MyServiceWithTypeSVC_impl();
+
+ public:
+ /*!
+ * @brief standard constructor
+ */
+ MyServiceWithTypeSVC_impl();
+ /*!
+ * @brief destructor
+ */
+ virtual ~MyServiceWithTypeSVC_impl();
+
+ // attributes and operations
+ EchoList* get_echo_history();
+ ValueList* get_value_history();
+
+};
+
+/*!
+ * @class MyServiceWithTypeChildSVC_impl
+ * Example class implementing IDL interface MyServiceWithTypeChild
+ */
+class MyServiceWithTypeChildSVC_impl
+ : public virtual POA_MyServiceWithTypeChild,
+ public virtual PortableServer::RefCountServantBase
+{
+ private:
+ // Make sure all instances are built on the heap by making the
+ // destructor non-public
+ //virtual ~MyServiceWithTypeChildSVC_impl();
+
+ public:
+ /*!
+ * @brief standard constructor
+ */
+ MyServiceWithTypeChildSVC_impl();
+ /*!
+ * @brief destructor
+ */
+ virtual ~MyServiceWithTypeChildSVC_impl();
+
+ // attributes and operations
+ void setPos(CORBA::Float pos);
+ EchoList* getPos();
+ EchoList* get_echo_history();
+ ValueList* get_value_history();
+
+};
+
+
+
+#endif // MYSERVICECHILDWITHTYPESVC_IMPL_H
+
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/include/foo/foo.h 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,287 @@
+// -*- C++ -*-
+/*!
+ * @file foo.h
+ * @brief test module
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#ifndef FOO_H
+#define FOO_H
+
+#include <rtm/Manager.h>
+#include <rtm/DataFlowComponentBase.h>
+#include <rtm/CorbaPort.h>
+#include <rtm/DataInPort.h>
+#include <rtm/DataOutPort.h>
+#include <rtm/idl/BasicDataTypeSkel.h>
+#include <rtm/idl/ExtendedDataTypesSkel.h>
+#include <rtm/idl/InterfaceDataTypesSkel.h>
+
+// Service implementation headers
+// <rtc-template block="service_impl_h">
+#include "MyServiceChildMultiSVC_impl.h"
+#include "MyServiceChildWithTypeSVC_impl.h"
+
+// </rtc-template>
+
+// Service Consumer stub headers
+// <rtc-template block="consumer_stub_h">
+
+// </rtc-template>
+
+using namespace RTC;
+
+/*!
+ * @class foo
+ * @brief test module
+ *
+ */
+class foo
+ : public RTC::DataFlowComponentBase
+{
+ public:
+ /*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+ foo(RTC::Manager* manager);
+
+ /*!
+ * @brief destructor
+ */
+ ~foo();
+
+ // <rtc-template block="public_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="public_operation">
+
+ // </rtc-template>
+
+ /***
+ *
+ * The initialize action (on CREATED->ALIVE transition)
+ * formaer rtc_init_entry()
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ virtual RTC::ReturnCode_t onInitialize();
+
+ /***
+ *
+ * The finalize action (on ALIVE->END transition)
+ * formaer rtc_exiting_entry()
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onFinalize();
+
+ /***
+ *
+ * The startup action when ExecutionContext startup
+ * former rtc_starting_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onStartup(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The shutdown action when ExecutionContext stop
+ * former rtc_stopping_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onShutdown(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The activated action (Active state entry action)
+ * former rtc_active_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The deactivated action (Active state exit action)
+ * former rtc_active_exit()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The execution action that is invoked periodically
+ * former rtc_active_do()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onExecute(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The aborting action when main logic error occurred.
+ * former rtc_aborting_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onAborting(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The error action in ERROR state
+ * former rtc_error_do()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onError(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The reset action that is invoked resetting
+ * This is same but different the former rtc_init_entry()
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The state update action that is invoked after onExecute() action
+ * no corresponding operation exists in OpenRTm-aist-0.2.0
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
+
+ /***
+ *
+ * The action that is invoked when execution context's rate is changed
+ * no corresponding operation exists in OpenRTm-aist-0.2.0
+ *
+ * @param ec_id target ExecutionContext Id
+ *
+ * @return RTC::ReturnCode_t
+ *
+ *
+ */
+ // virtual RTC::ReturnCode_t onRateChanged(RTC::UniqueId ec_id);
+
+
+ protected:
+ // <rtc-template block="protected_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="protected_operation">
+
+ // </rtc-template>
+
+ // DataInPort declaration
+ // <rtc-template block="inport_declare">
+
+ // </rtc-template>
+
+
+ // DataOutPort declaration
+ // <rtc-template block="outport_declare">
+
+ // </rtc-template>
+
+ // CORBA Port declaration
+ // <rtc-template block="corbaport_declare">
+ /*!
+ */
+ RTC::CorbaPort m_MyServiceProviderPort;
+ /*!
+ */
+ RTC::CorbaPort m_MyServiceRequirePort;
+
+ // </rtc-template>
+
+ // Service declaration
+ // <rtc-template block="service_declare">
+ /*!
+ */
+ MyServiceChildSVC_impl m_MyServiceProvider;
+ /*!
+ */
+ MyServiceWithTypeChildSVC_impl m_MyServiceProvider2;
+
+ // </rtc-template>
+
+ // Consumer declaration
+ // <rtc-template block="consumer_declare">
+ /*!
+ */
+ RTC::CorbaConsumer<MyServiceChild> m_MyServiceRequire;
+ /*!
+ */
+ RTC::CorbaConsumer<MyServiceWithTypeChild> m_MyServiceRequire2;
+
+ // </rtc-template>
+
+ private:
+ // <rtc-template block="private_attribute">
+
+ // </rtc-template>
+
+ // <rtc-template block="private_operation">
+
+ // </rtc-template>
+
+};
+
+
+extern "C"
+{
+ DLL_EXPORT void fooInit(RTC::Manager* manager);
+};
+
+#endif // FOO_H
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildMultiSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildMultiSVC_impl.cpp (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildMultiSVC_impl.cpp 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,164 @@
+// -*-C++-*-
+/*!
+ * @file MyServiceChildMultiSVC_impl.cpp
+ * @brief Service implementation code of MyServiceChildMulti.idl
+ *
+ */
+
+#include "MyServiceChildMultiSVC_impl.h"
+
+/*
+ * Example implementational code for IDL interface MyService
+ */
+MyServiceSVC_impl::MyServiceSVC_impl()
+{
+ // Please add extra constructor code here.
+}
+
+
+MyServiceSVC_impl::~MyServiceSVC_impl()
+{
+ // Please add extra destructor code here.
+}
+
+
+/*
+ * Methods corresponding to IDL attributes and operations
+ */
+EchoList1* MyServiceSVC_impl::get_echo_history()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <EchoList1* MyServiceSVC_impl::get_echo_history()>"
+#endif
+ return 0;
+}
+
+ValueList1* MyServiceSVC_impl::get_value_history()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <ValueList1* MyServiceSVC_impl::get_value_history()>"
+#endif
+ return 0;
+}
+
+
+
+// End of example implementational code
+
+/*
+ * Example implementational code for IDL interface MyService2
+ */
+MyService2SVC_impl::MyService2SVC_impl()
+{
+ // Please add extra constructor code here.
+}
+
+
+MyService2SVC_impl::~MyService2SVC_impl()
+{
+ // Please add extra destructor code here.
+}
+
+
+/*
+ * Methods corresponding to IDL attributes and operations
+ */
+void MyService2SVC_impl::setGain(CORBA::Float gain)
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <void MyService2SVC_impl::setGain(CORBA::Float gain)>"
+#endif
+}
+
+CORBA::Float MyService2SVC_impl::getGain()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <CORBA::Float MyService2SVC_impl::getGain()>"
+#endif
+ return 0;
+}
+
+
+
+// End of example implementational code
+
+/*
+ * Example implementational code for IDL interface MyServiceChild
+ */
+MyServiceChildSVC_impl::MyServiceChildSVC_impl()
+{
+ // Please add extra constructor code here.
+}
+
+
+MyServiceChildSVC_impl::~MyServiceChildSVC_impl()
+{
+ // Please add extra destructor code here.
+}
+
+
+/*
+ * Methods corresponding to IDL attributes and operations
+ */
+void MyServiceChildSVC_impl::setPos(CORBA::Float pos)
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <void MyServiceChildSVC_impl::setPos(CORBA::Float pos)>"
+#endif
+}
+
+EchoList1* MyServiceChildSVC_impl::getPos()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <EchoList1* MyServiceChildSVC_impl::getPos()>"
+#endif
+ return 0;
+}
+
+EchoList1* MyServiceChildSVC_impl::get_echo_history()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <EchoList1* MyServiceChildSVC_impl::get_echo_history()>"
+#endif
+ return 0;
+}
+
+ValueList1* MyServiceChildSVC_impl::get_value_history()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <ValueList1* MyServiceChildSVC_impl::get_value_history()>"
+#endif
+ return 0;
+}
+
+void MyServiceChildSVC_impl::setGain(CORBA::Float gain)
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <void MyServiceChildSVC_impl::setGain(CORBA::Float gain)>"
+#endif
+}
+
+CORBA::Float MyServiceChildSVC_impl::getGain()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <CORBA::Float MyServiceChildSVC_impl::getGain()>"
+#endif
+ return 0;
+}
+
+
+
+// End of example implementational code
+
+
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildWithTypeSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildWithTypeSVC_impl.cpp (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/MyServiceChildWithTypeSVC_impl.cpp 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,108 @@
+// -*-C++-*-
+/*!
+ * @file MyServiceChildWithTypeSVC_impl.cpp
+ * @brief Service implementation code of MyServiceChildWithType.idl
+ *
+ */
+
+#include "MyServiceChildWithTypeSVC_impl.h"
+
+/*
+ * Example implementational code for IDL interface MyServiceWithType
+ */
+MyServiceWithTypeSVC_impl::MyServiceWithTypeSVC_impl()
+{
+ // Please add extra constructor code here.
+}
+
+
+MyServiceWithTypeSVC_impl::~MyServiceWithTypeSVC_impl()
+{
+ // Please add extra destructor code here.
+}
+
+
+/*
+ * Methods corresponding to IDL attributes and operations
+ */
+EchoList* MyServiceWithTypeSVC_impl::get_echo_history()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <EchoList* MyServiceWithTypeSVC_impl::get_echo_history()>"
+#endif
+ return 0;
+}
+
+ValueList* MyServiceWithTypeSVC_impl::get_value_history()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <ValueList* MyServiceWithTypeSVC_impl::get_value_history()>"
+#endif
+ return 0;
+}
+
+
+
+// End of example implementational code
+
+/*
+ * Example implementational code for IDL interface MyServiceWithTypeChild
+ */
+MyServiceWithTypeChildSVC_impl::MyServiceWithTypeChildSVC_impl()
+{
+ // Please add extra constructor code here.
+}
+
+
+MyServiceWithTypeChildSVC_impl::~MyServiceWithTypeChildSVC_impl()
+{
+ // Please add extra destructor code here.
+}
+
+
+/*
+ * Methods corresponding to IDL attributes and operations
+ */
+void MyServiceWithTypeChildSVC_impl::setPos(CORBA::Float pos)
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <void MyServiceWithTypeChildSVC_impl::setPos(CORBA::Float pos)>"
+#endif
+}
+
+EchoList* MyServiceWithTypeChildSVC_impl::getPos()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <EchoList* MyServiceWithTypeChildSVC_impl::getPos()>"
+#endif
+ return 0;
+}
+
+EchoList* MyServiceWithTypeChildSVC_impl::get_echo_history()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <EchoList* MyServiceWithTypeChildSVC_impl::get_echo_history()>"
+#endif
+ return 0;
+}
+
+ValueList* MyServiceWithTypeChildSVC_impl::get_value_history()
+{
+ // Please insert your code here and remove the following warning pragma
+#ifndef WIN32
+ #warning "Code missing in function <ValueList* MyServiceWithTypeChildSVC_impl::get_value_history()>"
+#endif
+ return 0;
+}
+
+
+
+// End of example implementational code
+
+
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/foo.cpp (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/foo.cpp 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,171 @@
+// -*- C++ -*-
+/*!
+ * @file foo.cpp
+ * @brief test module
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#include "foo.h"
+
+// Module specification
+// <rtc-template block="module_spec">
+static const char* foo_spec[] =
+ {
+ "implementation_id", "foo",
+ "type_name", "foo",
+ "description", "test module",
+ "version", "1.0.1",
+ "vendor", "TA",
+ "category", "sample",
+ "activity_type", "PERIODIC",
+ "kind", "DataFlowComponent",
+ "max_instance", "2",
+ "language", "C++",
+ "lang_type", "compile",
+ ""
+ };
+// </rtc-template>
+
+/*!
+ * @brief constructor
+ * @param manager Maneger Object
+ */
+foo::foo(RTC::Manager* manager)
+ // <rtc-template block="initializer">
+ : RTC::DataFlowComponentBase(manager),
+ m_MyServiceProviderPort("MyServiceProvider"),
+ m_MyServiceRequirePort("MyServiceRequire")
+
+ // </rtc-template>
+{
+}
+
+/*!
+ * @brief destructor
+ */
+foo::~foo()
+{
+}
+
+
+
+RTC::ReturnCode_t foo::onInitialize()
+{
+ // Registration: InPort/OutPort/Service
+ // <rtc-template block="registration">
+ // Set InPort buffers
+
+ // Set OutPort buffer
+
+ // Set service provider to Ports
+ m_MyServiceProviderPort.registerProvider("MyServiceProvider", "MyServiceChild", m_MyServiceProvider);
+ m_MyServiceProviderPort.registerProvider("MyServiceProvider2", "MyServiceWithTypeChild", m_MyServiceProvider2);
+
+ // Set service consumers to Ports
+ m_MyServiceRequirePort.registerConsumer("MyServiceRequire", "MyServiceChild", m_MyServiceRequire);
+ m_MyServiceRequirePort.registerConsumer("MyServiceRequire2", "MyServiceWithTypeChild", m_MyServiceRequire2);
+
+ // Set CORBA Service Ports
+ addPort(m_MyServiceProviderPort);
+ addPort(m_MyServiceRequirePort);
+
+ // </rtc-template>
+
+ return RTC::RTC_OK;
+}
+
+/*
+RTC::ReturnCode_t foo::onFinalize()
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onStartup(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onShutdown(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onActivated(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onDeactivated(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onExecute(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onAborting(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onError(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onReset(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onStateUpdate(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+/*
+RTC::ReturnCode_t foo::onRateChanged(RTC::UniqueId ec_id)
+{
+ return RTC::RTC_OK;
+}
+*/
+
+
+
+extern "C"
+{
+
+ void fooInit(RTC::Manager* manager)
+ {
+ coil::Properties profile(foo_spec);
+ manager->registerFactory(profile,
+ RTC::Create<foo>,
+ RTC::Delete<foo>);
+ }
+
+};
+
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/fooComp.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/fooComp.cpp (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake2/src/fooComp.cpp 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,97 @@
+// -*- C++ -*-
+/*!
+ * @file fooComp.cpp
+ * @brief Standalone component
+ * @date $Date$
+ *
+ * $Id$
+ */
+
+#include <rtm/Manager.h>
+#include <iostream>
+#include <string>
+#include <stdlib.h>
+#include "foo.h"
+
+
+void MyModuleInit(RTC::Manager* manager)
+{
+ fooInit(manager);
+ RTC::RtcBase* comp;
+
+ // Create a component
+ comp = manager->createComponent("foo");
+
+ if (comp==NULL)
+ {
+ std::cerr << "Component create failed." << std::endl;
+ abort();
+ }
+
+ // Example
+ // The following procedure is examples how handle RT-Components.
+ // These should not be in this function.
+
+ // Get the component's object reference
+// RTC::RTObject_var rtobj;
+// rtobj = RTC::RTObject::_narrow(manager->getPOA()->servant_to_reference(comp));
+
+ // Get the port list of the component
+// PortServiceList* portlist;
+// portlist = rtobj->get_ports();
+
+ // getting port profiles
+// std::cout << "Number of Ports: ";
+// std::cout << portlist->length() << std::endl << std::endl;
+// for (CORBA::ULong i(0), n(portlist->length()); i < n; ++i)
+// {
+// PortService_ptr port;
+// port = (*portlist)[i];
+// std::cout << "Port" << i << " (name): ";
+// std::cout << port->get_port_profile()->name << std::endl;
+//
+// RTC::PortInterfaceProfileList iflist;
+// iflist = port->get_port_profile()->interfaces;
+// std::cout << "---interfaces---" << std::endl;
+// for (CORBA::ULong i(0), n(iflist.length()); i < n; ++i)
+// {
+// std::cout << "I/F name: ";
+// std::cout << iflist[i].instance_name << std::endl;
+// std::cout << "I/F type: ";
+// std::cout << iflist[i].type_name << std::endl;
+// const char* pol;
+// pol = iflist[i].polarity == 0 ? "PROVIDED" : "REQUIRED";
+// std::cout << "Polarity: " << pol << std::endl;
+// }
+// std::cout << "---properties---" << std::endl;
+// NVUtil::dump(port->get_port_profile()->properties);
+// std::cout << "----------------" << std::endl << std::endl;
+// }
+
+ return;
+}
+
+int main (int argc, char** argv)
+{
+ RTC::Manager* manager;
+ manager = RTC::Manager::init(argc, argv);
+
+ // Initialize manager
+ manager->init(argc, argv);
+
+ // Set module initialization proceduer
+ // This procedure will be invoked in activateManager() function.
+ manager->setModuleInitProc(MyModuleInit);
+
+ // Activate manager and register to naming service
+ manager->activateManager();
+
+ // run the manager in blocking mode
+ // runManager(false) is the default.
+ manager->runManager();
+
+ // If you want to run the manager in non-blocking mode, do like this
+ // manager->runManager(true);
+
+ return 0;
+}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -47,6 +47,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.IDialogConstants;
/**
@@ -426,14 +427,24 @@
}
}
for( IdlFileParam idlFile : rtcParam.getProviderIdlPathes() ) {
- IFile idlTarget = project.getFile(idlFile.getIdlFile());
+ IFile idlTarget;
+ if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
+ idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
+ } else {
+ idlTarget = project.getFile(idlFile.getIdlFile());
+ }
if( !idlTarget.getLocation().toOSString().equals(idlFile.getIdlPath()) ) {
idlTarget.delete(true, null);
idlTarget.create(new FileInputStream(idlFile.getIdlPath()), true, null);
}
}
for( IdlFileParam idlFile : rtcParam.getConsumerIdlPathes() ) {
- IFile idlTarget = project.getFile(idlFile.getIdlFile());
+ IFile idlTarget;
+ if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
+ idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
+ } else {
+ idlTarget = project.getFile(idlFile.getIdlFile());
+ }
if( !idlTarget.getLocation().toOSString().equals(idlFile.getIdlPath()) ) {
idlTarget.delete(true, null);
idlTarget.create(new FileInputStream(idlFile.getIdlPath()), true, null);
@@ -442,7 +453,12 @@
//
for( String includedIdlFile : rtcParam.getIncludedIdls() ) {
File target = new File(includedIdlFile);
- IFile idlTarget = project.getFile(target.getName());
+ IFile idlTarget;
+ if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
+ idlTarget = project.getFile("idl" + File.separator + target.getName());
+ } else {
+ idlTarget = project.getFile(target.getName());
+ }
if( !idlTarget.getLocation().toOSString().equals(includedIdlFile) ) {
idlTarget.delete(true, null);
idlTarget.create(new FileInputStream(includedIdlFile), true, null);
@@ -487,20 +503,22 @@
if (isOutput) {
IFile outputFile = outputProject.getFile(generatedResult.getName());
- //TODO 階層ãŒæ·±ã„パスã¸ã®å¯¾å¿œã¯æœª
IPath relPath = outputFile.getProjectRelativePath();
if( relPath.segmentCount() > 1 ) {
- IPath outPath = relPath.removeLastSegments(1);
- IFolder folder = outputProject.getFolder(outPath);
- if(!folder.exists()) {
- try {
- folder.create(false, true, null);
- } catch (CoreException e) {
- e.printStackTrace();
+ String[] segs = relPath.segments();
+ StringBuilder builder = new StringBuilder();
+ for(int index=0;index<relPath.segmentCount()-1;index++) {
+ builder.append(segs[index] + File.separator);
+ IFolder folder = outputProject.getFolder(builder.toString());
+ if(!folder.exists()) {
+ try {
+ folder.create(false, true, null);
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
}
}
}
- //TODO
try {
outputFile.create(new ByteArrayInputStream(generatedResult.getCode().getBytes("UTF-8")), false, null);
} catch (CoreException e) {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -8,7 +8,6 @@
*/
public static final String NEWEDITOR_ACTION_ID = RtcBuilderPlugin.PLUGIN_ID + ".ui.actionSet";
- public static final String RTM_VERSION_042 = "0.4.2";
public static final String RTM_VERSION_100 = "1.0.0";
public static final String DEFAULT_RTM_VERSION = RTM_VERSION_100;
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -5,6 +5,7 @@
import java.util.ArrayList;
import java.util.List;
+import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
/**
@@ -48,7 +49,7 @@
}
public String getIdlFile() {
- File file = new File(idlPath);
+ File file = new File( idlPath);
return file.getName();
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -56,6 +56,7 @@
resetWIXUUID(rtcParam);
Map<String, Object> contextMap = createContextMap(rtcParam);
+ contextMap.put("tmpltHelper", new TemplateHelper());
resetIDLServiceClass(rtcParam);
@@ -69,9 +70,6 @@
if (rtcParam.getName() == null) {
return false;
}
- if (rtcParam.getRtmVersion().equals(RTM_VERSION_042)) {
- return false;
- }
return true;
}
@@ -115,97 +113,221 @@
List<GeneratedResult> result = new ArrayList<GeneratedResult>();
GeneratedResult gr;
+ //Root
+ gr = generateCOPYING(contextMap);
+ result.add(gr);
+ gr = generateCOPYING_LESSER(contextMap);
+ result.add(gr);
gr = generateCMakeLists(contextMap);
result.add(gr);
- gr = generateDoxyfile(contextMap);
+
+ //cmake
+ gr = generateCmakeCMakeLists(contextMap);
result.add(gr);
-
+ gr = generateCmakeCPackOption(contextMap);
+ result.add(gr);
+ gr = generateResourceLicenseRTF(contextMap);
+ result.add(gr);
+ gr = generateCmakeConfigVersion(contextMap);
+ result.add(gr);
+ gr = generateCmakeConfig(contextMap);
+ result.add(gr);
+ gr = generateCmakePcIn(contextMap);
+ result.add(gr);
gr = generateModulesUninstall(contextMap);
result.add(gr);
- gr = generateModulesCPackWIX(contextMap);
+ gr = generateUtilIn(contextMap);
result.add(gr);
-// gr = generateModulesFindOpenRTM(contextMap);
-// result.add(gr);
+ gr = generateResourceWixXSL(contextMap);
+ result.add(gr);
+ //TODO アイコンã€ãƒ“ットマップã®ã‚³ãƒ”ー
- gr = generateResourceDescriptionTXT(contextMap);
+ //cmake/Modules
+ gr = generateModulesFindOpenRTM(contextMap);
result.add(gr);
- gr = generateResourceLicenseTXT(contextMap);
+
+ //doc
+ gr = generateDocCMakeLists(contextMap);
result.add(gr);
- gr = generateResourceLicenseRTF(contextMap);
+ gr = generateDocConfPy(contextMap);
result.add(gr);
- gr = generateResourceWixXSL(contextMap);
+ gr = generateDoxyfile(contextMap);
result.add(gr);
-
+
+ //doc/content
+ gr = generateDocIndex(contextMap);
+ result.add(gr);
+ gr = generateDocIndexJ(contextMap);
+ result.add(gr);
+
+ //idl
+ gr = generateIdlCMakeLists(contextMap);
+ result.add(gr);
+
+ //include
+ gr = generateIncludeCMakeLists(contextMap);
+ result.add(gr);
+
+ //include/Module
+ gr = generateIncModuleCMakeLists(contextMap);
+ result.add(gr);
+
+ //src
+ gr = generateSrcCMakeLists(contextMap);
+ result.add(gr);
+
return result;
}
// 1.0ç³» (CMake)
+ public GeneratedResult generateCOPYING(Map<String, Object> contextMap) {
+ String outfile = "COPYING";
+ String infile = "cmake/COPYING.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+ public GeneratedResult generateCOPYING_LESSER(Map<String, Object> contextMap) {
+ String outfile = "COPYING.LESSER";
+ String infile = "cmake/COPYING.LESSER.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+
public GeneratedResult generateCMakeLists(Map<String, Object> contextMap) {
String outfile = "CMakeLists.txt";
String infile = "cmake/CMakeLists.txt.vsl";
return generate(infile, outfile, contextMap);
}
- public GeneratedResult generateDoxyfile(Map<String, Object> contextMap) {
- String outfile = "Doxyfile.in";
- String infile = "cmake/Doxyfile.in.vsl";
+ // 1.0ç³» (CMake/cmake)
+ public GeneratedResult generateCmakeCMakeLists(Map<String, Object> contextMap) {
+ String outfile = "cmake/CMakeLists.txt";
+ String infile = "cmake/cmake/CMakeCMakeLists.txt.vsl";
return generate(infile, outfile, contextMap);
}
+
+ public GeneratedResult generateCmakeCPackOption(Map<String, Object> contextMap) {
+ String outfile = "cmake/cpack_options.cmake.in";
+ String infile = "cmake/cmake/cpack_options_cmake.in.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+
+ public GeneratedResult generateResourceLicenseRTF(
+ Map<String, Object> contextMap) {
+ String outfile = "cmake/License.rtf";
+ String infile = "cmake/cmake/License.rtf.vsl";
+ return generate(infile, outfile, contextMap);
+ }
- // 1.0ç³» (CMake/cmake_modules)
+ public GeneratedResult generateCmakeConfigVersion(Map<String, Object> contextMap) {
+ RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+ String outfile = "cmake/" + rtcParam.getName() + "-config-version.cmake.in";
+ String infile = "cmake/cmake/config_version.cmake.in.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+
+ public GeneratedResult generateCmakeConfig(Map<String, Object> contextMap) {
+ RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+ String outfile = "cmake/" + rtcParam.getName() + "-config.cmake.in";
+ String infile = "cmake/cmake/config.cmake.in.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+ public GeneratedResult generateCmakePcIn(Map<String, Object> contextMap) {
+ RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+ String outfile = "cmake/" + rtcParam.getName() + ".pc.in";
+ String infile = "cmake/cmake/pc.in.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+
public GeneratedResult generateModulesUninstall(
Map<String, Object> contextMap) {
- String outfile = "cmake_modules/cmake_uninstall.cmake.in";
- String infile = "cmake/cmake_uninstall.cmake.in.vsl";
+ String outfile = "cmake/uninstall_target.cmake.in";
+ String infile = "cmake/cmake/cmake_uninstall.cmake.in.vsl";
return generate(infile, outfile, contextMap);
}
- public GeneratedResult generateModulesCPackWIX(
+ public GeneratedResult generateUtilIn(
Map<String, Object> contextMap) {
- String outfile = "cmake_modules/CPackWIX.cmake";
- String infile = "cmake/CPackWIX.cmake.vsl";
+ String outfile = "cmake/utils.cmake";
+ String infile = "cmake/cmake/utils.in.vsl";
return generate(infile, outfile, contextMap);
}
+
+ public GeneratedResult generateResourceWixXSL(Map<String, Object> contextMap) {
+ String outfile = "cmake/wix.xsl.in";
+ String infile = "cmake/cmake/wix.xsl.in.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+ // 1.0ç³» (CMake/cmake/Modules)
public GeneratedResult generateModulesFindOpenRTM(
Map<String, Object> contextMap) {
-// String outfile = "cmake_modules/FindOpenRTM.cmake";
-// String infile = "cmake/FindOpenRTM.cmake.vsl";
-// return generate(infile, outfile, contextMap);
- return null;
+ String outfile = "cmake/Modules/FindOpenRTM.cmake";
+ String infile = "cmake/cmake/FindOpenRTM.cmake.vsl";
+ return generate(infile, outfile, contextMap);
}
- // 1.0ç³» (CMake/cpack_resources)
-
- public GeneratedResult generateResourceDescriptionTXT(
- Map<String, Object> contextMap) {
- String outfile = "cpack_resources/Description.txt";
- String infile = "cmake/Description.txt.vsl";
+ // 1.0ç³» (CMake/doc)
+ public GeneratedResult generateDocCMakeLists(Map<String, Object> contextMap) {
+ String outfile = "doc/CMakeLists.txt";
+ String infile = "cmake/doc/DocCMakeLists.txt.vsl";
return generate(infile, outfile, contextMap);
}
- public GeneratedResult generateResourceLicenseTXT(
- Map<String, Object> contextMap) {
- String outfile = "cpack_resources/License.txt";
- String infile = "cmake/License.txt.vsl";
+ public GeneratedResult generateDocConfPy(Map<String, Object> contextMap) {
+ String outfile = "doc/conf.py.in";
+ String infile = "cmake/doc/conf.py.in.vsl";
return generate(infile, outfile, contextMap);
}
-
- public GeneratedResult generateResourceLicenseRTF(
- Map<String, Object> contextMap) {
- String outfile = "cpack_resources/License.rtf";
- String infile = "cmake/License.rtf.vsl";
+
+ public GeneratedResult generateDoxyfile(Map<String, Object> contextMap) {
+ String outfile = "doc/doxyfile.in";
+ String infile = "cmake/doc/Doxyfile.in.vsl";
return generate(infile, outfile, contextMap);
}
+
+ // 1.0ç³» (CMake/doc/content)
+ public GeneratedResult generateDocIndex(Map<String, Object> contextMap) {
+ String outfile = "doc/content/index.txt";
+ String infile = "cmake/doc/index.txt.vsl";
+ return generate(infile, outfile, contextMap);
+ }
- public GeneratedResult generateResourceWixXSL(Map<String, Object> contextMap) {
- String outfile = "cpack_resources/wix.xsl.in";
- String infile = "cmake/wix.xsl.in.vsl";
+ public GeneratedResult generateDocIndexJ(Map<String, Object> contextMap) {
+ String outfile = "doc/content/index_j.txt";
+ String infile = "cmake/doc/index_j.txt.vsl";
return generate(infile, outfile, contextMap);
}
-
+
+ // 1.0ç³» (CMake/idl)
+ public GeneratedResult generateIdlCMakeLists(Map<String, Object> contextMap) {
+ String outfile = "idl/CMakeLists.txt";
+ String infile = "cmake/idl/IdlCMakeLists.txt.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+
+ // 1.0ç³» (CMake/include)
+ public GeneratedResult generateIncludeCMakeLists(Map<String, Object> contextMap) {
+ String outfile = "include/CMakeLists.txt";
+ String infile = "cmake/include/IncludeCMakeLists.txt.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+
+ // 1.0ç³» (CMake/include/module)
+ public GeneratedResult generateIncModuleCMakeLists(Map<String, Object> contextMap) {
+ RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+ String outfile = "include/" + rtcParam.getName() + "/CMakeLists.txt";
+ String infile = "cmake/include/IncModuleCMakeLists.txt.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+
+ // 1.0ç³» (CMake/src)
+ public GeneratedResult generateSrcCMakeLists(Map<String, Object> contextMap) {
+ String outfile = "src/CMakeLists.txt";
+ String infile = "cmake/src/SrcCMakeLists.txt.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+
public GeneratedResult generate(String infile, String outfile,
Map<String, Object> contextMap) {
try {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXGenerateManager.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -60,9 +60,6 @@
resetIDLServiceClass(rtcParam);
- if (rtcParam.getRtmVersion().equals(RTM_VERSION_042)) {
- return generateTemplateCode04(contextMap);
- }
return generateTemplateCode10(contextMap);
}
@@ -114,129 +111,75 @@
return result;
}
- // RTM 0.4ç³»
- public List<GeneratedResult> generateTemplateCode04(
- Map<String, Object> contextMap) {
- List<GeneratedResult> result = new ArrayList<GeneratedResult>();
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-
- GeneratedResult gr;
- gr = generateCompSource_04(contextMap);
- result.add(gr);
- gr = generateRTCHeader_04(contextMap);
- result.add(gr);
- gr = generateRTCSource_04(contextMap);
- result.add(gr);
-
- gr = generateMakefile(contextMap);
- result.add(gr);
-
- gr = generateVC9Sln(contextMap);
- result.add(gr);
- gr = generateVC8Sln(contextMap);
- result.add(gr);
- gr = generateVC9CompProj_04(contextMap);
- result.add(gr);
- gr = generateVC8CompProj_04(contextMap);
- result.add(gr);
- gr = generateVC9RTCProj_04(contextMap);
- result.add(gr);
- gr = generateVC8RTCProj_04(contextMap);
- result.add(gr);
- gr = generateVCCopyProps(contextMap);
- result.add(gr);
- gr = generateVCUserConfig(contextMap);
- result.add(gr);
-
- for (IdlFileParam idl : rtcParam.getProviderIdlPathes()) {
- contextMap.put("idlFileParam", idl);
- gr = generateSVCHeader_04(contextMap);
- result.add(gr);
- gr = generateSVCSource_04(contextMap);
- result.add(gr);
- }
-
- return result;
- }
-
// 1.0ç³» (C++)
public GeneratedResult generateCompSource(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "Comp.cpp";
+ String outfile = null;
+ if( rtcParam.enableOldBuildEnv() ) {
+ outfile = rtcParam.getName() + "Comp.cpp";
+ } else {
+ outfile = "src/" + rtcParam.getName() + "Comp.cpp";
+ }
String infile = "cpp/CXX_Comp.cpp.vsl";
return generate(infile, outfile, contextMap);
}
public GeneratedResult generateRTCHeader(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + ".h";
+ String outfile = null;
+ if( rtcParam.enableOldBuildEnv() ) {
+ outfile = rtcParam.getName() + ".h";
+ } else {
+ outfile = "include/" + rtcParam.getName() + "/" + rtcParam.getName() + ".h";
+ }
String infile = "cpp/CXX_RTC.h.vsl";
return generate(infile, outfile, contextMap);
}
public GeneratedResult generateRTCSource(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + ".cpp";
+ String outfile = null;
+ if( rtcParam.enableOldBuildEnv() ) {
+ outfile = rtcParam.getName() + ".cpp";
+ } else {
+ outfile = "src/" + rtcParam.getName() + ".cpp";
+ }
String infile = "cpp/CXX_RTC.cpp.vsl";
return generate(infile, outfile, contextMap);
}
public GeneratedResult generateSVCHeader(Map<String, Object> contextMap) {
+ RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
- String outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".h";
+ String outfile = null;
+ if( rtcParam.enableOldBuildEnv() ) {
+ outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+ + TemplateHelper.getServiceImplSuffix() + ".h";
+ } else {
+ outfile = "include/" + rtcParam.getName() + "/"
+ + TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+ + TemplateHelper.getServiceImplSuffix() + ".h";
+ }
String infile = "cpp/CXX_SVC.h.vsl";
return generate(infile, outfile, contextMap);
}
-
+
public GeneratedResult generateSVCSource(Map<String, Object> contextMap) {
IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
- String outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".cpp";
+ RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+ String outfile = null;
+ if( rtcParam.enableOldBuildEnv() ) {
+ outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+ + TemplateHelper.getServiceImplSuffix() + ".cpp";
+ } else {
+ outfile = "src/" + TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
+ + TemplateHelper.getServiceImplSuffix() + ".cpp";
+ }
String infile = "cpp/CXX_SVC.cpp.vsl";
return generate(infile, outfile, contextMap);
}
-
- // 0.4ç³» (C++)
-
- public GeneratedResult generateCompSource_04(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "Comp.cpp";
- String infile = "cpp_04/CXX_Comp.cpp.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateRTCHeader_04(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + ".h";
- String infile = "cpp_04/CXX_RTC.h.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateRTCSource_04(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + ".cpp";
- String infile = "cpp_04/CXX_RTC.cpp.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateSVCHeader_04(Map<String, Object> contextMap) {
- IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
- String outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".h";
- String infile = "cpp_04/CXX_SVC.h.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateSVCSource_04(Map<String, Object> contextMap) {
- IdlFileParam idlParam = (IdlFileParam) contextMap.get("idlFileParam");
- String outfile = TemplateHelper.getBasename(idlParam.getIdlFileNoExt())
- + TemplateHelper.getServiceImplSuffix() + ".cpp";
- String infile = "cpp_04/CXX_SVC.cpp.vsl";
- return generate(infile, outfile, contextMap);
- }
-
+
// 1.0系 (ビルド環境)
public GeneratedResult generateMakefile(Map<String, Object> contextMap) {
@@ -300,36 +243,6 @@
return generate(infile, outfile, contextMap);
}
- // 0.4系 (ビルド環境)
-
- public GeneratedResult generateVC8CompProj_04(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "Comp_vc8.vcproj";
- String infile = "cpp_04/CXX_Comp_vc8.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC9CompProj_04(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "Comp_vc9.vcproj";
- String infile = "cpp_04/CXX_Comp_vc9.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC8RTCProj_04(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "_vc8.vcproj";
- String infile = "cpp_04/CXX_vc8.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateVC9RTCProj_04(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "_vc9.vcproj";
- String infile = "cpp_04/CXX_vc9.vcproj.vsl";
- return generate(infile, outfile, contextMap);
- }
-
public GeneratedResult generate(String infile, String outfile,
Map<String, Object> contextMap) {
try {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CommonGenerateManager.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -1,5 +1,7 @@
package jp.go.aist.rtm.rtcbuilder.manager;
+import static jp.go.aist.rtm.rtcbuilder.util.RTCUtil.form;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -11,9 +13,6 @@
import jp.go.aist.rtm.rtcbuilder.template.TemplateHelper;
import jp.go.aist.rtm.rtcbuilder.template.TemplateUtil;
-import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
-import static jp.go.aist.rtm.rtcbuilder.util.RTCUtil.*;
-
/**
* 一般ファイルã®å‡ºåŠ›ã‚’制御ã™ã‚‹ãƒžãƒãƒ¼ã‚¸ãƒ£
*/
@@ -45,9 +44,6 @@
contextMap.put("rtcParam", rtcParam);
contextMap.put("tmpltHelper", new TemplateHelper());
- if (rtcParam.getRtmVersion().equals(RTM_VERSION_042)) {
- return generateTemplateCode04(contextMap);
- }
return generateTemplateCode10(contextMap);
}
@@ -59,30 +55,15 @@
GeneratedResult gr;
- gr = generateRTCConf(contextMap);
+ gr = generateREADME(contextMap);
result.add(gr);
- gr = generateComponentConf(contextMap);
+ gr = generateRTCConf10(contextMap);
result.add(gr);
- return result;
- }
-
- // RTM 0.4ç³»
- public List<GeneratedResult> generateTemplateCode04(
- Map<String, Object> contextMap) {
- List<GeneratedResult> result = new ArrayList<GeneratedResult>();
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-
- GeneratedResult gr;
- gr = generateREADME_04(contextMap);
+ gr = generateComponentConf(contextMap);
result.add(gr);
- if (rtcParam.getExecutionRate() > 0.0 || rtcParam.checkConfig()) {
- gr = generateRTCConf(contextMap);
- result.add(gr);
- }
-
return result;
}
@@ -101,6 +82,12 @@
return generate(infile, outfile, contextMap);
}
+ public GeneratedResult generateRTCConf10(Map<String, Object> contextMap) {
+ String outfile = "rtc.conf";
+ String infile = "common/rtc.conf.vsl";
+ return generate(infile, outfile, contextMap);
+ }
+
public GeneratedResult generateComponentConf(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
String outfile = rtcParam.getName() + ".conf";
@@ -108,16 +95,6 @@
return generate(infile, outfile, contextMap);
}
- // RTM 0.4
-
- public GeneratedResult generateREADME_04(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-
- String outfile = "README." + rtcParam.getName();
- String infile = "common_04/README.vsl";
- return generate(infile, outfile, contextMap);
- }
-
public GeneratedResult generate(String infile, String outfile,
Map<String, Object> contextMap) {
try {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/GenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/GenerateManager.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/GenerateManager.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -29,7 +29,7 @@
// 生æˆå¯¾è±¡è¨€èªžå称(引数用)
public String getTargetVersion() {
- return IRtcBuilderConstants.RTM_VERSION_042;
+ return IRtcBuilderConstants.RTM_VERSION_100;
}
// 特定ã®ã‚¿ã‚°ã‚’é©ç”¨å¯¾è±¡å¤–ã¨ã™ã‚‹ã‹å¦ã‹
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -5,6 +5,7 @@
import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigParameterParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.idl.IdlFileParam;
import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
import static jp.go.aist.rtm.rtcbuilder.util.StringUtil.*;
@@ -55,6 +56,27 @@
return "";
}
+ public static String getIDLFilesforIDLCMake(RtcParam source) {
+ StringBuilder builder = new StringBuilder();
+
+ for(IdlFileParam target : source.getProviderIdlPathes() ) {
+ builder.append("${CMAKE_CURRENT_SOURCE_DIR}/");
+ builder.append(getFilenameNoExt(target.getIdlFile()));
+ builder.append(".idl ");
+ }
+ for(IdlFileParam target : source.getConsumerIdlPathes() ) {
+ builder.append("${CMAKE_CURRENT_SOURCE_DIR}/");
+ builder.append(getFilenameNoExt(target.getIdlFile()));
+ builder.append(".idl ");
+ }
+ for(IdlFileParam target : source.getIncludedIdlPathes() ) {
+ builder.append("${CMAKE_CURRENT_SOURCE_DIR}/");
+ builder.append(getFilenameNoExt(target.getIdlFile()));
+ builder.append(".idl ");
+ }
+ return builder.toString();
+ }
+
public static String toSvcImpl(String fullPath) {
String name = getFilenameNoExt(fullPath);
if (name.isEmpty()) {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -1,282 +1,84 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
project(${rtcParam.name})
+string(TOLOWER ${dol}{PROJECT_NAME} PROJECT_NAME_LOWER)
+include("${dol}{PROJECT_SOURCE_DIR}/cmake/utils.cmake")
+set(PROJECT_VERSION ${rtcParam.version} CACHE STRING "${rtcParam.name} version")
+DISSECT_VERSION()
+set(PROJECT_DESCRIPTION "${rtcParam.description}")
+set(PROJECT_VENDOR "${rtcParam.vender}")
+set(PROJECT_AUTHOR "${rtcParam.vender}")
+set(PROJECT_AUTHOR_SHORT "${rtcParam.vender}")
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-set(CMAKE_MODULE_PATH "${dol}{PROJECT_SOURCE_DIR}/cmake_modules")
+${sharp} Add an "uninstall" target
+CONFIGURE_FILE ("${dol}{PROJECT_SOURCE_DIR}/cmake/uninstall_target.cmake.in"
+ "${dol}{PROJECT_BINARY_DIR}/uninstall_target.cmake" IMMEDIATE @ONLY)
+ADD_CUSTOM_TARGET (uninstall "${dol}{CMAKE_COMMAND}" -P
+ "${dol}{PROJECT_BINARY_DIR}/uninstall_target.cmake")
-set(LINUX_PACKAGE_GENERATOR "DEB")
-${sharp}set(LINUX_PACKAGE_GENERATOR "RPM")
+${sharp}option(BUILD_EXAMPLES "Build and install examples" OFF)
+option(BUILD_DOCUMENTATION "Build the documentation" ON)
+${sharp}option(BUILD_TESTS "Build the tests" OFF)
+${sharp}option(BUILD_TOOLS "Build the tools" OFF)
+option(BUILD_IDL "Build and install idl" ON)
+option(BUILD_SOURCES "Build and install sources" OFF)
+option(STATIC_LIBS "Build static libraries" OFF)
+if(STATIC_LIBS)
+ set(LIB_TYPE STATIC)
+else(STATIC_LIBS)
+ set(LIB_TYPE SHARED)
+endif(STATIC_LIBS)
-${sharp} component settings
-set(RTC_NAME "${dol}{PROJECT_NAME}")
-set(RTC_VERSION "${rtcParam.version}")
-set(RTC_VERSION_MAJOR "${helper.getVerMajor(${rtcParam.version})}")
-set(RTC_VERSION_MINOR "${helper.getVerMinor(${rtcParam.version})}")
-set(RTC_VERSION_PATCH "${helper.getVerPatch(${rtcParam.version})}")
-set(RTC_LANG "${helper.toLower(${rtcParam.language})}")
-set(RTC_DESCRIPTION "${rtcParam.description}")
-set(RTC_VENDOR "${rtcParam.vender}")
-set(RTC_MAINTAINER "author at example.com")
+${sharp} Set up installation directories
+set(BIN_INSTALL_DIR "components/bin")
+set(LIB_INSTALL_DIR "components/lib")
+set(INC_INSTALL_DIR
+ "components/include/${dol}{PROJECT_NAME_LOWER}-${dol}{PROJECT_VERSION_MAJOR}")
+set(SHARE_INSTALL_DIR
+ "components/share/${dol}{PROJECT_NAME_LOWER}-${dol}{PROJECT_VERSION_MAJOR}")
-string(TOLOWER ${dol}{RTC_NAME} PACKAGE_NAME)
-set(PACKAGE_VERSION "${dol}{RTC_VERSION_MAJOR}.${dol}{RTC_VERSION_MINOR}.${dol}{RTC_VERSION_PATCH}")
-
-set(IDL_FILES ""
-#foreach($p in ${rtcParam.providerIdlPathes})
- ${p.idlFile}
-#end
-#foreach($p in ${rtcParam.consumerIdlPathes})
- ${p.idlFile}
-#end)
-
-set(SKEL_SRCS ""
-#foreach($p in ${rtcParam.providerIdlPathes})
- ${helper.toSvcSkel(${p.idlFile})}.cpp
-#end)
-
-set(STUB_SRCS ""
-#foreach($p in ${rtcParam.consumerIdlPathes})
- ${helper.toSvcStub(${p.idlFile})}.cpp
-#end)
-
-set(IMPL_SRCS ""
-#foreach($p in ${rtcParam.providerIdlPathes})
- ${helper.toSvcImpl(${p.idlFile})}.cpp
-#end)
-
-set(IMPL_INCS ""
-#foreach($p in ${rtcParam.providerIdlPathes})
- ${helper.toSvcImpl(${p.idlFile})}.h
-#end)
-
-set(LIBS_SRCS ${rtcParam.name}.cpp)
-
-set(LIBS_INCS ${rtcParam.name}.h)
-
-set(EXEC_SRCS ${rtcParam.name}Comp.cpp)
-
-set(OTHER_SRCS CMakeLists.txt Doxyfile.in
- RTC.xml ${rtcParam.name}.conf rtc.conf)
-
-
-${sharp} check OpenRTM installed
+${sharp} Get necessary dependency information
+if(NOT WIN32)
+ list(APPEND CMAKE_MODULE_PATH ${dol}{PROJECT_SOURCE_DIR}/cmake/Modules)
+endif(NOT WIN32)
find_package(OpenRTM REQUIRED)
-list(APPEND CFLAGS ${dol}{OMNIORB_CFLAGS} ${dol}{OPENRTM_CFLAGS})
-list(APPEND INCLUDE_DIRS ${dol}{OMNIORB_INCLUDE_DIRS} ${dol}{OPENRTM_INCLUDE_DIRS})
-list(APPEND LDFLAGS ${dol}{OMNIORB_LDFLAGS} ${dol}{OPENRTM_LDFLAGS})
-list(APPEND LIBRARY_DIRS ${dol}{OMNIORB_LIBRARY_DIRS} ${dol}{OPENRTM_LIBRARY_DIRS})
-list(APPEND LIBRARIES ${dol}{OMNIORB_LIBRARIES} ${dol}{OPENRTM_LIBRARIES})
+${sharp} Universal settings
+${sharp}enable_testing()
-${sharp} check doxygen installed
-find_package(Doxygen)
-if(DOXYGEN_FOUND STREQUAL "NO")
- message(FATAL_ERROR "Doxygen not found.")
-endif()
+${sharp} Subdirectories
+add_subdirectory(cmake)
+if(BUILD_DOCUMENTATION)
+ add_subdirectory(doc)
+endif(BUILD_DOCUMENTATION)
+${sharp}if(BUILD_EXAMPLES)
+${sharp} add_subdirectory(examples)
+${sharp}endif(BUILD_EXAMPLES)
+if(BUILD_IDL)
+ add_subdirectory(idl)
+endif(BUILD_IDL)
+add_subdirectory(include)
+add_subdirectory(src)
+${sharp}if(BUILD_TESTS)
+${sharp} add_subdirectory(test)
+${sharp}endif(BUILD_TESTS)
+${sharp}if(BUILD_TOOLS)
+${sharp} add_subdirectory(tools)
+${sharp}endif(BUILD_TOOLS)
+if(BUILD_SOURCES)
+ add_subdirectory(src)
+endif(BUILD_SOURCES)
+${sharp} Package creation
+include(InstallRequiredSystemLibraries)
+set(PROJECT_EXECUTABLES ${dol}{PROJECT_NAME_LOWER}Comp
+ "${dol}{PROJECT_NAME_LOWER}Comp")
+set(cpack_options "${dol}{PROJECT_BINARY_DIR}/cpack_options.cmake")
+configure_file("${dol}{PROJECT_SOURCE_DIR}/cmake/cpack_options.cmake.in"
+ ${dol}{cpack_options} @ONLY)
+set(CPACK_PROJECT_CONFIG_FILE ${dol}{cpack_options})
+include(${dol}{CPACK_PROJECT_CONFIG_FILE})
+include(CPack)
-if(WIN32)
- ${sharp} add command path
- set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OPENRTM_DIR}/bin")
- set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OMNIORB_DIR}/bin/x86_win32")
- ${sharp} set install path prefix
- set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}")
- set(INSTALL_PREFIX "components/${dol}{RTC_LANG}/${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
-else()
- ${sharp} add command path
- set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OPENRTM_DIR}/bin")
- set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OMNIORB_DIR}/bin")
- ${sharp} set install path prefix
- set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}")
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}")
- set(INSTALL_PREFIX "${dol}{OPENRTM_SHARE_PREFIX}/components/${dol}{RTC_LANG}/${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
-endif()
-
-${sharp} add uninstall target
-configure_file(
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/cmake_uninstall.cmake.in"
- "${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
- IMMEDIATE @ONLY)
-add_custom_target(uninstall COMMAND
- ${dol}{CMAKE_COMMAND} -P ${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-
-
-${sharp} target settings for library/executable
-include_directories(${dol}{INCLUDE_DIRS})
-
-link_directories(${dol}{LIBRARY_DIRS})
-
-add_definitions(${dol}{CFLAGS})
-add_definitions(-I${dol}{CMAKE_CURRENT_BINARY_DIR})
-
-foreach(idl ${dol}{IDL_FILES})
- string(REGEX REPLACE "([^\\/]*)\\.idl" "\\1" idl_base ${dol}{idl})
- add_custom_command(OUTPUT ${dol}{idl_base}Stub.cpp ${dol}{idl_base}Skel.cpp
- COMMAND ${dol}{OPENRTM_IDL_WRAPPER} ${dol}{OPENRTM_IDL_WRAPPER_FLAGS} --idl-file=${dol}{idl}
- COMMAND ${dol}{OPENRTM_IDLC} ${dol}{OPENRTM_IDLFLAGS} ${dol}{PROJECT_SOURCE_DIR}/${dol}{idl}
- DEPENDS ${dol}{idl})
-endforeach()
-
-if(CMAKE_COMPILER_IS_GNUCC)
- string(REPLACE ";" " " LDFLAGS "${LDFLAGS}")
-endif()
-
-add_library(${dol}{RTC_NAME} SHARED
- ${dol}{LIBS_SRCS} ${dol}{IMPL_SRCS} ${dol}{SKEL_SRCS} ${dol}{STUB_SRCS})
-target_link_libraries(${dol}{RTC_NAME} ${dol}{LIBRARIES})
-set_target_properties(${dol}{RTC_NAME} PROPERTIES PREFIX "")
-set_target_properties(${dol}{RTC_NAME} PROPERTIES LINK_FLAGS "${dol}{LDFLAGS}")
-
-if(UNIX)
- add_library(${dol}{RTC_NAME}-static STATIC
- ${dol}{LIBS_SRCS} ${dol}{IMPL_SRCS} ${dol}{SKEL_SRCS} ${dol}{STUB_SRCS})
- target_link_libraries(${dol}{RTC_NAME}-static ${dol}{LIBRARIES})
- set_target_properties(${dol}{RTC_NAME}-static PROPERTIES PREFIX "")
- set_target_properties(${dol}{RTC_NAME}-static PROPERTIES LINK_FLAGS "${dol}{LDFLAGS}")
-endif()
-
-if(UNIX)
- add_executable(${dol}{RTC_NAME}Comp ${dol}{EXEC_SRCS})
- add_dependencies(${dol}{RTC_NAME}Comp ${dol}{RTC_NAME}-static)
- target_link_libraries(${dol}{RTC_NAME}Comp ${dol}{RTC_NAME}-static ${dol}{LIBRARIES})
-
- add_executable(${dol}{RTC_NAME}Comp-dynamic ${dol}{EXEC_SRCS})
- add_dependencies(${dol}{RTC_NAME}Comp-dynamic ${dol}{RTC_NAME})
- target_link_libraries(${dol}{RTC_NAME}Comp-dynamic ${dol}{RTC_NAME} ${dol}{LIBRARIES})
- set_target_properties(${dol}{RTC_NAME}Comp-dynamic PROPERTIES LINK_FLAGS "${dol}{LDFLAGS}")
-
-else()
- add_executable(${dol}{RTC_NAME}Comp ${dol}{EXEC_SRCS})
- add_dependencies(${dol}{RTC_NAME}Comp ${dol}{RTC_NAME})
- target_link_libraries(${dol}{RTC_NAME}Comp ${dol}{RTC_NAME} ${dol}{LIBRARIES})
- set_target_properties(${dol}{RTC_NAME}Comp PROPERTIES LINK_FLAGS "${dol}{LDFLAGS}")
-endif()
-
-install(TARGETS ${dol}{RTC_NAME} LIBRARY DESTINATION "${dol}{INSTALL_PREFIX}"
- ARCHIVE DESTINATION "${dol}{INSTALL_PREFIX}"
- RUNTIME DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "applications")
-install(TARGETS ${dol}{RTC_NAME}Comp RUNTIME DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "applications")
-install(FILES RTC.xml DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "applications")
-
-
-${sharp} target settings for document
-configure_file("${dol}{CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
- "${dol}{CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
-
-add_custom_target(doxygen COMMAND
- ${dol}{DOXYGEN_EXECUTABLE} ${dol}{CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
-
-install(DIRECTORY ${dol}{CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "documents")
-
-
-${sharp} install source files
-install(FILES ${dol}{IDL_FILES} ${dol}{IMPL_SRCS} ${dol}{IMPL_INCS}
- DESTINATION "${dol}{INSTALL_PREFIX}/src"
- COMPONENT "sources")
-
-install(FILES ${dol}{LIBS_SRCS} ${dol}{LIBS_INCS} ${dol}{EXEC_SRCS}
- DESTINATION "${dol}{INSTALL_PREFIX}/src"
- COMPONENT "sources")
-
-install(FILES ${dol}{OTHER_SRCS}
- DESTINATION "${dol}{INSTALL_PREFIX}/src"
- COMPONENT "sources")
-
-install(DIRECTORY cmake_modules cpack_resources
- DESTINATION "${dol}{INSTALL_PREFIX}/src"
- COMPONENT "sources")
-
-
-${sharp} package settings
-set(CPACK_PACKAGE_NAME "${dol}{RTC_NAME}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${dol}{RTC_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${dol}{RTC_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${dol}{RTC_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${dol}{CPACK_PACKAGE_VERSION_MAJOR}.${dol}{CPACK_PACKAGE_VERSION_MINOR}.${dol}{CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_VENDOR "${dol}{RTC_VENDOR}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${dol}{RTC_DESCRIPTION}")
-set(CPACK_PACKAGE_CONTACT "${dol}{RTC_MAINTAINER}")
-
-set(CPACK_RESOURCE_FILE_LICENSE
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/License.txt")
-set(CPACK_PACKAGE_DESCRIPTION_FILE
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/Description.txt")
-
-set(CPACK_COMPONENTS_ALL applications documents sources)
-set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "RT-Component applications")
-set(CPACK_COMPONENT_APPLICATIONS_DISABLED FALSE)
-
-set(CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME "Documents")
-set(CPACK_COMPONENT_DOCUMENTS_DESCRIPTION "RT-Component documents")
-set(CPACK_COMPONENT_DOCUMENTS_DISABLED TRUE)
-
-set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
-set(CPACK_COMPONENT_SOURCES_DESCRIPTION "RT-Component source files")
-set(CPACK_COMPONENT_SOURCES_DISABLED TRUE)
-
-if(WIN32)
- set(CPACK_GENERATOR "WIX")
-
- ${sharp} Windows WiX package settings
-
- set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
- set(CPACK_WIX_LANG "ja-jp")
- set(CPACK_RESOURCE_FILE_LICENSE
- "@CMAKE_CURRENT_SOURCE_DIR@/cpack_resources/License.rtf")
- configure_file(
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/wix.xsl.in"
- "${dol}{CMAKE_CURRENT_BINARY_DIR}/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
-
-else()
- set(CPACK_GENERATOR "${dol}{LINUX_PACKAGE_GENERATOR}")
-
- if(CPACK_GENERATOR STREQUAL "DEB")
- ${sharp} Linux Debian package settings
-
- set(CPACK_DEBIAN_PACKAGE_VERSION "${dol}{CPACK_PACKAGE_VERSION}-1")
- set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
- set(CPACK_DEBIAN_PACKAGE_SECTION "main")
- set(CPACK_DEBIAN_PACKAGE_PRIORITY "extra")
- set(CPACK_DEBIAN_PACKAGE_DEPENDS "openrtm-aist (>= ${rtcParam.rtmVersion})")
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}_${dol}{CPACK_DEBIAN_PACKAGE_VERSION}_${dol}{CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-
- elseif(CPACK_GENERATOR STREQUAL "RPM")
- ${sharp} Linux RPM package settings
-
- set(CPACK_RPM_PACKAGE_RELEASE "1.fc10")
- set(CPACK_RPM_PACKAGE_ARCHITECTURE "i386")
- set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
- set(CPACK_RPM_PACKAGE_LICENSE "LGPL")
- set(CPACK_RPM_PACKAGE_REQUIRES "OpenRTM-aist >= ${rtcParam.rtmVersion}")
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}-${dol}{PACKAGE_VERSION}-${dol}{CPACK_RPM_PACKAGE_RELEASE}.${dol}{CPACK_RPM_PACKAGE_ARCHITECTURE}")
-
- endif()
-endif()
-
-message(STATUS "Package type: ${dol}{CPACK_GENERATOR}")
-message(STATUS "Package name: ${dol}{CPACK_PACKAGE_FILE_NAME}")
-
-include(CPack)
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.LESSER.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.LESSER.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.LESSER.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/COPYING.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/CMakeCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/CMakeCMakeLists.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/CMakeCMakeLists.txt.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,18 @@
+set(PKG_DEPS "openrtm-aist")
+set(PKG_LIBS -l${dol}{PROJECT_NAME_LOWER})
+set(pkg_conf_file ${dol}{CMAKE_CURRENT_BINARY_DIR}/${dol}{PROJECT_NAME_LOWER}.pc)
+configure_file(${dol}{PROJECT_NAME_LOWER}.pc.in ${dol}{pkg_conf_file} @ONLY)
+install(FILES ${dol}{pkg_conf_file}
+ DESTINATION ${dol}{LIB_INSTALL_DIR}/pkgconfig/ COMPONENT component)
+
+${sharp} Install CMake modules
+set(cmake_config ${dol}{CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config.cmake)
+configure_file(${dol}{CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME_LOWER}-config.cmake.in
+ ${dol}{cmake_config} @ONLY)
+set(cmake_version_config
+ ${dol}{CMAKE_CURRENT_BINARY_DIR}/${dol}{PROJECT_NAME_LOWER}-config-version.cmake)
+configure_file(${dol}{CMAKE_CURRENT_SOURCE_DIR}/${dol}{PROJECT_NAME_LOWER}-config-version.cmake.in
+ ${dol}{cmake_version_config} @ONLY)
+set(cmake_mods ${dol}{cmake_config} ${dol}{cmake_version_config})
+install(FILES ${dol}{cmake_mods} DESTINATION ${dol}{SHARE_INSTALL_DIR} COMPONENT library)
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,110 @@
+${sharp} Find OpenRTM-aist
+${sharp}
+${sharp} The following additional directories are searched:
+${sharp} OPENRTM_ROOT (CMake variable)
+${sharp} OPENRTM_ROOT (Environment variable)
+${sharp}
+${sharp} This sets the following variables:
+${sharp} OPENRTM_FOUND - True if OpenRTM-aist was found.
+${sharp} OPENRTM_INCLUDE_DIRS - Directories containing the OpenRTM-aist include files.
+${sharp} OPENRTM_LIBRARIES - Libraries needed to use OpenRTM-aist.
+${sharp} OPENRTM_CFLAGS - Compiler flags for OpenRTM-aist.
+${sharp} OPENRTM_VERSION - The version of OpenRTM-aist found.
+${sharp} OPENRTM_VERSION_MAJOR - The major version of OpenRTM-aist found.
+${sharp} OPENRTM_VERSION_MINOR - The minor version of OpenRTM-aist found.
+${sharp} OPENRTM_VERSION_REVISION - The revision version of OpenRTM-aist found.
+${sharp} OPENRTM_VERSION_CANDIDATE - The candidate version of OpenRTM-aist found.
+${sharp} OPENRTM_IDL_COMPILER - The IDL compiler used by OpenRTM-aist.
+${sharp} OPENRTM_IDL_FLAGS - The flags used to compile OpenRTM-aist IDL files.
+${sharp} OPENRTM_IDL_DIR - The directory containing the OpenRTM-aist IDL files.
+${sharp}
+${sharp} This module also defines one macro usable in your CMakeLists.txt files:
+${sharp} OPENRTM_COMPILE_IDL_FILES(file1 file2 ...)
+${sharp} Compiles the specified IDL files, placing the generated C++ source files in
+${sharp} ${dol}{CMAKE_CURRENT_BINARY_DIR}. The source files can be found in file1_SRCS,
+${sharp} file2_SRCS, etc., and all source files for all IDL files are available in
+${sharp} ALL_IDL_SRCS. To depend on the generated files, depend on the targets
+${sharp} file1_TGT, file2_TGT, etc. The target ALL_IDL_TGT is available to depend on
+${sharp} all source files generated from IDL files.
+
+find_package(PkgConfig)
+pkg_check_modules(PC_OPENRTM openrtm-aist)
+pkg_check_modules(PC_COIL libcoil)
+
+find_path(OPENRTM_INCLUDE_DIR rtm/RTC.h
+ HINTS ${dol}{OPENRTM_ROOT}/include ${dol}ENV{OPENRTM_ROOT}/include
+ ${dol}{PC_OPENRTM_INCLUDE_DIRS})
+find_path(COIL_INCLUDE_DIR coil/config_coil.h
+ HINTS ${dol}{OPENRTM_ROOT}/include ${dol}ENV{OPENRTM_ROOT}/include
+ ${dol}{PC_COIL_INCLUDE_DIRS})
+find_library(OPENRTM_LIBRARY RTC
+ HINTS ${dol}{OPENRTM_ROOT}/lib ${dol}ENV{OPENRTM_ROOT}/lib
+ ${dol}{PC_OPENRTM_LIBRARY_DIRS})
+find_library(COIL_LIBRARY coil
+ HINTS ${dol}{OPENRTM_ROOT}/lib ${dol}ENV{OPENRTM_ROOT}/lib
+ ${dol}{PC_COIL_LIBRARY_DIRS})
+
+set(OPENRTM_CFLAGS ${dol}{PC_OPENRTM_CFLAGS_OTHER} ${dol}{PC_COIL_CFLAGS_OTHER})
+set(OPENRTM_INCLUDE_DIRS ${dol}{OPENRTM_INCLUDE_DIR} ${dol}{OPENRTM_INCLUDE_DIR}/rtm/idl
+ ${dol}{COIL_INCLUDE_DIR})
+set(OPENRTM_LIBRARIES ${dol}{OPENRTM_LIBRARY} ${dol}{COIL_LIBRARY} uuid dl pthread
+ omniORB4 omnithread omniDynamic4)
+
+file(STRINGS ${dol}{OPENRTM_INCLUDE_DIR}/rtm/version.h OPENRTM_VERSION
+ NEWLINE_CONSUME)
+${sharp}set(OPENRTM_VERSION "1.1.0")
+string(REGEX MATCH "version = \"([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([a-zA-Z0-9]*)\""
+ OPENRTM_VERSION "${dol}{OPENRTM_VERSION}")
+set(OPENRTM_VERSION_MAJOR ${dol}{CMAKE_MATCH_1})
+set(OPENRTM_VERSION_MINOR ${dol}{CMAKE_MATCH_2})
+set(OPENRTM_VERSION_REVISION ${dol}{CMAKE_MATCH_3})
+set(OPENRTM_VERSION_CANDIDATE ${dol}{CMAKE_MATCH_4})
+
+execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDL_COMPILER
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDL_FLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+separate_arguments(OPENRTM_IDL_FLAGS)
+execute_process(COMMAND rtm-config --prefix OUTPUT_VARIABLE _rtm_prefix
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+set(OPENRTM_IDL_DIR
+ ${dol}{_rtm_prefix}/include/openrtm-${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}/rtm/idl
+ CACHE STRING "Directory containing the OpenRTM-aist IDL files.")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OpenRTM
+ REQUIRED_VARS OPENRTM_INCLUDE_DIR COIL_INCLUDE_DIR OPENRTM_LIBRARY
+ COIL_LIBRARY OPENRTM_IDL_COMPILER)
+
+macro(_IDL_OUTPUTS _idl _dir _result)
+ set(${dol}{_result} ${dol}{_dir}/${dol}{_idl}SK.cc ${dol}{_dir}/${dol}{_idl}.hh
+ ${dol}{_dir}/${dol}{_idl}DynSK.cc)
+endmacro(_IDL_OUTPUTS)
+
+
+macro(_COMPILE_IDL _idl_file)
+ get_filename_component(_idl ${dol}{_idl_file} NAME_WE)
+ set(_idl_srcs_var ${dol}{_idl}_SRCS)
+ _IDL_OUTPUTS(${dol}{_idl} ${dol}{CMAKE_CURRENT_BINARY_DIR} ${dol}{_idl_srcs_var})
+
+ add_custom_command(OUTPUT ${dol}{${dol}{_idl_srcs_var}}
+ COMMAND ${dol}{OPENRTM_IDL_COMPILER} ${dol}{OPENRTM_IDL_FLAGS}
+ -I${dol}{OPENRTM_IDL_DIR} ${dol}{_idl_file}
+ WORKING_DIRECTORY ${dol}{CURRENT_BINARY_DIR}
+ DEPENDS ${dol}{_idl_file}
+ COMMENT "Compiling ${dol}{_idl_file}" VERBATIM)
+ add_custom_target(${dol}{_idl}_TGT DEPENDS ${dol}{${dol}{_idl_srcs_var}})
+ set(ALL_IDL_SRCS ${dol}{ALL_IDL_SRCS} ${dol}{${dol}{_idl_srcs_var}})
+ if(NOT TARGET ALL_IDL_TGT)
+ add_custom_target(ALL_IDL_TGT)
+ endif(NOT TARGET ALL_IDL_TGT)
+ add_dependencies(ALL_IDL_TGT ${dol}{_idl}_TGT)
+endmacro(_COMPILE_IDL)
+
+${sharp} Module exposed to the user
+macro(OPENRTM_COMPILE_IDL_FILES)
+ foreach(idl ${dol}{ARGN})
+ _COMPILE_IDL(${dol}{idl})
+ endforeach(idl)
+endmacro(OPENRTM_COMPILE_IDL_FILES)
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/License.rtf.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/License.rtf.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/License.rtf.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,7 @@
+{\rtf1\ansi\ansicpg932\deff0\deflang1033\deflangfe1041{\fonttbl{\f0\froman\fprq1\fcharset128 \'82\'6c\'82\'72 \'82\'6f\'83\'53\'83\'56\'83\'62\'83\'4e;}}
+{\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\lang1041\f0\fs20 LICENSE\par
+=======\par
+\par
+This is an installer created using CPack (http://www.cmake.org). No license provided.\par
+\par
+}
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cmake_uninstall.cmake.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cmake_uninstall.cmake.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cmake_uninstall.cmake.in.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,18 @@
+if(NOT EXISTS "@PROJECT_BINARY_DIR@/install_manifest.txt")
+ message(FATAL_ERROR "Cannot find install manifest: \"@PROJECT_BINARY_DIR@/install_manifest.txt\"")
+endif(NOT EXISTS "@PROJECT_BINARY_DIR@/install_manifest.txt")
+
+file(READ "@PROJECT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${dol}{files}")
+foreach(file ${dol}{files})
+ message(STATUS "Uninstalling \"${dol}ENV{DESTDIR}${dol}{file}\"")
+ if(EXISTS "${dol}ENV{DESTDIR}${dol}{file}")
+ exec_program("@CMAKE_COMMAND@" ARGS "-E remove \"${dol}ENV{DESTDIR}${dol}{file}\""
+ OUTPUT_VARIABLE rm_out RETURN_VALUE rm_retval)
+ if(NOT "${dol}{rm_retval}" STREQUAL 0)
+ message(FATAL_ERROR "Problem when removing \"${dol}ENV{DESTDIR}${dol}{file}\"")
+ endif(NOT "${dol}{rm_retval}" STREQUAL 0)
+ else(EXISTS "${dol}ENV{DESTDIR}${dol}{file}")
+ message(STATUS "File \"${dol}ENV{DESTDIR}${dol}{file}\" does not exist.")
+ endif(EXISTS "${dol}ENV{DESTDIR}${dol}{file}")
+endforeach(file)
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/config.cmake.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/config.cmake.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/config.cmake.in.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,54 @@
+${sharp} ${rtcParam.name} CMake config file
+${sharp}
+${sharp} This file sets the following variables:
+${sharp} ${rtcParam.name}_FOUND - Always TRUE.
+${sharp} ${rtcParam.name}_INCLUDE_DIRS - Directories containing the ${rtcParam.name} include files.
+${sharp} ${rtcParam.name}_IDL_DIRS - Directories containing the ${rtcParam.name} IDL files.
+${sharp} ${rtcParam.name}_LIBRARIES - Libraries needed to use ${rtcParam.name}.
+${sharp} ${rtcParam.name}_DEFINITIONS - Compiler flags for ${rtcParam.name}.
+${sharp} ${rtcParam.name}_VERSION - The version of ${rtcParam.name} found.
+${sharp} ${rtcParam.name}_VERSION_MAJOR - The major version of ${rtcParam.name} found.
+${sharp} ${rtcParam.name}_VERSION_MINOR - The minor version of ${rtcParam.name} found.
+${sharp} ${rtcParam.name}_VERSION_REVISION - The revision version of ${rtcParam.name} found.
+${sharp} ${rtcParam.name}_VERSION_CANDIDATE - The candidate version of ${rtcParam.name} found.
+
+message(STATUS "Found ${rtcParam.name}- at PROJECT_VERSION@")
+set(${rtcParam.name}_FOUND TRUE)
+
+find_package(<dependency> REQUIRED)
+
+${sharp}set(${rtcParam.name}_INCLUDE_DIRS
+${sharp} "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@"
+${sharp} ${dol}{<dependency>_INCLUDE_DIRS}
+${sharp} )
+${sharp}
+${sharp}set(${rtcParam.name}_IDL_DIRS
+${sharp} "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/idl")
+set(${rtcParam.name}_INCLUDE_DIRS
+ "@CMAKE_INSTALL_PREFIX@/include/@CPACK_PACKAGE_FILE_NAME@"
+ ${dol}{<dependency>_INCLUDE_DIRS}
+ )
+set(${rtcParam.name}_IDL_DIRS
+ "@CMAKE_INSTALL_PREFIX@/include/@CPACK_PACKAGE_FILE_NAME@/idl")
+
+
+if(WIN32)
+ set(${rtcParam.name}_LIBRARIES
+ "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME_LOWER@@CMAKE_STATIC_LIBRARY_SUFFIX@"
+ ${dol}{<dependency>_LIBRARIES}
+ )
+else(WIN32)
+ set(${rtcParam.name}_LIBRARIES
+ "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@@PROJECT_NAME_LOWER@@CMAKE_SHARED_LIBRARY_SUFFIX@"
+ ${dol}{<dependency>_LIBRARIES}
+ )
+endif(WIN32)
+
+set(${rtcParam.name}_DEFINITIONS ${dol}{<dependency>_DEFINITIONS})
+
+set(${rtcParam.name}_VERSION @PROJECT_VERSION@)
+set(${rtcParam.name}_VERSION_MAJOR @PROJECT_VERSION_MAJOR@)
+set(${rtcParam.name}_VERSION_MINOR @PROJECT_VERSION_MINOR@)
+set(${rtcParam.name}_VERSION_REVISION @PROJECT_VERSION_REVISION@)
+set(${rtcParam.name}_VERSION_CANDIDATE @PROJECT_VERSION_CANDIDATE@)
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/config_version.cmake.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/config_version.cmake.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/config_version.cmake.in.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,10 @@
+set(PACKAGE_VERSION @PROJECT_VERSION@)
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if(PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif(PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)
+endif(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,94 @@
+set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
+set(CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
+set(CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
+set(CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_REVISION@")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
+set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
+set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
+
+set(CPACK_COMPONENTS_ALL component)
+set(CPACK_COMPONENT_COMPONENT_DISPLAY_NAME "Applications")
+set(CPACK_COMPONENT_COMPONENT_DESCRIPTION
+ "Component library and stand-alone executable")
+if(INSTALL_HEADERS)
+ set(CPACK_COMPONENTS_ALL ${dol}{CPACK_COMPONENTS_ALL} headers)
+ set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
+ set(CPACK_COMPONENT_HEADERS_DESCRIPTION
+ "Header files from the component.")
+ set(CPACK_COMPONENT_HEADERS_DEPENDS component)
+endif(INSTALL_HEADERS)
+if(INSTALL_IDL)
+ set(CPACK_COMPONENTS_ALL ${dol}{CPACK_COMPONENTS_ALL} idl)
+ set(CPACK_COMPONENT_IDL_DISPLAY_NAME "IDL files")
+ set(CPACK_COMPONENT_IDL_DESCRIPTION
+ "IDL files for the component's services.")
+ set(CPACK_COMPONENT_IDL_DEPENDS component)
+endif(INSTALL_IDL)
+set(INSTALL_EXAMPLES @BUILD_EXAMPLES@)
+if(INSTALL_EXAMPLES)
+ set(CPACK_COMPONENTS_ALL ${dol}{CPACK_COMPONENTS_ALL} examples)
+ set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Examples")
+ set(CPACK_COMPONENT_EXAMPLES_DESCRIPTION
+ "Sample configuration files and other component resources.")
+ set(CPACK_COMPONENT_EXAMPLES_DEPENDS component)
+endif(INSTALL_EXAMPLES)
+set(INSTALL_DOCUMENTATION @BUILD_DOCUMENTATION@)
+if(INSTALL_DOCUMENTATION)
+ set(CPACK_COMPONENTS_ALL ${dol}{CPACK_COMPONENTS_ALL} documentation)
+ set(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
+ "Component documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DEPENDS component)
+endif(INSTALL_DOCUMENTATION)
+if(INSTALL_SOURCES)
+ set(CPACK_COMPONENTS_ALL ${dol}{CPACK_COMPONENTS_ALL} sources)
+ set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
+ set(CPACK_COMPONENT_SOURCES_DESCRIPTION
+ "Source files from the component.")
+endif(INSTALL_SOURCES)
+
+IF (WIN32)
+
+ ${sharp} Windows WiX package settings
+
+ set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
+ set(CPACK_WIX_LANG "ja-jp")
+ set(CPACK_RESOURCE_FILE_LICENSE
+ "@CMAKE_CURRENT_SOURCE_DIR@/cmake/License.rtf")
+ configure_file(
+ "@CMAKE_CURRENT_SOURCE_DIR@/cmake/wix.xsl.in"
+ "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl" @ONLY)
+
+ set(CPACK_PACKAGE_FILE_NAME
+ "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
+
+
+ ${sharp}
+ ${sharp}
+ ${sharp}
+ set(CPACK_NSIS_MUI_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
+ set(CPACK_NSIS_MUI_UNIICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
+ set(CPACK_PACKAGE_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.bmp")
+ set(CPACK_NSIS_HELP_LINK "http://www.openrtm.org")
+ set(CPACK_NSIS_URL_INFO_ABOUT "http://www.openrtm.org")
+ set(CPACK_NSIS_MODIFY_PATH ON)
+ set(CPACK_PACKAGE_EXECUTABLES @PROJECT_EXECUTABLES@)
+ if(INSTALL_DOCUMENTATION)
+ set(CPACK_NSIS_MENU_LINKS
+ "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/html/index.html"
+ "Component documentation")
+ endif(INSTALL_DOCUMENTATION)
+ string(REPLACE "/@PROJECT_NAME@" "" install_prefix_root
+ "@CMAKE_INSTALL_PREFIX@")
+ file(TO_NATIVE_PATH "${dol}{install_prefix_root}" install_prefix_root)
+ set(CPACK_NSIS_INSTALL_ROOT "${dol}{install_prefix_root}")
+ set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
+ " Rename \"${dol}INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config.cmake\" \"${dol}INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
+ Rename \"${dol}INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config-version.cmake\" \"${dol}INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
+ set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
+ " Delete \"${dol}INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
+ Delete \"${dol}INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
+ENDIF (WIN32)
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/pc.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/pc.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/pc.in.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,13 @@
+${sharp} This file was generated by CMake for @PROJECT_NAME@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${dol}{prefix}
+libdir=${dol}{prefix}/@LIB_INSTALL_DIR@
+includedir=${dol}{prefix}/include
+
+Name: @PROJECT_NAME@
+Description: @PROJECT_DESCRIPTION@
+Version: @PROJECT_VERSION@
+Requires: @PKG_DEPS@
+Libs: -L${dol}{libdir} @PKG_LIBS@
+Cflags: -I${dol}{includedir}/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/utils.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/utils.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/utils.in.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,26 @@
+${sharp} Dissect the version specified in PROJECT_VERSION, placing the major,
+${sharp} minor, revision and candidate components in PROJECT_VERSION_MAJOR, etc.
+${sharp} _prefix: The prefix string for the version variable names.
+macro(DISSECT_VERSION)
+ ${sharp} Find version components
+ string(REGEX REPLACE "^([0-9]+).*" "\\1"
+ PROJECT_VERSION_MAJOR "${dol}{PROJECT_VERSION}")
+ string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1"
+ PROJECT_VERSION_MINOR "${dol}{PROJECT_VERSION}")
+ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1"
+ PROJECT_VERSION_REVISION "${dol}{PROJECT_VERSION}")
+ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+(.*)" "\\1"
+ PROJECT_VERSION_CANDIDATE "${dol}{PROJECT_VERSION}")
+endmacro(DISSECT_VERSION)
+
+${sharp} Filter a list to remove all strings matching the regex in _pattern. The
+${sharp} output is placed in the variable pointed at by _output.
+macro(FILTER_LIST _list _pattern _output)
+ set(${dol}{_output})
+ foreach(_item ${dol}{_list})
+ if("${dol}{_item}" MATCHES ${dol}{_pattern})
+ set(${dol}{_output} ${dol}{${dol}{_output}} ${dol}{_item})
+ endif("${dol}{_item}" MATCHES ${dol}{_pattern})
+ endforeach(_item)
+endmacro(FILTER_LIST)
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/wix.xsl.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/wix.xsl.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/wix.xsl.in.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
+ <xsl:output indent="yes" method="xml"/>
+
+ <xsl:template match="/wix:Wix">
+ <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Product xmlns="http://schemas.microsoft.com/wix/2006/wi" Id="${WIX_PRODUCT_ID}" Name="@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@CPACK_PACKAGE_VERSION@" Manufacturer="@CPACK_PACKAGE_VENDOR@" UpgradeCode="${WIX_UPGRADECODE}">
+ <Package InstallerVersion="300" Compressed="yes" Languages='1041' SummaryCodepage='932' />
+ <Media Id="1" Cabinet="@CPACK_PACKAGE_NAME at .cab" EmbedCab="yes" />
+ <Directory Id="TARGETDIR" Name="SourceDir" >
+ <Directory Id="ProgramFilesFolder" Name="PFILE" >
+ <Directory Id="OPENRTM_DIR" Name="OpenRTM-aist" >
+ <!-- <Directory Id="INSTALLLOCATION" Name="@OPENRTM_VERSION_MAJOR at .@OPENRTM_VERSION_MINOR@" /> -->
+ <Directory Id="INSTALLLOCATION" Name="1.1" />
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <Feature Id="APPLICATIONS" Title="@CPACK_COMPONENT_COMPONENT_DISPLAY_NAME@" Level="1" Description="@CPACK_COMPONENT_COMPONENT_DESCRIPTION@" >
+ <!-- Start Ripping through the xml -->
+ <!--
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .dll')]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .lib')]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at Comp.exe')]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\RTC.xml')]" />
+ -->
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at .dll','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\lib\@CPACK_PACKAGE_NAME at .lib','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at Comp.exe','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, 'RTC.xml')]" />
+ </Feature>
+
+ <Feature Id="DOCUMENTS" Title="@CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION@" >
+ <!-- Start Ripping through the xml -->
+ <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\doc')]" />
+ </Feature>
+
+ <!-- <Feature Id="SOURCES" Title="@CPACK_COMPONENT_SOURCES_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_SOURCES_DESCRIPTION@" >-->
+ <!-- Start Ripping through the xml -->
+ <!-- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@CPACK_PACKAGE_INSTALL_DIRECTORY@\src')]" /> -->
+ <!-- </Feature> -->
+
+ <!--Tack on your specific wix options-->
+ <UIRef Id="WixUI_FeatureTree" />
+ <UIRef Id="WixUI_ErrorProgressText" />
+ <!--
+ <WixVariable Id="WixUILicenseRtf" Value="@CPACK_RESOURCE_FILE_LICENSE@"/>
+ -->
+ <!-- TODO: Add Wix Specific Dialogs and features. -->
+ <!-- TODO: Add artwork -->
+ <!-- TODO: Add ... -->
+
+ </Product>
+
+ <!--Output the fragment info which heat generates-->
+ <xsl:copy-of select="wix:Fragment[wix:DirectoryRef/wix:Component]" />
+ <xsl:apply-templates select="wix:Fragment[wix:DirectoryRef/@Id!='TARGETDIR' and wix:DirectoryRef/wix:Directory]" />
+
+ </Wix>
+ </xsl:template>
+
+ <xsl:template match="wix:Fragment[wix:DirectoryRef/wix:Directory]" >
+ <xsl:copy>
+ <xsl:apply-templates select="wix:DirectoryRef" />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="wix:DirectoryRef" >
+ <xsl:copy>
+ <xsl:choose>
+ <xsl:when test="wix:Directory[@Name='components']" >
+ <xsl:attribute name="Id">INSTALLLOCATION</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:apply-templates />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="wix:Directory" >
+ <xsl:copy>
+ <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
+ <xsl:attribute name="Name"><xsl:value-of select="@Name" /></xsl:attribute>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="wix:Component">
+ <xsl:element name="ComponentRef" xmlns="http://schemas.microsoft.com/wix/2006/wi" >
+ <xsl:attribute name="Id">
+ <xsl:value-of select="@Id" />
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:template>
+
+</xsl:stylesheet>
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/DocCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/DocCMakeLists.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/DocCMakeLists.txt.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,38 @@
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+ ${sharp} Search for Sphinx
+ ${sharp}set(SPHINX_PATH "" CACHE PATH
+ ${sharp} "Path to the directory containing the sphinx-build program")
+ ${sharp}find_program(SPHINX_BUILD sphinx-build PATHS ${dol}{SPHINX_PATH})
+ ${sharp}if(NOT SPHINX_BUILD)
+ ${sharp} message(FATAL_ERROR
+ ${sharp} "Sphinx was not found. Set SPHINX_PATH to the directory containing the sphinx-build executable, or disable BUILD_DOCUMENTATION.")
+ ${sharp}endif(NOT SPHINX_BUILD)
+
+ set(html_dir "${dol}{CMAKE_CURRENT_BINARY_DIR}/html")
+ set(doxygen_dir "${dol}{html_dir}/doxygen")
+ file(MAKE_DIRECTORY ${dol}{html_dir})
+ file(MAKE_DIRECTORY ${dol}{doxygen_dir})
+
+ ${sharp} Doxygen part
+ set(doxyfile "${dol}{CMAKE_CURRENT_BINARY_DIR}/doxyfile")
+ configure_file(doxyfile.in ${dol}{doxyfile})
+ add_custom_target(doxygen_doc ${dol}{DOXYGEN_EXECUTABLE} ${dol}{doxyfile})
+
+ ${sharp} Sphinx part
+ ${sharp}set(conf_dir "${dol}{CMAKE_CURRENT_BINARY_DIR}/conf")
+ ${sharp}file(MAKE_DIRECTORY "${dol}{conf_dir}")
+ ${sharp}file(MAKE_DIRECTORY "${dol}{conf_dir}/_static")
+ ${sharp}set(conf_py "${dol}{conf_dir}/conf.py")
+ ${sharp}configure_file(conf.py.in ${dol}{conf_py})
+ ${sharp}add_custom_target(sphinx_doc ALL sphinx-build -b html -c ${dol}{conf_dir}
+ ${sharp} ${dol}{CMAKE_CURRENT_SOURCE_DIR}/content ${dol}{CMAKE_CURRENT_BINARY_DIR}/html
+ ${sharp} DEPENDS doxygen_doc)
+ ${sharp}install(DIRECTORY "${dol}{CMAKE_CURRENT_BINARY_DIR}/html" DESTINATION
+ ${sharp} "components/share/doc/${dol}{PROJECT_NAME_LOWER}-${dol}{PROJECT_VERSION_MAJOR}"
+ ${sharp} COMPONENT documentation)
+else(DOXYGEN_FOUND)
+ message(FATAL_ERROR
+ "Doxygen was not found. Cannot build documentation. Disable BUILD_DOCUMENTATION to continue")
+endif(DOXYGEN_FOUND)
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/Doxyfile.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/Doxyfile.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/Doxyfile.in.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,297 @@
+${sharp}---------------------------------------------------------------------------
+${sharp} Project related configuration options
+${sharp}---------------------------------------------------------------------------
+DOXYFILE_ENCODING = UTF-8
+PROJECT_NAME = "@PROJECT_NAME@"
+PROJECT_NUMBER = @PROJECT_VERSION@
+OUTPUT_DIRECTORY = "@doxygen_dir@"
+CREATE_SUBDIRS = NO
+OUTPUT_LANGUAGE = English
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF = "The ${dol}name class" \
+ "The ${dol}name widget" \
+ "The ${dol}name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = YES
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH = @PROJECT_SOURCE_DIR@/include
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = YES
+QT_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = NO
+INHERIT_DOCS = YES
+SEPARATE_MEMBER_PAGES = NO
+TAB_SIZE = 2
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = NO
+OPTIMIZE_OUTPUT_JAVA = NO
+OPTIMIZE_FOR_FORTRAN = NO
+OPTIMIZE_OUTPUT_VHDL = NO
+EXTENSION_MAPPING =
+BUILTIN_STL_SUPPORT = NO
+CPP_CLI_SUPPORT = NO
+SIP_SUPPORT = NO
+IDL_PROPERTY_SUPPORT = YES
+DISTRIBUTE_GROUP_DOC = NO
+SUBGROUPING = YES
+TYPEDEF_HIDES_STRUCT = NO
+SYMBOL_CACHE_SIZE = 0
+
+${sharp}---------------------------------------------------------------------------
+${sharp} Build related configuration options
+${sharp}---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = NO
+EXTRACT_STATIC = NO
+EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_METHODS = NO
+EXTRACT_ANON_NSPACES = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = NO
+CASE_SENSE_NAMES = NO
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+FORCE_LOCAL_INCLUDES = NO
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_MEMBERS_CTORS_1ST = NO
+SORT_GROUP_NAMES = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = YES
+SHOW_FILES = YES
+SHOW_NAMESPACES = YES
+FILE_VERSION_FILTER =
+LAYOUT_FILE =
+
+${sharp}---------------------------------------------------------------------------
+${sharp} configuration options related to warning and progress messages
+${sharp}---------------------------------------------------------------------------
+QUIET = YES
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "${dol}file:${dol}line: ${dol}text"
+WARN_LOGFILE =
+
+${sharp}---------------------------------------------------------------------------
+${sharp} configuration options related to the input files
+${sharp}---------------------------------------------------------------------------
+INPUT = "@PROJECT_SOURCE_DIR@" \
+ "@PROJECT_SOURCE_DIR@/doc"
+INPUT_ENCODING = UTF-8
+FILE_PATTERNS = *.h \
+ *.hpp \
+ *.doxy
+RECURSIVE = YES
+EXCLUDE = "@PROJECT_SOURCE_DIR@/cmake" \
+ "@PROJECT_SOURCE_DIR@/build"
+EXCLUDE_SYMLINKS = YES
+EXCLUDE_PATTERNS =
+EXCLUDE_SYMBOLS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS = *
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = NO
+
+${sharp}---------------------------------------------------------------------------
+${sharp} configuration options related to source browsing
+${sharp}---------------------------------------------------------------------------
+SOURCE_BROWSER = YES
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = NO
+REFERENCES_RELATION = NO
+REFERENCES_LINK_SOURCE = YES
+USE_HTAGS = NO
+VERBATIM_HEADERS = YES
+
+${sharp}---------------------------------------------------------------------------
+${sharp} configuration options related to the alphabetical class index
+${sharp}---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = YES
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+
+${sharp}---------------------------------------------------------------------------
+${sharp} configuration options related to the HTML output
+${sharp}---------------------------------------------------------------------------
+GENERATE_HTML = YES
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_COLORSTYLE_HUE = 220
+HTML_COLORSTYLE_SAT = 100
+HTML_COLORSTYLE_GAMMA = 80
+HTML_TIMESTAMP = YES
+HTML_ALIGN_MEMBERS = YES
+HTML_DYNAMIC_SECTIONS = NO
+GENERATE_DOCSET = YES
+DOCSET_FEEDNAME = "Doxygen generated docs"
+DOCSET_BUNDLE_ID = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT@
+DOCSET_PUBLISHER_ID = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT at .Publisher
+DOCSET_PUBLISHER_NAME = @PROJECT_AUTHOR@/@PROJECT_VENDOR@
+GENERATE_HTMLHELP = YES
+CHM_FILE = "@PROJECT_NAME at -@PROJECT_VERSION_MAJOR at .@PROJECT_VERSION_MINOR at .chm"
+HHC_LOCATION = "@HTML_HELP_COMPILER@"
+GENERATE_CHI = NO
+CHM_INDEX_ENCODING =
+BINARY_TOC = NO
+TOC_EXPAND = NO
+GENERATE_QHP = NO
+QCH_FILE =
+QHP_NAMESPACE = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT at .Project
+QHP_VIRTUAL_FOLDER = doc
+QHP_CUST_FILTER_NAME =
+QHP_CUST_FILTER_ATTRS =
+QHP_SECT_FILTER_ATTRS =
+QHG_LOCATION =
+GENERATE_ECLIPSEHELP = NO
+ECLIPSE_DOC_ID = @PROJECT_NAME_LOWER at .@PROJECT_AUTHOR_SHORT at .Project
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = NO
+USE_INLINE_TREES = NO
+TREEVIEW_WIDTH = 250
+EXT_LINKS_IN_WINDOW = NO
+FORMULA_FONTSIZE = 10
+FORMULA_TRANSPARENT = YES
+SEARCHENGINE = YES
+SERVER_BASED_SEARCH = NO
+
+${sharp}---------------------------------------------------------------------------
+${sharp} configuration options related to the LaTeX output
+${sharp}---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = YES
+USE_PDFLATEX = YES
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+LATEX_SOURCE_CODE = NO
+
+${sharp}---------------------------------------------------------------------------
+${sharp} configuration options related to the RTF output
+${sharp}---------------------------------------------------------------------------
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+
+${sharp}---------------------------------------------------------------------------
+${sharp} configuration options related to the man page output
+${sharp}---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+
+${sharp}---------------------------------------------------------------------------
+${sharp} configuration options related to the XML output
+${sharp}---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+
+${sharp}---------------------------------------------------------------------------
+${sharp} configuration options for the AutoGen Definitions output
+${sharp}---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+
+${sharp}---------------------------------------------------------------------------
+${sharp} configuration options related to the Perl module output
+${sharp}---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+
+${sharp}---------------------------------------------------------------------------
+${sharp} Configuration options related to the preprocessor
+${sharp}---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS = *.h
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+
+${sharp}---------------------------------------------------------------------------
+${sharp} Configuration::additions related to external references
+${sharp}---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+
+${sharp}---------------------------------------------------------------------------
+${sharp} Configuration options related to the dot tool
+${sharp}---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+MSCGEN_PATH =
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = YES
+DOT_NUM_THREADS = 0
+DOT_FONTNAME = FreeSans.ttf
+DOT_FONTSIZE = 10
+DOT_FONTPATH =
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = NO
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = NO
+CALLER_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+DOT_GRAPH_MAX_NODES = 50
+MAX_DOT_GRAPH_DEPTH = 0
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = NO
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/conf.py.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/conf.py.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/conf.py.in.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,216 @@
+${sharp} -*- coding: utf-8 -*-
+${sharp}
+${sharp} ${rtcParam.name} documentation build configuration file, created by
+${sharp} sphinx-quickstart on Mon Aug 8 11:28:05 2011.
+${sharp}
+${sharp} This file is execfile()d with the current directory set to its containing dir.
+${sharp}
+${sharp} Note that not all possible configuration values are present in this
+${sharp} autogenerated file.
+${sharp}
+${sharp} All configuration values have a default; values that are commented out
+${sharp} serve to show the default.
+
+import sys, os
+
+${sharp} If extensions (or modules to document with autodoc) are in another directory,
+${sharp} add these directories to sys.path here. If the directory is relative to the
+${sharp} documentation root, use os.path.abspath to make it absolute, like shown here.
+${sharp}sys.path.insert(0, os.path.abspath('.'))
+
+${sharp} -- General configuration -----------------------------------------------------
+
+${sharp} If your documentation needs a minimal Sphinx version, state it here.
+${sharp}needs_sphinx = '1.0'
+
+${sharp} Add any Sphinx extension module names here, as strings. They can be extensions
+${sharp} coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['breathe']
+
+${sharp} Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+${sharp} The suffix of source filenames.
+source_suffix = '.txt'
+
+${sharp} The encoding of source files.
+${sharp}source_encoding = 'utf-8-sig'
+
+${sharp} The master toctree document.
+master_doc = 'index'
+
+${sharp} General information about the project.
+project = u'@PROJECT_NAME@'
+copyright = u'@PROJECT_COPYRIGHT_YEAR@, @PROJECT_AUTHOR@'
+
+${sharp} The version info for the project you're documenting, acts as replacement for
+${sharp} |version| and |release|, also used in various other places throughout the
+${sharp} built documents.
+${sharp}
+${sharp} The short X.Y version.
+version = '@PROJECT_VERSION_MAJOR at .@PROJECT_VERSION_MINOR@'
+${sharp} The full version, including alpha/beta/rc tags.
+release = '@PROJECT_VERSION@'
+
+${sharp} The language for content autogenerated by Sphinx. Refer to documentation
+${sharp} for a list of supported languages.
+${sharp}language = None
+
+${sharp} There are two options for replacing |today|: either, you set today to some
+${sharp} non-false value, then it is used:
+${sharp}today = ''
+${sharp} Else, today_fmt is used as the format for a strftime call.
+${sharp}today_fmt = '%B %d, %Y'
+
+${sharp} List of patterns, relative to source directory, that match files and
+${sharp} directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+${sharp} The reST default role (used for this markup: `text`) to use for all documents.
+${sharp}default_role = None
+
+${sharp} If true, '()' will be appended to :func: etc. cross-reference text.
+${sharp}add_function_parentheses = True
+
+${sharp} If true, the current module name will be prepended to all description
+${sharp} unit titles (such as .. function::).
+${sharp}add_module_names = True
+
+${sharp} If true, sectionauthor and moduleauthor directives will be shown in the
+${sharp} output. They are ignored by default.
+${sharp}show_authors = False
+
+${sharp} The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+${sharp} A list of ignored prefixes for module index sorting.
+${sharp}modindex_common_prefix = []
+
+
+${sharp} -- Options for HTML output ---------------------------------------------------
+
+${sharp} The theme to use for HTML and HTML Help pages. See the documentation for
+${sharp} a list of builtin themes.
+html_theme = 'default'
+
+${sharp} Theme options are theme-specific and customize the look and feel of a theme
+${sharp} further. For a list of options available for each theme, see the
+${sharp} documentation.
+${sharp}html_theme_options = {}
+
+${sharp} Add any paths that contain custom themes here, relative to this directory.
+${sharp}html_theme_path = []
+
+${sharp} The name for this set of Sphinx documents. If None, it defaults to
+${sharp} "<project> v<release> documentation".
+${sharp}html_title = None
+
+${sharp} A shorter title for the navigation bar. Default is the same as html_title.
+${sharp}html_short_title = None
+
+${sharp} The name of an image file (relative to this directory) to place at the top
+${sharp} of the sidebar.
+${sharp}html_logo = None
+
+${sharp} The name of an image file (within the static path) to use as favicon of the
+${sharp} docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+${sharp} pixels large.
+${sharp}html_favicon = None
+
+${sharp} Add any paths that contain custom static files (such as style sheets) here,
+${sharp} relative to this directory. They are copied after the builtin static files,
+${sharp} so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+${sharp} If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+${sharp} using the given strftime format.
+${sharp}html_last_updated_fmt = '%b %d, %Y'
+
+${sharp} If true, SmartyPants will be used to convert quotes and dashes to
+${sharp} typographically correct entities.
+${sharp}html_use_smartypants = True
+
+${sharp} Custom sidebar templates, maps document names to template names.
+${sharp}html_sidebars = {}
+
+${sharp} Additional templates that should be rendered to pages, maps page names to
+${sharp} template names.
+${sharp}html_additional_pages = {}
+
+${sharp} If false, no module index is generated.
+${sharp}html_domain_indices = True
+
+${sharp} If false, no index is generated.
+${sharp}html_use_index = True
+
+${sharp} If true, the index is split into individual pages for each letter.
+${sharp}html_split_index = False
+
+${sharp} If true, links to the reST sources are added to the pages.
+${sharp}html_show_sourcelink = True
+
+${sharp} If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+${sharp}html_show_sphinx = True
+
+${sharp} If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+${sharp}html_show_copyright = True
+
+${sharp} If true, an OpenSearch description file will be output, and all pages will
+${sharp} contain a <link> tag referring to it. The value of this option must be the
+${sharp} base URL from which the finished HTML is served.
+${sharp}html_use_opensearch = ''
+
+${sharp} This is the file name suffix for HTML files (e.g. ".xhtml").
+${sharp}html_file_suffix = None
+
+${sharp} Output file base name for HTML help builder.
+htmlhelp_basename = '@PROJECT_NAME at doc'
+
+
+${sharp} -- Options for LaTeX output --------------------------------------------------
+
+${sharp} The paper size ('letter' or 'a4').
+${sharp}latex_paper_size = 'letter'
+
+${sharp} The font size ('10pt', '11pt' or '12pt').
+${sharp}latex_font_size = '10pt'
+
+${sharp} Grouping the document tree into LaTeX files. List of tuples
+${sharp} (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+ ('index', '@PROJECT_NAME at .tex', u'@PROJECT_NAME@ Documentation',
+ u'@PROJECT_AUTHOR@', 'manual'),
+]
+
+${sharp} The name of an image file (relative to this directory) to place at the top of
+${sharp} the title page.
+${sharp}latex_logo = None
+
+${sharp} For "manual" documents, if this is true, then toplevel headings are parts,
+${sharp} not chapters.
+${sharp}latex_use_parts = False
+
+${sharp} If true, show page references after internal links.
+${sharp}latex_show_pagerefs = False
+
+${sharp} If true, show URL addresses after external links.
+${sharp}latex_show_urls = False
+
+${sharp} Additional stuff for the LaTeX preamble.
+${sharp}latex_preamble = ''
+
+${sharp} Documents to append as an appendix to all manuals.
+${sharp}latex_appendices = []
+
+${sharp} If false, no module index is generated.
+${sharp}latex_domain_indices = True
+
+
+${sharp} -- Options for manual page output --------------------------------------------
+
+${sharp} One entry per manual page. List of tuples
+${sharp} (source start file, name, description, authors, manual section).
+man_pages = [
+ ('index', '@PROJECT_NAME@', u'@PROJECT_NAME@ Documentation',
+ [u'@PROJECT_AUTHOR@'], 1)
+]
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/index.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/index.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/index.txt.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,139 @@
+${rtcParam.name}Name - English
+========================
+
+.. toctree::
+ :hidden:
+
+ index_j
+
+
+Introduction
+============
+
+
+For a full list of classes and functions, see the `API documentation`_.
+
+.. _`API Documentation`:
+ doxygen/html/index.html
+
+Requirements
+============
+
+${rtcParam.name} uses the `CMake build system`. You will need at least version
+2.8 to be able to build the component.
+
+.. _`CMAke build system`:
+ http://www.cmake.org
+
+
+Installation
+============
+
+Binary
+------
+
+Users of Windows can install the component using the binary installer. This
+will install the component and all its necessary dependencies. It is the
+recommended method of installation in Windows.
+
+- Download the installer from the website.
+- Double-click the executable file to begin installation.
+- Follow the instructions to install the component.
+- You may need to restart your computer for environment variable changes
+ to take effect before using the component.
+
+The component can be launched by double-clicking the
+``${rtcParam.name}_standalone`` executable. The ``${rtcParam.name}`` library
+is available for loading into a manager, using the initialisation function
+``rtc_init``.
+
+From source
+-----------
+
+Follow these steps to install ${rtcParam.name} from source in any operating
+system:
+
+- Download the source, either from the repository or a source archive,
+ and extract it somewhere::
+
+ tar -xvzf ${rtcParam.name}-1.0.0.tar.gz
+
+- Change to the directory containing the extracted source::
+
+ cd ${rtcParam.name}-1.0.0
+
+- Create a directory called ``build``::
+
+ mkdir build
+
+- Change to that directory::
+
+ cd build
+
+- Run cmake or cmake-gui::
+
+ cmake ../
+
+- If no errors occurred, run make::
+
+ make
+
+- Finally, install the component. Ensure the necessary permissions to
+ install into the chosen prefix are available::
+
+ make install
+
+- The install destination can be changed by executing ccmake and changing
+ the variable ``CMAKE_INSTALL_PREFIX``::
+
+ ccmake ../
+
+The component is now ready for use. See the next section for instructions on
+configuring the component.
+
+${rtcParam.name} can be launched in stand-alone mode by executing the
+``${rtcParam.name}_standalone`` executable (installed into ``${dol}{prefix}/bin``).
+Alternatively, ``lib${rtcParam.name}.so`` can be loaded into a manager, using the
+initialisation function ``rtc_init``. This shared object can be found in
+``${dol}{prefix}/lib`` or ``${dol}{prefix}/lib64``.
+
+
+Configuration
+=============
+
+The available configuration parameters are described below:
+
+================ ======
+Parameter Effect
+================ ======
+================ ======
+
+Ports
+=====
+
+The ports provided by the component are described below:
+
+=========== ======= ================== =======
+Name Type Data type Purpose
+=========== ======= ================== =======
+=========== ======= ================== =======
+
+Examples
+========
+
+An example configuration file is provided in the
+``${dol}{prefix}/share/${rtcParam.name}/examples/conf/`` directory.
+
+Changelog
+=========
+
+
+
+License
+=======
+
+This software is developed at the National Institute of Advanced
+Industrial Science and Technology. Approval number H23PRO-????. This
+software is licensed under the Lesser General Public License. See
+COPYING.LESSER.
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/index_j.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/index_j.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/doc/index_j.txt.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,129 @@
+${rtcParam.name} - 日本語
+=======================
+
+
+ã¯ã˜ã‚ã«
+========
+
+クラスã«ã¤ã„ã¦ã¯ã€ `APIドã‚ュメンテーション`_ ã«å‚ç…§ã—ã¦ãã ã•ã„。
+
+.. _`APIドã‚ュメンテーション`:
+ doxygen/html/index.html
+
+æ¡ä»¶
+====
+
+${rtcParam.name}ã¯OpenRTM-aist 1.0.0以上ã®C++版ãŒå¿…è¦ã§ã™ã€‚
+
+${rtcParam.name}㯠CMake_ を使ã„ã¾ã™ã€‚CMake 2.8以上ãŒå¿…è¦ã§ã™ã€‚
+
+.. _CMAke:
+ http://www.cmake.org
+
+インストール
+============
+
+インストーラ
+------------
+
+Windowsã®ãƒ¦ãƒ¼ã‚¶ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ãƒ‘ッケージを使用ã—ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストール
+ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã‚Œã¯ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆåŠã³ãã®ã™ã¹ã¦ã®å¿…è¦ãªãƒ©ã‚¤ãƒ–ラリを
+インストールã—ã¾ã™ã€‚Windowsã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å ´åˆã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã®ä½¿ç”¨ã‚’推奨ã—ã¦ã¾ã™ã€‚
+
+- インストーラをダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。
+- インストールを始ã‚ã‚‹ãŸã‚ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã‚’ダブルクリックã—ã¦ãã ã•ã„。
+- 指示ã«ã—ãŸãŒã£ã¦ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。
+- 環境変数ã®å¤‰æ›´ã‚’é©ç”¨ã™ã‚‹ãŸã‚ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’使用ã™ã‚‹å‰ã«ã‚³ãƒ³ãƒ”ューターを
+ å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
+
+${rtcParam.name}㯠``${rtcParam.name}_standalone`` ã®å®Ÿè¡Œã‚’ダブルクリックã—ã¦å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒ
+ã§ãã¾ã™ã€‚ã‚ã‚‹ã„ã¯ã€ ``${rtcParam.name}`` ã‚’åˆæœŸåŒ–関数㮠``rtc_init`` を利用ã—ã¦ã€
+マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+
+ソースã‹ã‚‰
+----------
+
+ソースを使ã†å ´åˆã¯ä»¥ä¸‹ã®æ‰‹é †ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。
+
+- ソースをダウンãƒãƒ¼ãƒ‰ã—ã¦è§£å‡ã—ã¦ãã ã•ã„::
+
+ tar -xvzf ${rtcParam.name}-1.0.0.tar.gz
+
+- 解å‡ã•ã‚ŒãŸãƒ•ã‚©ãƒ«ãƒ€ã«å…¥ã£ã¦ãã ã•ã„::
+
+ cd ${rtcParam.name}-1.0.0
+
+- ``build`` フォルダを作ã£ã¦ãã ã•ã„::
+
+ mkdir build
+
+- `` build`` フォルダã«å…¥ã£ã¦ãã ã•ã„::
+
+ cd build
+
+- CMakeを実行ã—ã¦ãã ã•ã„::
+
+ cmake ../
+
+- エラーãŒå‡ºç„¡ã„å ´åˆã€makeを実行ã—ã¦ãã ã•ã„::
+
+ make
+
+- ``make install`` ã§ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆã‚’インストールã—ã¦ãã ã•ã„。é¸æŠžã•ã‚ŒãŸ
+ ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å ´æ‰€ã«æ›¸ãè¾¼ã¿æ¨©é™ãŒã‚ã‚‹ã‹ã‚’確èªã—ã¦ãã ã•ã„::
+
+ ``make install``
+
+- インストールã™ã‚‹å ´æ‰€ã¯ccmakeを実行ã—㦠``CMAKE_INSTALL_PREFIX`` ã‚’
+ è¨å®šã™ã‚‹ã“ã¨ã§å¤‰æ›´ãŒå¯èƒ½ã§ã™ã€‚
+
+ ccmake ../
+
+ã“ã“ã¾ã§ã§ã€ã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆãŒä½¿ãˆã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã—ãŸã€‚コンフィグレーションã¯æ¬¡ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‚’
+å‚ç…§ã—ã¦ãã ã•ã„。
+
+${rtcParam.name}㯠``${rtcParam.name}_standalone`` を実行（ ``${dol}{prefix}/bin`` ã«
+インストールã•ã‚Œã¾ã™ï¼‰ã™ã‚‹ã“ã¨ã§ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ¼ãƒ³ãƒ¢ãƒ¼ãƒ‰ã§å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+ã‚ã‚‹ã„ã¯ã€ ``lib${rtcParam.name}.so`` ã‚’åˆæœŸåŒ–関数㮠``rtc_init`` を利用ã—ã¦ã€
+マãƒãƒ¼ã‚¸ãƒ£ã«ãƒãƒ¼ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã®ãƒ©ã‚¤ãƒ–ラリ㯠``${dol}{prefix}/lib``
+ã¾ãŸã¯ ``${dol}{prefix}/lib64`` ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚
+
+
+コンフィグレーション
+====================
+
+使ãˆã‚‹ã‚³ãƒ³ãƒ•ã‚£ã‚°ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ‘ラメータã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルをå‚ç…§
+ã—ã¦ãã ã•ã„。
+
+================ ====
+パラメータ æ„味
+================ ====
+================ ====
+
+ãƒãƒ¼ãƒˆ
+======
+
+コンãƒãƒ¼ãƒãƒ³ãƒˆã«ã‚ˆã£ã¦æä¾›ã•ã‚Œã‚‹ãƒãƒ¼ãƒˆã¯ä»¥ä¸‹ã®ãƒ†ãƒ¼ãƒ–ルã§è¿°ã¹ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚
+
+=========== ======== ================== ====
+ãƒãƒ¼ãƒˆå ãƒãƒ¼ãƒˆåž‹ データ型 æ„味
+=========== ======== ================== ====
+=========== ======== ================== ====
+
+例
+==
+
+例ã®rtc.confファイル㯠``${dol}{prefix}/share/${rtcParam.name}/examples/conf/``
+フォルダã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚
+
+Changelog
+=========
+
+
+License
+=======
+
+ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ç”£æ¥æŠ€è¡“ç·åˆç ”究所ã§é–‹ç™ºã•ã‚Œã¦ã„ã¾ã™ã€‚承èªç•ªå·ã¯H23PRO-????
+ã§ã™ã€‚ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ Lesser General Public License (LGPL) ライセンスã¨ã—ã¦
+公開ã•ã‚Œã¦ã¾ã™ã€‚COPYING.LESSER ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl/IdlCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl/IdlCMakeLists.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl/IdlCMakeLists.txt.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,56 @@
+set(idls ${tmpltHelper.getIDLFilesforIDLCMake(${rtcParam})})
+
+install(FILES ${dol}{idls} DESTINATION ${dol}{INC_INSTALL_DIR}/idl
+ COMPONENT idl)
+
+macro(_IDL_OUTPUTS _idl _dir _result)
+ set(${_result} ${_dir}/${_idl}SK.cc ${_dir}/${_idl}.hh
+ ${_dir}/${_idl}DynSK.cc)
+endmacro(_IDL_OUTPUTS)
+
+macro(_COMPILE_IDL _idl_file)
+ if(NOT WIN32)
+ execute_process(COMMAND rtm-config --prefix OUTPUT_VARIABLE OPENRTM_DIR
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDLFLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ separate_arguments(OPENRTM_IDLFLAGS)
+ execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDLC
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(_rtm_skelwrapper_command "rtm-skelwrapper")
+ else(NOT WIN32)
+ set(_rtm_skelwrapper_command "rtm-skelwrapper.py")
+ endif(NOT WIN32)
+ get_filename_component(_idl ${_idl_file} NAME_WE)
+ set(_idl_srcs_var ${dol}{_idl}_SRCS)
+ _IDL_OUTPUTS(${dol}{_idl} ${dol}{CMAKE_CURRENT_BINARY_DIR} ${dol}{_idl_srcs_var})
+
+ add_custom_command(OUTPUT ${dol}{${dol}{_idl_srcs_var}}
+ COMMAND python ${dol}{OPENRTM_DIR}/bin/${dol}{_rtm_skelwrapper_command} --include-dir= --skel-suffix=Skel --stub-suffix=Stub --idl-file=${dol}{_idl}.idl
+ COMMAND ${dol}{OPENRTM_IDLC} ${dol}{OPENRTM_IDLFLAGS} ${dol}{_idl_file}
+ WORKING_DIRECTORY ${dol}{CURRENT_BINARY_DIR}
+ DEPENDS ${dol}{_idl_file}
+ COMMENT "Compiling ${dol}{_idl_file}" VERBATIM)
+ add_custom_target(${dol}{_idl}_TGT DEPENDS ${dol}{${dol}{_idl_srcs_var}})
+ set(ALL_IDL_SRCS ${dol}{ALL_IDL_SRCS} ${dol}{${dol}{_idl_srcs_var}})
+ if(NOT TARGET ALL_IDL_TGT)
+ add_custom_target(ALL_IDL_TGT)
+ endif(NOT TARGET ALL_IDL_TGT)
+ add_dependencies(ALL_IDL_TGT ${dol}{_idl}_TGT)
+endmacro(_COMPILE_IDL)
+
+${sharp} Module exposed to the user
+macro(OPENRTM_COMPILE_IDL_FILES)
+ foreach(idl ${dol}{ARGN})
+ _COMPILE_IDL(${dol}{idl})
+ endforeach(idl)
+endmacro(OPENRTM_COMPILE_IDL_FILES)
+
+
+OPENRTM_COMPILE_IDL_FILES(${dol}{idls})
+set(ALL_IDL_SRCS ${dol}{ALL_IDL_SRCS} PARENT_SCOPE)
+FILTER_LIST("${dol}{ALL_IDL_SRCS}" "hh${dol}" idl_headers)
+install(FILES ${dol}{idl_headers}
+ DESTINATION ${dol}{INC_INSTALL_DIR}/${dol}{PROJECT_NAME_LOWER}/idl
+ COMPONENT headers)
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,9 @@
+set(hdrs ${rtcParam.name}.h
+#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
+ ${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h
+#end
+ )
+
+install(FILES ${dol}{hdrs} DESTINATION ${dol}{INC_INSTALL_DIR}/${dol}{PROJECT_NAME_LOWER}
+ COMPONENT library)
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncludeCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncludeCMakeLists.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncludeCMakeLists.txt.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,2 @@
+add_subdirectory(${rtcParam.name})
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,31 @@
+set(comp_srcs ${rtcParam.name}.cpp #foreach($providerIdlFile in ${rtcParam.providerIdlPathes})${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp #end)
+set(standalone_srcs ${rtcParam.name}Comp.cpp)
+
+include_directories(${dol}{PROJECT_SOURCE_DIR}/include)
+include_directories(${dol}{PROJECT_SOURCE_DIR}/include/${dol}{PROJECT_NAME})
+include_directories(${dol}{PROJECT_BINARY_DIR})
+include_directories(${dol}{PROJECT_BINARY_DIR}/idl)
+include_directories(${dol}{OPENRTM_INCLUDE_DIRS})
+include_directories(${dol}{OMNIORB_INCLUDE_DIRS})
+add_definitions(${dol}{OPENRTM_CFLAGS})
+
+link_directories(${dol}{OPENRTM_LIBRARY_DIRS})
+link_directories(${dol}{OMNIORB_LIBRARY_DIRS})
+
+add_library(${dol}{PROJECT_NAME_LOWER} ${dol}{LIB_TYPE} ${dol}{comp_srcs} ${dol}{ALL_IDL_SRCS})
+set_source_files_properties(${dol}{ALL_IDL_SRCS} PROPERTIES GENERATED 1)
+add_dependencies(${dol}{PROJECT_NAME_LOWER} ALL_IDL_TGT)
+target_link_libraries(${dol}{PROJECT_NAME_LOWER} ${dol}{OPENRTM_LIBRARIES})
+
+add_executable(${dol}{PROJECT_NAME_LOWER}comp ${dol}{standalone_srcs})
+target_link_libraries(${dol}{PROJECT_NAME_LOWER}comp ${dol}{PROJECT_NAME_LOWER})
+
+install(TARGETS ${dol}{PROJECT_NAME_LOWER} ${dol}{PROJECT_NAME_LOWER}comp
+ EXPORT ${dol}{PROJECT_NAME_LOWER}
+ RUNTIME DESTINATION ${dol}{BIN_INSTALL_DIR} COMPONENT component
+ LIBRARY DESTINATION ${dol}{LIB_INSTALL_DIR} COMPONENT component
+ ARCHIVE DESTINATION ${dol}{LIB_INSTALL_DIR} COMPONENT component)
+install(EXPORT ${dol}{PROJECT_NAME_LOWER}
+ DESTINATION ${dol}{LIB_INSTALL_DIR}/${dol}{PROJECT_NAME_LOWER}
+ FILE ${dol}{PROJECT_NAME_LOWER}Depends.cmake)
+
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -106,6 +106,7 @@
#foreach($configParam in ${rtcParam.configParams})
#if( ${configParam.widget.length()} > 0 )
${sharp} conf.__widget__.${configParam.name}, ${configParam.widget}#if( ${configParam.step.length()} > 0 ).${configParam.step}#end
+
#end
#end
#end
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/README.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/README.vsl 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/README.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -259,5 +259,11 @@
#end
#end
# </rtc-template>
+
+This software is developed at the National Institute of Advanced
+Industrial Science and Technology. Approval number H23PRO-????. This
+software is licensed under the Lesser General Public License. See
+COPYING.LESSER.
+
This area is reserved for future OpenRTM.
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_STAND_ALONE.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_STAND_ALONE.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_STAND_ALONE.vsl 2012-02-10 17:04:12 UTC (rev 262)
@@ -0,0 +1,42 @@
+// -*- C++ -*-
+/*!
+ * @file standalone.cpp
+ * @brief Standalone component
+ * @date ${dol}Date${dol}
+#parse("${template}/cpp/_doc.vsl")
+ * ${dol}Id${dol}
+ */
+
+${sharp}include "${rtcParam.name}/rtc.h"
+
+${sharp}include <rtm/Manager.h>
+${sharp}include <iostream>
+${sharp}include <string>
+${sharp}include <stdlib.h>
+
+void ModuleInit(RTC::Manager* manager)
+{
+ rtc_init(manager);
+ RTC::RtcBase* comp;
+ comp = manager->createComponent("${rtcParam.name}");
+
+ if (comp == NULL)
+ {
+ std::cerr << "${rtcParam.name} component creation failed." << std::endl;
+ abort();
+ }
+}
+
+
+int main(int argc, char** argv)
+{
+ RTC::Manager *manager;
+ manager = RTC::Manager::init(argc, argv);
+ manager->init(argc, argv);
+ manager->setModuleInitProc(ModuleInit);
+ manager->activateManager();
+ manager->runManager();
+
+ return 0;
+}
+
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -53,7 +53,8 @@
String result = content.replace("__ROOT_PATH__", rootPath);
String origPathes[] = {
"C:\\Tech-Arts\\EclipseRTM\\jp.go.aist.rtm.rtcbuilder\\",
- "C:\\Tech-Arts\\EclipseRTM34\\jp.go.aist.rtm.rtcbuilder\\" };
+ "C:\\Tech-Arts\\EclipseRTM34\\jp.go.aist.rtm.rtcbuilder\\",
+ "C:\\GlobalAssist\\EclipseAISTRep\\jp.go.aist.rtm.rtcbuilder\\" };
for (String path : origPathes) {
result = result.replace(path, rootPath);
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -65,7 +65,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(14, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -39,6 +39,7 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setEnableOldBuildEnv(true);
rtcParam.getPrivateAttributes().clear();
rtcParam.getPrivateAttributes().add("int private1");
@@ -62,7 +63,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/operation/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -78,6 +79,7 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setEnableOldBuildEnv(true);
rtcParam.getPrivateAttributes().clear();
rtcParam.getPrivateAttributes().add("int private1");
@@ -96,7 +98,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/attribute/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -112,6 +114,7 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -149,7 +152,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/service2/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -167,6 +170,7 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -193,7 +197,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/service1/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -211,6 +215,7 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -226,7 +231,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/outport2/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -242,6 +247,7 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -256,7 +262,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/outport1/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -272,6 +278,7 @@
rtcParam.setActivityType("PERIODIC2");
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setMaxInstance(5);
+ rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -283,7 +290,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/inport2/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -299,6 +306,7 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
+ rtcParam.setEnableOldBuildEnv(true);
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
@@ -309,7 +317,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/inport1/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "testComp.cpp");
checkCode(result, resourceDir, "test.h");
checkCode(result, resourceDir, "test.cpp");
@@ -325,13 +333,14 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setActivityType("PERIODIC2");
rtcParam.setMaxInstance(5);
+ rtcParam.setEnableOldBuildEnv(true);
Generator generator = new Generator();
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
String resourceDir = rootPath + "/resource/100/CXX/basic/name/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -91,7 +91,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(16, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -174,7 +174,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(18, result.size());
+ assertEquals(19, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -253,22 +253,22 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(15, result.size());
- checkCode(result, resourceDir, "fooComp.cpp");
- checkCode(result, resourceDir, "foo.h");
- checkCode(result, resourceDir, "foo.cpp");
- checkCode(result, resourceDir, "MyServiceSVC_impl.h");
- checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "src/fooComp.cpp");
+ checkCode(result, resourceDir, "include/foo/foo.h");
+ checkCode(result, resourceDir, "src/foo.cpp");
+ checkCode(result, resourceDir, "include/foo/MyServiceSVC_impl.h");
+ checkCode(result, resourceDir, "src/MyServiceSVC_impl.cpp");
//
- checkCode(result, resourceDir, "CMakeLists.txt");
- checkCode(result, resourceDir, "Doxyfile.in");
- checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
- checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+// checkCode(result, resourceDir, "CMakeLists.txt");
+// checkCode(result, resourceDir, "Doxyfile.in");
+// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
// checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
- checkCode(result, resourceDir, "cpack_resources/Description.txt");
- checkCode(result, resourceDir, "cpack_resources/License.txt");
- checkCode(result, resourceDir, "cpack_resources/License.rtf");
- checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+// checkCode(result, resourceDir, "cpack_resources/Description.txt");
+// checkCode(result, resourceDir, "cpack_resources/License.txt");
+// checkCode(result, resourceDir, "cpack_resources/License.rtf");
+// checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
//
nonexist(result, resourceDir, "Makefile.foo");
nonexist(result, resourceDir, "foo_vc8.sln");
@@ -332,24 +332,24 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(17, result.size());
- checkCode(result, resourceDir, "fooComp.cpp");
- checkCode(result, resourceDir, "foo.h");
- checkCode(result, resourceDir, "foo.cpp");
- checkCode(result, resourceDir, "MyServiceChildMultiSVC_impl.h");
- checkCode(result, resourceDir, "MyServiceChildMultiSVC_impl.cpp");
- checkCode(result, resourceDir, "MyServiceChildWithTypeSVC_impl.h");
- checkCode(result, resourceDir, "MyServiceChildWithTypeSVC_impl.cpp");
+ assertEquals(32, result.size());
+ checkCode(result, resourceDir, "src/fooComp.cpp");
+ checkCode(result, resourceDir, "include/foo/foo.h");
+ checkCode(result, resourceDir, "src/foo.cpp");
+ checkCode(result, resourceDir, "include/foo/MyServiceChildMultiSVC_impl.h");
+ checkCode(result, resourceDir, "src/MyServiceChildMultiSVC_impl.cpp");
+ checkCode(result, resourceDir, "include/foo/MyServiceChildWithTypeSVC_impl.h");
+ checkCode(result, resourceDir, "src/MyServiceChildWithTypeSVC_impl.cpp");
//
- checkCode(result, resourceDir, "CMakeLists.txt");
- checkCode(result, resourceDir, "Doxyfile.in");
- checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
- checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+// checkCode(result, resourceDir, "CMakeLists.txt");
+// checkCode(result, resourceDir, "Doxyfile.in");
+// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
// checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
- checkCode(result, resourceDir, "cpack_resources/Description.txt");
- checkCode(result, resourceDir, "cpack_resources/License.txt");
- checkCode(result, resourceDir, "cpack_resources/License.rtf");
- checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+// checkCode(result, resourceDir, "cpack_resources/Description.txt");
+// checkCode(result, resourceDir, "cpack_resources/License.txt");
+// checkCode(result, resourceDir, "cpack_resources/License.rtf");
+// checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
//
nonexist(result, resourceDir, "Makefile.foo");
nonexist(result, resourceDir, "foo_vc8.sln");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -32,6 +32,7 @@
rtcParam.setMaxInstance(3);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -95,7 +96,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -32,6 +32,7 @@
rtcParam.setMaxInstance(3);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -76,7 +77,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -24,6 +24,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -60,7 +61,7 @@
String resourceDir = rootPath + "/resource/100/CXX/DataPortIDL/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -28,6 +28,7 @@
rtcParam.setLanguageArg(LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -228,7 +229,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Doc/fullLong/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -24,6 +24,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -52,7 +53,7 @@
String resourceDir = rootPath + "/resource/100/CXX/ExecutionCxt/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -38,6 +38,7 @@
rtcParam.setMaxInstance(2);
rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
generator = new Generator();
@@ -78,7 +79,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -127,7 +128,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(17, result.size());
+ assertEquals(19, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -25,6 +25,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -54,7 +55,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceM/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -89,7 +90,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/idlmodule/serviceCon/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -124,7 +125,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArg/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -158,7 +159,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -26,6 +26,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -76,7 +77,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath3/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -131,7 +132,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath2/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -185,7 +186,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath1/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -25,6 +25,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
}
public void testIDLStruct() throws Exception {
@@ -56,7 +57,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -92,7 +93,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/SeqString/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -163,7 +164,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct2/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -200,7 +201,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -22,6 +22,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -53,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/all/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -80,7 +81,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/execute/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -106,7 +107,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/finalize/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -129,7 +130,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/initialize/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -23,6 +23,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -47,7 +48,7 @@
String resourceDir = rootPath + "/resource/100/CXX/library/library2/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -73,7 +74,7 @@
String resourceDir = rootPath + "/resource/100/CXX/library/library1/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -35,6 +35,7 @@
rtcParam.setMaxInstance(2);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
@@ -87,7 +88,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProConMulti/";
- assertEquals(17, result.size());
+ assertEquals(19, result.size());
checkResults(result, resourceDir);
checkCode(result, resourceDir, "MyServiceSVC_impl.h");
checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -119,7 +120,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ConMulti/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkResults(result, resourceDir);
nonexist(result, resourceDir, "MyServiceSVC_impl.h");
nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -151,7 +152,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProMulti/";
- assertEquals(17, result.size());
+ assertEquals(19, result.size());
checkResults(result, resourceDir);
checkCode(result, resourceDir, "MyServiceSVC_impl.h");
checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -36,6 +36,7 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
//
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
@@ -219,7 +220,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -25,6 +25,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -58,7 +59,7 @@
String resourceDir = rootPath + "/resource/100/CXX/SystemConfig/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -25,6 +25,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -53,7 +54,7 @@
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
String targetDir = rootPath + "/resource/100/CXX/AIST2/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, targetDir, "ModuleNameComp.cpp");
checkCode(result, targetDir, "ModuleName.h");
checkCode(result, targetDir, "ModuleName.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -26,6 +26,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
+ rtcParam.setEnableOldBuildEnv(true);
genParam.getRtcParams().add(rtcParam);
}
@@ -76,7 +77,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort2/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -131,7 +132,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort1/";
- assertEquals(15, result.size());
+ assertEquals(17, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -167,7 +168,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Variable/DataPort/";
- assertEquals(13, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -37,7 +37,7 @@
assertEquals("getGain", serviceClassParams.get(1).getMethods().get(3).getName());
//
assertEquals(1, includeFiles.size());
- assertEquals("C:\\Tech-Arts\\EclipseRTM34\\jp.go.aist.rtm.rtcbuilder\\resource\\IDL\\MyServiceParent.idl",
+ assertEquals("C:\\GlobalAssist\\EclipseAISTRep\\jp.go.aist.rtm.rtcbuilder\\resource\\IDL\\MyServiceParent.idl",
includeFiles.get(0));
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseMethodTypeTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -37,9 +37,11 @@
.convert_typedef(spec, "");
assertEquals(2, typedefParams.size());
- assertEquals("string[]", typedefParams.get(0).getOriginalDef());
+// assertEquals("string[]", typedefParams.get(0).getOriginalDef());
+ assertEquals("string", typedefParams.get(0).getOriginalDef());
assertEquals(true, typedefParams.get(0).isSequence());
- assertEquals("float[]", typedefParams.get(1).getOriginalDef());
+// assertEquals("float[]", typedefParams.get(1).getOriginalDef());
+ assertEquals("float", typedefParams.get(1).getOriginalDef());
assertEquals(true, typedefParams.get(1).isSequence());
}
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/StringUtilTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/StringUtilTest.java 2012-02-10 17:03:17 UTC (rev 261)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/StringUtilTest.java 2012-02-10 17:04:12 UTC (rev 262)
@@ -49,7 +49,7 @@
public void testSplit7() throws Exception{
String original = "12３４５67８９ï¼";
String result = StringUtil.splitString(original, 5, " * ", 3);
- String expected = "12\r\n * ３４５\r\n * 67８９\r\n * ï¼";
+ String expected = "12\r\n * ３\r\n * ï¼”\r\n * ５\r\n * 67\r\n * ８\r\n * ï¼™\r\n * ï¼";
assertEquals(expected, result);
}
@@ -67,12 +67,12 @@
assertEquals(expected, result);
}
- public void testSplit10() throws Exception{
- String original = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">æ–°ç€æƒ…å ±</a></li>";
- String result = StringUtil.splitString(original, 5, " * ", 0);
- String expected = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">\r\n * æ–°ç€æƒ…\r\n * å ±</a>\r\n * </li>";
- assertEquals(expected, result);
- }
+// public void testSplit10() throws Exception{
+// String original = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">æ–°ç€æƒ…å ±</a></li>";
+// String result = StringUtil.splitString(original, 5, " * ", 0);
+// String expected = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">\r\n * æ–°ç€æƒ…\r\n * å ±</a>\r\n * </li>";
+// assertEquals(expected, result);
+// }
// public void testSplit11() throws Exception{
// String original = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">æ–°ç€æƒ…å ±</a></li>";
@@ -81,12 +81,12 @@
// assertEquals(expected, result);
// }
- public void testSplit12() throws Exception{
- String original = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">æ–°ç€æƒ…å ±</a></li>";
- String result = StringUtil.splitString(original, 4, " * ", 0);
- String expected = "<li>\r\n * <a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">\r\n * æ–°ç€\r\n * æƒ…å ±\r\n * </a>\r\n * </li>";
- assertEquals(expected, result);
- }
+// public void testSplit12() throws Exception{
+// String original = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">æ–°ç€æƒ…å ±</a></li>";
+// String result = StringUtil.splitString(original, 4, " * ", 0);
+// String expected = "<li>\r\n * <a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">\r\n * æ–°ç€\r\n * æƒ…å ±\r\n * </a>\r\n * </li>";
+// assertEquals(expected, result);
+// }
public void testSplit13() throws Exception{
String original = "<li><span><br></span></li>";
@@ -116,24 +116,24 @@
assertEquals(expected, result);
}
- public void testSplit10_2() throws Exception{
- String original = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">æ–°ç€æƒ…å ±</a></li>";
- String result = StringUtil.splitString(original, 5, " * ", 1);
- String expected = "<li>\r\n * <a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">\r\n * æ–°ç€æƒ…\r\n * å ±</a>\r\n * </li>";
- assertEquals(expected, result);
-}
+// public void testSplit10_2() throws Exception{
+// String original = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">æ–°ç€æƒ…å ±</a></li>";
+// String result = StringUtil.splitString(original, 5, " * ", 1);
+// String expected = "<li>\r\n * <a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">\r\n * æ–°ç€æƒ…\r\n * å ±</a>\r\n * </li>";
+// assertEquals(expected, result);
+// }
- public void testSplit11_2() throws Exception{
- String original = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">æ–°ç€æƒ…å ±</a></li>";
- String result = StringUtil.splitString(original, 50, " * ", 45);
- String expected = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">\r\n * æ–°ç€æƒ…å ±</a></li>";
- assertEquals(expected, result);
- }
+// public void testSplit11_2() throws Exception{
+// String original = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">æ–°ç€æƒ…å ±</a></li>";
+// String result = StringUtil.splitString(original, 50, " * ", 45);
+// String expected = "<li><a href=\"/news-and-topics/\" title=\"æ–°ç€æƒ…å ±\">\r\n * æ–°ç€æƒ…å ±</a></li>";
+// assertEquals(expected, result);
+// }
public void testSplit13_2() throws Exception{
String original = "<li><span><br></span></li>";
String result = StringUtil.splitString(original, 15, " * ", 5);
- String expected = "<li><span>\r\n * <br></span></li>";
+ String expected = "<li><span>\r\n * <br></span>\r\n * </li>";
System.out.println(expected);
System.out.println(result);
assertEquals(expected, result);
@@ -142,7 +142,7 @@
public void testSplit14_2() throws Exception{
String original = "<li><span><br></span></li>";
String result = StringUtil.splitString(original, 14, " * ", 4);
- String expected = "<li><span>\r\n * <br></span></li>";
+ String expected = "<li><span>\r\n * <br></span>\r\n * </li>";
System.out.println(expected);
System.out.println(result);
assertEquals(expected, result);
openrtm-commit メーリングリストの案内