[openrtm-commit:01606] r612 - in branches/RELENG_1_1/OpenRTM-aist-Python: . OpenRTM_aist/RTM_IDL packages/rpm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2015年 10月 7日 (水) 12:09:49 JST
Author: n-ando
Date: 2015-10-07 12:09:49 +0900 (Wed, 07 Oct 2015)
New Revision: 612
Added:
branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist_fc19.spec.in
Modified:
branches/RELENG_1_1/OpenRTM-aist-Python/
branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in
branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/RTM_IDL/InterfaceDataTypes.idl
branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in
branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/rpm_build.sh
Log:
[compat,merge] r607-610 merged.
Property changes on: branches/RELENG_1_1/OpenRTM-aist-Python
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563,565-568,570-586
+ /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563,565-568,570-586,607-610
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in 2015-10-07 03:00:16 UTC (rev 611)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in 2015-10-07 03:09:49 UTC (rev 612)
@@ -4,7 +4,7 @@
include README
recursive-include packages Makefile
recursive-include packages/deb *.sh copyright changelog rules README* compat control control.* files
-recursive-include packages/rpm *.sh openrtm-aist.spec.in
+recursive-include packages/rpm *.sh openrtm-aist.spec.in openrtm-aist_fc19.spec.in
recursive-include installer *.rtf *.in *.wxs *.vbs *.bmp *.txt *.sh *.wxl *.cmd *.py
recursive-include OpenRTM_aist *.conf *.exe *.idl *.py *.pth *.sh
recursive-include OpenRTM_aist *.bat *.exe *.sample README
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/RTM_IDL/InterfaceDataTypes.idl
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/RTM_IDL/InterfaceDataTypes.idl 2015-10-07 03:00:16 UTC (rev 611)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/RTM_IDL/InterfaceDataTypes.idl 2015-10-07 03:09:49 UTC (rev 612)
@@ -698,7 +698,7 @@
/// Target time to arrive at the waypoint by.
Time timeLimit;
/// Maximum sped to travel at while heading to the waypoint.
- Pose2D maxSpeed;
+ Velocity2D maxSpeed;
};
/*!
@@ -733,7 +733,7 @@
/// Target time to arrive at the waypoint by.
Time timeLimit;
/// Maximum sped to travel at while heading to the waypoint.
- Pose3D maxSpeed;
+ Velocity3D maxSpeed;
};
/*!
@@ -903,7 +903,7 @@
/// Time stamp.
Time tm;
/// Intensity values normalised to between 0 and 1.
- IntensityList ranges;
+ IntensityList intensities;
/// Geometry of the ranger at the time the scan data was measured.
RangerGeometry geometry;
/// Configuration of the ranger at the time the scan data was measured.
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in 2015-10-07 03:00:16 UTC (rev 611)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in 2015-10-07 03:09:49 UTC (rev 612)
@@ -30,9 +30,7 @@
Buildroot: %{_tmppath}/%{pkgname}-%{version}-%{release}-root
Requires: python >= 2.5
-Requires: omniORBpy
Requires: omniORBpy-devel
-Requires: omniORBpy-standard
%description
OpenRTM-aist is a reference implementation of RTC (Robotic Technology
Copied: branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist_fc19.spec.in (from rev 610, trunk/OpenRTM-aist-Python/packages/rpm/openrtm-aist_fc19.spec.in)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist_fc19.spec.in (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist_fc19.spec.in 2015-10-07 03:09:49 UTC (rev 612)
@@ -0,0 +1,118 @@
+#------------------------------------------------------------
+#
+# @file RPM spec file for OpenRTM-aist-Python
+# @author Noriaki Ando <n-ando at aist.go.jp>
+#
+# $Id$
+#
+
+%define pkgname OpenRTM-aist-Python
+%define version __VERSION__
+%define short_version __SHORT_VERSION__
+%define distname __DISTNAME__
+%define builddir %{_topdir}/BUILD/%{distname}
+%define pkgver RELEASE0
+%define _unpackaged_files_terminate_build 0
+
+#------------------------------------------------------------
+# Package information
+Name: OpenRTM-aist-Python
+Version: %{version}
+Release: %{pkgver}.%{distname}
+Summary: Python modules for OpenRTM-aist-1.1.0
+Group: Applications/System
+License: LGPL
+URL: http://openrtm.org
+Source0: %{pkgname}-%{version}.tar.gz
+Vendor: AIST <n-ando at aist.go.jp>
+
+Prefix: %{_prefix}
+Buildroot: %{_tmppath}/%{pkgname}-%{version}-%{release}-root
+
+Requires: python >= 2.5
+Requires: omniORBpy
+Requires: omniORBpy-devel
+Requires: omniORBpy-standard
+
+%description
+OpenRTM-aist is a reference implementation of RTC (Robotic Technology
+Component) specification which is OMG standard. OpenRTM-aist includes
+RT-Middleware runtime environment and RTC framework. The OMG standard
+defines a component model and certain important infrastructure
+services applicable to the domain of robotics software development.
+OpenRTM-aist is being developed and distributed by Task Intelligence
+Research Group, Intelligent Systems Research Institute, National
+Institute of Advanced Industrial Science and Technology (AIST), Japan.
+Please see http://www.is.aist.go.jp/rt/OpenRTM-aist/html/ for more
+detail.
+
+#------------------------------------------------------------
+# doc package
+%package doc
+Summary: Documentation
+Group: Development/Libraries
+%description doc
+Developer documentation.
+
+#------------------------------------------------------------
+# example package
+%package example
+Summary: Example
+Group: Development/Libraries
+Requires: OpenRTM-aist-Python
+%description example
+Example components and sources
+
+#------------------------------------------------------------
+# prep section
+%prep
+%{__rm} -rf %{buildroot}
+%setup
+
+#------------------------------------------------------------
+# build section
+%build
+%{__python} setup.py build_core
+%{__python} setup.py build_example
+
+#------------------------------------------------------------
+# install section
+%install
+%{__python} setup.py install --root=%{buildroot} --record=INSTALLED_FILES
+
+#------------------------------------------------------------
+# clean section
+%clean
+rm -rf %{buildroot}
+
+#------------------------------------------------------------
+# core files section
+%files
+%defattr(-,root,root)
+%{python_sitelib}/OpenRTM-aist.pth
+%{python_sitelib}/OpenRTM_aist_Python-1.1.0-py%{python_version}.egg-info
+%{python_sitelib}/OpenRTM_aist
+%attr(755,root,root) %{_bindir}/*
+
+#------------------------------------------------------------
+# doc package file list
+%files doc
+%defattr(-,root,root,-)
+%{_datadir}/openrtm-%{short_version}/doc/python/
+
+
+#------------------------------------------------------------
+# example package file list
+%files example
+%defattr(755,root,root,-)
+%{_datadir}/openrtm-%{short_version}/example/python/
+
+
+#------------------------------------------------------------
+# changelog section
+%changelog
+* Wed May 01 2013 <n-ando at aist.go.jp> 1.1.0
+- 1.1.0-RELEASE
+
+* Thu Sep 27 2007 Noriaki Ando <n-ando at aist.go.jp> - 0.4.1-1._distname
+- The second public release version of OpenRTM-aist-0.4.1.
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/rpm_build.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/rpm_build.sh 2015-10-07 03:00:16 UTC (rev 611)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/rpm_build.sh 2015-10-07 03:09:49 UTC (rev 612)
@@ -29,6 +29,7 @@
{
dist_name=""
dist_key=""
+ FEDORA_VER=""
# Check the lsb distribution name
if test -f /etc/lsb-release ; then
. /etc/lsb-release
@@ -38,8 +39,9 @@
fi
# Check the Fedora version
if test "x$dist_name" = "x" && test -f /etc/fedora-release ; then
- dist_name=`cat /etc/fedora-release`-`uname -m`
- dist_key=`sed -e 's/.[^0-9]*\([0-9]\+\).*/fc\1/' /etc/fedora-release`
+ dist_name=`cat /etc/fedora-release`-`uname -m`
+ dist_key=`sed -e 's/.[^0-9]*\([0-9]\+\).*/fc\1/' /etc/fedora-release`
+ FEDORA_VER=$dist_key
fi
#Check the Debian version
if test "x$dist_name" = "x" && test -f /etc/debian_version ; then
@@ -103,7 +105,11 @@
create_spec_file()
{
- sed "s/__DISTNAME__/$DIST_KEY/g" openrtm-aist.spec.in > openrtm-aist.spec.1
+ if test "x$FEDORA_VER" = "xfc19" ; then
+ sed "s/__DISTNAME__/$DIST_KEY/g" openrtm-aist_fc19.spec.in > openrtm-aist.spec.1
+ else
+ sed "s/__DISTNAME__/$DIST_KEY/g" openrtm-aist.spec.in > openrtm-aist.spec.1
+ fi
sed "s/__VERSION__/$VERSION/g" openrtm-aist.spec.1 > openrtm-aist.spec.2
sed "s/__SHORT_VERSION__/$SHORT_VERSION/g" openrtm-aist.spec.2 > openrtm-aist.spec.3
cp openrtm-aist.spec.3 SPECS/openrtm-aist.spec
More information about the openrtm-commit
mailing list