[openrtm-commit:01531] r2609 - in trunk/OpenRTM-aist: . build packages/deb packages/deb/debian packages/rpm src/ext src/ext/ec/rtpreempt src/lib/coil
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2015年 5月 15日 (金) 09:35:18 JST
Author: n-ando
Date: 2015-05-15 09:35:18 +0900 (Fri, 15 May 2015)
New Revision: 2609
Added:
trunk/OpenRTM-aist/packages/deb/control.1
trunk/OpenRTM-aist/packages/deb/debian/
trunk/OpenRTM-aist/packages/deb/debian/control.not-multiarch
trunk/OpenRTM-aist/packages/deb/debian/rules.not-multiarch
trunk/OpenRTM-aist/packages/deb/ppa_tool.sh
Removed:
trunk/OpenRTM-aist/packages/deb/README.Debian
trunk/OpenRTM-aist/packages/deb/changelog
trunk/OpenRTM-aist/packages/deb/compat
trunk/OpenRTM-aist/packages/deb/control
trunk/OpenRTM-aist/packages/deb/copyright
trunk/OpenRTM-aist/packages/deb/debian/control.lucid
trunk/OpenRTM-aist/packages/deb/debian/control.marveric
trunk/OpenRTM-aist/packages/deb/debian/control.natty
trunk/OpenRTM-aist/packages/deb/debian/control.oneiric
trunk/OpenRTM-aist/packages/deb/debian/control.precise
trunk/OpenRTM-aist/packages/deb/dirs
trunk/OpenRTM-aist/packages/deb/docs
trunk/OpenRTM-aist/packages/deb/dpkgbuild.sh
trunk/OpenRTM-aist/packages/deb/rules
Modified:
trunk/OpenRTM-aist/
trunk/OpenRTM-aist/build/pkg_install_debian.sh
trunk/OpenRTM-aist/build/pkg_install_fedora.sh
trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh
trunk/OpenRTM-aist/configure.ac
trunk/OpenRTM-aist/packages/deb/Makefile.am
trunk/OpenRTM-aist/packages/deb/debian/Makefile.am
trunk/OpenRTM-aist/packages/deb/debian/changelog
trunk/OpenRTM-aist/packages/deb/debian/compat
trunk/OpenRTM-aist/packages/deb/debian/control
trunk/OpenRTM-aist/packages/deb/debian/rules
trunk/OpenRTM-aist/packages/deb/dpkg_build.sh
trunk/OpenRTM-aist/packages/rpm/Makefile.am
trunk/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in
trunk/OpenRTM-aist/packages/rpm/rpm_build.sh.in
trunk/OpenRTM-aist/src/ext/
trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/configure.ac
Log:
[merge] Merged from branch/RELENG_1_1 (2371,2373,2377,2378,2379,2388,2520,2541,2588,2590,2591,2597,2598,2601,2603), mainly deb package creation files.
Property changes on: trunk/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_1/OpenRTM-aist:2126-2150
+ /branches/RELENG_1_1/OpenRTM-aist:2126-2150,2371,2373,2377-2379,2388,2520,2541,2588,2590-2591,2597-2598,2601,2603
/tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
Modified: trunk/OpenRTM-aist/build/pkg_install_debian.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_debian.sh 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/build/pkg_install_debian.sh 2015-05-15 00:35:18 UTC (rev 2609)
@@ -14,11 +14,7 @@
#---------------------------------------
set_package_list()
{
-if [ "$code_name" = "wheezy" ]; then
- omni="libomniorb4-1 libomniorb4-dev omniidl omniorb-nameserver"
-else
- omni="libomniorb4 libomniorb4-dev omniidl4 omniorb4-nameserver"
-fi
+omni="libomniorb4-dev omniidl"
ace="libace libace-dev"
openrtm="openrtm-aist openrtm-aist-doc openrtm-aist-dev openrtm-aist-example"
openrtm04="openrtm-aist=0.4.2-1 openrtm-aist-doc=0.4.2-1 openrtm-aist-dev=0.4.2-1 openrtm-aist-example=0.4.2-1"
@@ -27,8 +23,7 @@
packages="$devel $omni $pyyaml $openrtm"
u_packages="$omni $ace $openrtm "
-default_reposerver="openrtm.org"
-reposervers="openrtm.org"
+reposervers="www.openrtm.org www.openrtm.de"
reposerver=""
}
@@ -46,7 +41,7 @@
msg2="コードネーム ： "
msg3="このOSはサポートされておりません。"
msg4=" OpenRTM-aistのリポジトリが登録されていません。"
- msg5="Source.listにOpenRTM-aistのリポジトリ："
+ msg5="Source.listにOpenrRTM-aistのリポジトリ："
msg6="を追加します。よろしいですか？(y/n)[y] "
msg7="中断します。"
msg8="ルートユーザーで実行してください。"
@@ -58,8 +53,8 @@
msg2="The code name is : "
msg3="This OS is not supported."
msg4="No repository entry for OpenRTM-aist is configured in your system."
- msg5="repository entry for OpenRTM-aist: "
- msg6="Do you want to add the repository entry for OpenRTM-aist in source.list?(y/n)[y] "
+ msg5="repository entry for OpenrRTM-aist: "
+ msg6="Do you want to add the repository entry for OpenrRTM-aist in source.list?(y/n)[y] "
msg7="Abort."
msg8="This script should be run as root."
msg9="Now installing: "
@@ -113,8 +108,7 @@
done
if test "x$nearhost" = "x"; then
echo "Repository servers unreachable.", $hosts
- echo "Check your internet connection. (or are you using proxy?)"
- nearhost=$default_reposerver
+ exit 1
fi
reposerver=$nearhost
}
@@ -187,7 +181,7 @@
uninstall_packages () {
for p in $*; do
echo $msg11 $p
- apt-get remove $p
+ aptitude remove $p
if test "$?" != 0; then
apt-get purge $p
fi
Modified: trunk/OpenRTM-aist/build/pkg_install_fedora.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_fedora.sh 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/build/pkg_install_fedora.sh 2015-05-15 00:35:18 UTC (rev 2609)
@@ -16,21 +16,14 @@
# パッケージリスト
#---------------------------------------
version_num=`cat /etc/fedora-release | awk '/Fedora/{print $3}' -`
-if [ $version_num -ge 16 ]; then
- # バージョンが16以降の場合
- omni="omniORB omniORB-devel omniORB-doc omniORB-servers omniORB-utils"
-else
- omni="omniORB omniORB-devel omniORB-doc omniORB-servers omniORB-utils omniORB-bootscripts"
-fi
-
+omni="omniORB omniORB-devel omniORB-doc omniORB-servers omniORB-utils"
ace="ace ace-devel"
openrtm="OpenRTM-aist OpenRTM-aist-devel OpenRTM-aist-doc OpenRTM-aist-example PyYAML"
openrtm04="OpenRTM-aist-0.4.2 OpenRTM-aist-devel-0.4.2 OpenRTM-aist-doc-0.4.2 OpenRTM-aist-example-0.4.2 PyYAML"
devel="gcc-c++ uuid-devel libuuid-devel"
packages="$devel $omni $openrtm"
-default_reposerver="openrtm.org"
-reposervers="openrtm.org"
+reposervers="www.openrtm.org www.openrtm.de"
reposerver=""
#----------------------------------------
@@ -76,8 +69,7 @@
done
if test "x$nearhost" = "x"; then
echo "Repository servers unreachable.", $hosts
- echo "Check your internet connection. (or are you using proxy?)"
- nearhost=$default_reposerver
+ exit 1
fi
reposerver=$nearhost
}
Modified: trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh 2015-05-15 00:35:18 UTC (rev 2609)
@@ -11,16 +11,15 @@
#---------------------------------------
# パッケージリスト
#---------------------------------------
-omni="libomniorb4 libomniorb4-dev omniidl4 omniorb4-nameserver omniidl omniorb-nameserver"
+omni="libomniorb4-dev omniidl"
ace="libace libace-dev"
openrtm="openrtm-aist openrtm-aist-doc openrtm-aist-dev openrtm-aist-example python-yaml"
-openrtm04="openrtm-aist=0.4.2-1 openrtm-aist-doc=0.4.2-1 openrtm-aist-dev=0.4.2-1 openrtm-aist-example=0.4.2-1 python-yaml"
+openrtm04="openrtm-aist=0.4.2-1 openrtm-aist-doc=0.4.2-1 openrtm-aist-dev=0.4.2-1 openrtm-aist-example=0.4.2-1 python-yaml"
devel="gcc g++ make uuid-dev libboost-filesystem-dev"
packages="$devel $omni $openrtm"
u_packages="$omni $ace $openrtm "
-default_reposerver="openrtm.org"
-reposervers="openrtm.org"
+reposervers="www.openrtm.org www.openrtm.de"
reposerver=""
#---------------------------------------
@@ -79,8 +78,7 @@
done
if test "x$nearhost" = "x"; then
echo "Repository servers unreachable.", $hosts
- echo "Check your internet connection. (or are you using proxy?)"
- nearhost=$default_reposerver
+ exit 1
fi
reposerver=$nearhost
}
@@ -173,7 +171,7 @@
uninstall_packages () {
for p in $*; do
echo $msg11 $p
- apt-get remove $p
+ aptitude remove $p
if test "$?" != 0; then
apt-get purge $p
fi
Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/configure.ac 2015-05-15 00:35:18 UTC (rev 2609)
@@ -23,6 +23,21 @@
AM_INIT_AUTOMAKE([dist-bzip2 tar-pax])
AM_CONFIG_HEADER([src/lib/rtm/config_rtc.h])
+if test "${libdir}" = '${exec_prefix}/lib'; then
+ case `uname -m` in
+ x86_64|ppc64|powerpc64)
+ if test -f /etc/fedora-release ; then
+ libdir='${exec_prefix}/lib64'
+ else
+ libdir='${exec_prefix}/lib/x86_64-linux-gnu'
+ fi
+ ;;
+ *)
+ libdir='${exec_prefix}/lib'
+ ;;
+ esac
+fi
+
dnl ------------------------------------------------------------
dnl Config files created at configure
dnl ------------------------------------------------------------
@@ -1590,6 +1605,7 @@
build/Makefile
packages/Makefile
packages/deb/Makefile
+ packages/deb/debian/Makefile
packages/rpm/Makefile
src/Makefile
src/lib/Makefile
Modified: trunk/OpenRTM-aist/packages/deb/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/packages/deb/Makefile.am 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/deb/Makefile.am 2015-05-15 00:35:18 UTC (rev 2609)
@@ -39,26 +39,11 @@
PKGVER=`head -n 1 changelog | sed 's/.*(\([0-9\.\-]*\).*/\1/'`
-all-local: ${EXTRA_DIST} files
+all-local: ${EXTRA_DIST}
sh dpkg_build.sh
-files: changelog
- echo "openrtm-aist_"${PKGVER}"_amd64.deb main extra" > files
- echo "openrtm-aist-dev_"${PKGVER}"_amd64.deb main extra" >> files
- echo "openrtm-aist-example_"${PKGVER}"_amd64.deb main extra" >> files
- echo "openrtm-aist-doc_"${PKGVER}"_all.deb main extra" >> files
-
clean-local:
rm -f *~
- rm -f files
-EXTRA_DIST = \
- README.Debian \
- changelog \
- compat \
- control \
- copyright \
- dirs \
- docs \
- rules \
- dpkg_build.sh
+EXTRA_DIST = dpkg_build.sh
+DIST_SUBDIRS = debian
Deleted: trunk/OpenRTM-aist/packages/deb/README.Debian
===================================================================
--- trunk/OpenRTM-aist/packages/deb/README.Debian 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/deb/README.Debian 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,28 +0,0 @@
-openrtm-aist for Debian
------------------------
-Debian package of OpenRTM-aist
-
-OpenRTM-aist supports Debian and Ubuntu distribution.
-
-OpenRTM-aist official deb packages might be provided for the newest
-and former major releases of Debian under the following URL. For the
-Ubuntu distribution, deb packages might be provided for desktop
-versions of officially supported Ubuntu.
-
-- Debian package repository
-http://www.openrtm.org/pub/Linux/debian/
-
-- Ubuntu package repository
-http://www.openrtm.org/pub/Linux/ubuntu/
-
-The easyest way to install OpenRTM-aist to your Debian/Ubuntu systems
-is to download installation shell script from the following URL.
-
-- Ubuntu installation script: pkg_install100_ubuntu.sh
-- Debian installation script: pkg_install100_debian.sh
-http://openrtm.org/svnroot/OpenRTM-aist/trunk/OpenRTM-aist/build/
-
-For more details about OpenRTM-aist please visit the official site.
-http://www.openrtm.org
-
- -- Noriaki Ando <n-ando at aist.go.jp> Mon, 23 Jun 2008 16:18:55 +0900
Deleted: trunk/OpenRTM-aist/packages/deb/changelog
===================================================================
--- trunk/OpenRTM-aist/packages/deb/changelog 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/deb/changelog 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,29 +0,0 @@
-openrtm-aist (1.1.0-0) experimental; urgency=low
-
- * 1.1.0-0 (1.1.0-RELEASE). OpenRTM-aist-1.1.0-RELEASE
-
- -- Noriaki Ando <n-ando at aist.go.jp> Thu, 28 May 2010 16:58:44 +0900
-
-openrtm-aist (1.0.0-2) unstable; urgency=low
-
- * 1.0.0-2 (1.0.0-RELEASE). A bug (rtcprof not included) has been fixed.
-
- -- Noriaki Ando <n-ando at aist.go.jp> Thu, 28 May 2010 16:58:44 +0900
-
-openrtm-aist (1.0.0-1) unstable; urgency=low
-
- * 1.0.0-1 (1.0.0-RELEASE).
-
- -- Noriaki Ando <n-ando at aist.go.jp> Thu, 28 May 2010 16:58:44 +0900
-
-openrtm-aist (1.0.0-0) unstable; urgency=low
-
- * 1.0.0-0 (1.0.0-RC1).
-
- -- Noriaki Ando <n-ando at aist.go.jp> Thu, 28 May 2009 11:58:55 +0900
-
-openrtm-aist (0.4.2-0) unstable; urgency=low
-
- * Initial release.
-
- -- Noriaki Ando <n-ando at aist.go.jp> Mon, 23 Jun 2008 16:18:55 +0900
Deleted: trunk/OpenRTM-aist/packages/deb/compat
===================================================================
--- trunk/OpenRTM-aist/packages/deb/compat 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/deb/compat 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1 +0,0 @@
-4
Deleted: trunk/OpenRTM-aist/packages/deb/control
===================================================================
--- trunk/OpenRTM-aist/packages/deb/control 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/deb/control 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: main
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl4, omniorb4-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- 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 Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Copied: trunk/OpenRTM-aist/packages/deb/control.1 (from rev 2373, branches/RELENG_1_1/OpenRTM-aist/packages/deb/control.1)
===================================================================
--- trunk/OpenRTM-aist/packages/deb/control.1 (rev 0)
+++ trunk/OpenRTM-aist/packages/deb/control.1 2015-05-15 00:35:18 UTC (rev 2609)
@@ -0,0 +1,39 @@
+Source: openrtm-aist
+Section: main
+Priority: extra
+Maintainer: Noriaki Ando <n-ando at aist.go.jp>
+Build-Depends: debhelper, libomniorb4-dev, omniidl, omniorb-nameserver, python, uuid-dev
+Standards-Version: 3.8.4
+Homepage: http://www.openrtm.org
+
+Package: openrtm-aist
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenRTM-aist, RT-Middleware distributed by AIST
+ 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 Intelligent
+ Systems Research Institute, National Institute of Advanced Industrial
+ Science and Technology (AIST), Japan.
+ Please see http://www.openrtm.org/ for more detail.
+
+Package: openrtm-aist-dev
+Architecture: any
+Depends: openrtm-aist
+Description: OpenRTM-aist headers for development
+ The header files and libraries needed for developing programs using
+ OpenRTM-aist.
+
+Package: openrtm-aist-example
+Architecture: any
+Depends: openrtm-aist
+Description: OpenRTM-aist examples
+ Example components and sources
+
+Package: openrtm-aist-doc
+Architecture: all
+Description: Documentation for openrtm-aist
+ Developer documentation.
Deleted: trunk/OpenRTM-aist/packages/deb/copyright
===================================================================
--- trunk/OpenRTM-aist/packages/deb/copyright 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/deb/copyright 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,35 +0,0 @@
-This package was debianized by Noriaki Ando <n-ando at aist.go.jp> on
-Mon, 23 Jun 2008 16:18:55 +0900.
-
-It was downloaded from http://www.openrtm.org
-
-Upstream Author(s):
-
- Noriaki Ando <n-ando at aist.go.jp>
-
-Copyright:
-
- Copyright (C) 2003-2011
- Noriaki Ando and the OpenRTM-aist Project team
- Intelligent Systems Research Institute,
- National Institute of Advanced Industrial Science and Technology (AIST),
- Tsukuba, Japan, All rights reserved.
-
-License:
-
- The OpenRTM-aist is the dual-licensed open source software. You can
- use, copy, distribute and/or modify this library under the terms and
- conditions of either of the licenses below.
-
- 1) LGPL (GNU Lesser General Public License - v 2.1)
- See COPYING.LIB.
-
- 2) Individual Licnese
- You can purchase license from AIST and/or AIST's TLO to copy,
- distribute, modify and/or sublicense the library without any
- limitation in the terms of LGPL. The individual license should be
- concluded with a negotiated agreement between you and AIST and/or AIST
- TLO. To conclude individual license, contact the person responsible of
- AIST.
-
-
Modified: trunk/OpenRTM-aist/packages/deb/debian/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/Makefile.am 2012-07-06 17:17:21 UTC (rev 2379)
+++ trunk/OpenRTM-aist/packages/deb/debian/Makefile.am 2015-05-15 00:35:18 UTC (rev 2609)
@@ -17,12 +17,9 @@
changelog.ppa \
compat \
control \
- control.lucid \
- control.marveric \
- control.natty \
- control.oneiric \
- control.precise \
+ control.not-multiarch \
copyright \
dirs \
docs \
- rules
+ rules \
+ rules.not-multiarch
Modified: trunk/OpenRTM-aist/packages/deb/debian/changelog
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog 2012-07-06 17:17:21 UTC (rev 2379)
+++ trunk/OpenRTM-aist/packages/deb/debian/changelog 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,3 +1,9 @@
+openrtm-aist (1.1.1-0) experimental; urgency=low
+
+ * 1.1.1-0 (1.1.1-RELEASE). OpenRTM-aist-1.1.1-RELEASE
+
+ -- Noriaki Ando <n-ando at aist.go.jp> Fri, 31 Oct 2014 13:12:50 +0900
+
openrtm-aist (1.1.0-0) experimental; urgency=low
* 1.1.0-0 (1.1.0-RELEASE). OpenRTM-aist-1.1.0-RELEASE
Modified: trunk/OpenRTM-aist/packages/deb/debian/compat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/compat 2012-07-06 17:17:21 UTC (rev 2379)
+++ trunk/OpenRTM-aist/packages/deb/debian/compat 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1 +1 @@
-7
+9
Modified: trunk/OpenRTM-aist/packages/deb/debian/control
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control 2012-07-06 17:17:21 UTC (rev 2379)
+++ trunk/OpenRTM-aist/packages/deb/debian/control 2015-05-15 00:35:18 UTC (rev 2609)
@@ -2,13 +2,15 @@
Section: science
Priority: extra
Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl4, omniorb4-nameserver, python, uuid-dev
+Build-Depends: debhelper (>= 9), libomniorb4-dev, omniidl, omniorb-nameserver, python, uuid-dev
Standards-Version: 3.8.4
Homepage: http://www.openrtm.org
Package: openrtm-aist
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, omniorb-nameserver
Description: OpenRTM-aist, RT-Middleware distributed by AIST
OpenRTM-aist is a reference implementation of RTC (Robotic Technology
Component) specification which is OMG standard. OpenRTM-aist includes
@@ -22,6 +24,7 @@
Package: openrtm-aist-dev
Architecture: any
+Multi-Arch: same
Depends: openrtm-aist
Description: OpenRTM-aist headers for development
The header files and libraries needed for developing programs using
@@ -29,6 +32,7 @@
Package: openrtm-aist-example
Architecture: any
+Multi-Arch: same
Depends: openrtm-aist
Description: OpenRTM-aist examples
Example components and sources
Deleted: trunk/OpenRTM-aist/packages/deb/debian/control.lucid
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.lucid 2012-07-06 17:17:21 UTC (rev 2379)
+++ trunk/OpenRTM-aist/packages/deb/debian/control.lucid 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl4, omniorb4-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- 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 Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Deleted: trunk/OpenRTM-aist/packages/deb/debian/control.marveric
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.marveric 2012-07-06 17:17:21 UTC (rev 2379)
+++ trunk/OpenRTM-aist/packages/deb/debian/control.marveric 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl4, omniorb4-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- 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 Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Deleted: trunk/OpenRTM-aist/packages/deb/debian/control.natty
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.natty 2012-07-06 17:17:21 UTC (rev 2379)
+++ trunk/OpenRTM-aist/packages/deb/debian/control.natty 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl, omniorb-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- 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 Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Copied: trunk/OpenRTM-aist/packages/deb/debian/control.not-multiarch (from rev 2598, branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch)
===================================================================
--- trunk/OpenRTM-aist/packages/deb/debian/control.not-multiarch (rev 0)
+++ trunk/OpenRTM-aist/packages/deb/debian/control.not-multiarch 2015-05-15 00:35:18 UTC (rev 2609)
@@ -0,0 +1,39 @@
+Source: openrtm-aist
+Section: science
+Priority: extra
+Maintainer: Noriaki Ando <n-ando at aist.go.jp>
+Build-Depends: debhelper, libomniorb4-dev, omniidl4 | omniidl, omniorb4-nameserver | omniorb-nameserver, python, uuid-dev
+Standards-Version: 3.8.4
+Homepage: http://www.openrtm.org
+
+Package: openrtm-aist
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, omniorb-nameserver
+Description: OpenRTM-aist, RT-Middleware distributed by AIST
+ 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 Intelligent
+ Systems Research Institute, National Institute of Advanced Industrial
+ Science and Technology (AIST), Japan.
+ Please see http://www.openrtm.org/ for more detail.
+
+Package: openrtm-aist-dev
+Architecture: any
+Depends: openrtm-aist
+Description: OpenRTM-aist headers for development
+ The header files and libraries needed for developing programs using
+ OpenRTM-aist.
+
+Package: openrtm-aist-example
+Architecture: any
+Depends: openrtm-aist
+Description: OpenRTM-aist examples
+ Example components and sources
+
+Package: openrtm-aist-doc
+Architecture: all
+Description: Documentation for openrtm-aist
+ Developer documentation.
Deleted: trunk/OpenRTM-aist/packages/deb/debian/control.oneiric
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.oneiric 2012-07-06 17:17:21 UTC (rev 2379)
+++ trunk/OpenRTM-aist/packages/deb/debian/control.oneiric 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl, omniorb-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- 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 Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Deleted: trunk/OpenRTM-aist/packages/deb/debian/control.precise
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.precise 2012-07-06 17:17:21 UTC (rev 2379)
+++ trunk/OpenRTM-aist/packages/deb/debian/control.precise 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,39 +0,0 @@
-Source: openrtm-aist
-Section: science
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, libomniorb4-dev, omniidl, omniorb-nameserver, python, uuid-dev
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist, RT-Middleware distributed by AIST
- 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 Intelligent
- Systems Research Institute, National Institute of Advanced Industrial
- Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/ for more detail.
-
-Package: openrtm-aist-dev
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist headers for development
- The header files and libraries needed for developing programs using
- OpenRTM-aist.
-
-Package: openrtm-aist-example
-Architecture: any
-Depends: openrtm-aist
-Description: OpenRTM-aist examples
- Example components and sources
-
-Package: openrtm-aist-doc
-Architecture: all
-Description: Documentation for openrtm-aist
- Developer documentation.
Modified: trunk/OpenRTM-aist/packages/deb/debian/rules
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules 2012-07-06 17:17:21 UTC (rev 2379)
+++ trunk/OpenRTM-aist/packages/deb/debian/rules 2015-05-15 00:35:18 UTC (rev 2609)
@@ -21,6 +21,8 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# Multiarch support
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
CFLAGS = -Wall -g
@@ -39,7 +41,7 @@
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
#Architecture
@@ -116,12 +118,10 @@
# for openrtm-aist-example package
#$(MAKE)
- (mkdir $(CURDIR)/debian/openrtm-aist-example/usr/)
- (ln -s $(CURDIR)/debian/openrtm-aist/usr/lib $(CURDIR)/debian/openrtm-aist-example/usr/)
- (ln -s $(CURDIR)/debian/openrtm-aist/usr/lib64 $(CURDIR)/debian/openrtm-aist-example/usr/)
+ (mkdir -p $(CURDIR)/debian/openrtm-aist-example/usr/lib)
+ (ln -s $(CURDIR)/debian/openrtm-aist/usr/lib/$(DEB_HOST_MULTIARCH) $(CURDIR)/debian/openrtm-aist-example/usr/lib)
(cd $(CURDIR)/examples ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-example install)
- (rm $(CURDIR)/debian/openrtm-aist-example/usr/lib)
- (rm $(CURDIR)/debian/openrtm-aist-example/usr/lib64)
+ (rm -r $(CURDIR)/debian/openrtm-aist-example/usr/lib)
dh_install -s
# Must not depend on anything. This is to be called by
Copied: trunk/OpenRTM-aist/packages/deb/debian/rules.not-multiarch (from rev 2598, branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/rules.not-multiarch)
===================================================================
--- trunk/OpenRTM-aist/packages/deb/debian/rules.not-multiarch (rev 0)
+++ trunk/OpenRTM-aist/packages/deb/debian/rules.not-multiarch 2015-05-15 00:35:18 UTC (rev 2609)
@@ -0,0 +1,165 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+config.status: configure
+ dh_testdir
+ # Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --libdir=\$${prefix}/lib-arch
+
+
+#Architecture
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: config.status
+
+ # Add here commands to compile the arch part of the package.
+ #$(MAKE)
+ touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: config.status
+
+ # Add here commands to compile the indep part of the package.
+ #$(MAKE) doc
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+
+ # Add here commands to clean up after the build process.
+ # -$(MAKE) distclean
+ #rm -f config.sub config.guess
+
+ dh_clean
+
+install: install-indep install-arch
+install-indep:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+
+ # Add here commands to install the indep part of the package into
+ # debian/<package>-doc.
+ #INSTALLDOC#
+ # for openrtm-aist-doc package
+ (cd $(CURDIR)/docs ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-doc install)
+
+ dh_install -i
+
+install-arch:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -s
+ dh_installdirs -s
+
+ # Add here commands to install the arch part of the package into
+ # debian/tmp.
+ $(MAKE)
+
+ # for openrtm-aist package
+ (cd $(CURDIR)/src/lib/coil/posix ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install-exec)
+ (cd $(CURDIR)/src/lib/rtm ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install-exec)
+ (cd $(CURDIR)/etc ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install-exec)
+ (cd $(CURDIR)/utils/rtcd ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
+ (cd $(CURDIR)/utils/rtcprof ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
+ (cd $(CURDIR)/utils/rtm-naming ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
+ (cd $(CURDIR)/utils/rtm-config ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
+ (cd $(CURDIR)/src/ext ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
+
+ # for openrtm-dev package
+ #$(MAKE)
+ (cd $(CURDIR)/src/lib/rtm ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install-data-recursive)
+ (cd $(CURDIR)/src/lib/coil ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install-data)
+ (cd $(CURDIR)/utils/rtc-template ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
+ (cd $(CURDIR)/utils/rtm-skelwrapper ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
+ (cd $(CURDIR)/utils/cmake ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
+ (cd $(CURDIR)/src/lib/coil/utils/coil-config ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
+
+ # for openrtm-aist-example package
+ #$(MAKE)
+ (mkdir -p $(CURDIR)/debian/openrtm-aist-example/usr)
+ (ln -s $(CURDIR)/debian/openrtm-aist/usr/lib-arch $(CURDIR)/debian/openrtm-aist-example/usr)
+ (cd $(CURDIR)/examples ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-example install)
+ (rm -r $(CURDIR)/debian/openrtm-aist-example/usr/lib-arch)
+
+ dh_install -s
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_python
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
+
Deleted: trunk/OpenRTM-aist/packages/deb/dirs
===================================================================
--- trunk/OpenRTM-aist/packages/deb/dirs 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/deb/dirs 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
Deleted: trunk/OpenRTM-aist/packages/deb/docs
===================================================================
--- trunk/OpenRTM-aist/packages/deb/docs 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/deb/docs 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,3 +0,0 @@
-NEWS
-README
-README.jp
Modified: trunk/OpenRTM-aist/packages/deb/dpkg_build.sh
===================================================================
--- trunk/OpenRTM-aist/packages/deb/dpkg_build.sh 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/deb/dpkg_build.sh 2015-05-15 00:35:18 UTC (rev 2609)
@@ -39,6 +39,29 @@
dist_name=""
dist_key=""
+
+# not support multiarch
+not_multiarch_cnmaes="lucid marveric squeeze natty oneiric"
+
+#---------------------------------------
+# Debianコードネーム取得
+#---------------------------------------
+check_codename ()
+{
+ cnames="sarge etch lenny squeeze wheezy"
+ for c in $cnames; do
+ if test -f "/etc/apt/sources.list"; then
+ res=`grep $c /etc/apt/sources.list`
+ else
+ echo "This distribution may not be debian/ubuntu."
+ exit
+ fi
+ if test ! "x$res" = "x" ; then
+ DISTRIB_CODENAME=$c
+ fi
+ done
+}
+
# Check the lsb distribution name
if test -f /etc/lsb-release ; then
. /etc/lsb-release
@@ -56,6 +79,7 @@
if test "x$dist_name" = "x" && test -f /etc/debian_version ; then
dist_name="Debian"`cat /etc/debian_version`-`uname -m`
dist_key="Debian"
+ check_codename
fi
# Check the Vine version
if test "x$dist_name" = "x" && test -f /etc/vine-release ; then
@@ -86,36 +110,55 @@
#------------------------------------------------------------
# create "files" file
#------------------------------------------------------------
-if test ! -f "files" ; then
- PKGVER=`head -n 1 changelog | sed 's/.*(\([0-9\.\-]*\).*/\1/'`
- echo "openrtm-aist_"${PKGVER}"_amd64.deb main extra" > files
- echo "openrtm-aist-dev_"${PKGVER}"_amd64.deb main extra" >> files
- echo "openrtm-aist-example_"${PKGVER}"_amd64.deb main extra" >> files
- echo "openrtm-aist-doc_"${PKGVER}"_all.deb main extra" >> files
-fi
+#if test ! -f "files" ; then
+# PKGVER=`head -n 1 changelog | sed 's/.*(\([0-9\.\-]*\).*/\1/'`
+# echo "openrtm-aist_"${PKGVER}"_amd64.deb main extra" > files
+# echo "openrtm-aist-dev_"${PKGVER}"_amd64.deb main extra" >> files
+# echo "openrtm-aist-example_"${PKGVER}"_amd64.deb main extra" >> files
+# echo "openrtm-aist-doc_"${PKGVER}"_all.deb main extra" >> files
+#fi
#------------------------------------------------------------
# package build process
#------------------------------------------------------------
packagedir=`pwd`/../../
-mkdir $packagedir/debian
-
rm -f $packagedir/packages/openrtm-aist*
-cp README.Debian $packagedir/debian/
-cp changelog $packagedir/debian/
-cp compat $packagedir/debian/
-cp control $packagedir/debian/
-cp copyright $packagedir/debian/
-cp dirs $packagedir/debian/
-cp docs $packagedir/debian/
-cp files $packagedir/debian/
-chmod 444 $packagedir/debian/files
-cp rules $packagedir/debian/
+cp -r debian $packagedir
+
+# check multiarch support
+multiarch_flg="OFF"
+if test "x$dist_key" = "xDebian" || test "x$dist_key" = "xUbuntu" ; then
+ for c in $not_multiarch_cnmaes; do
+ if test $DISTRIB_CODENAME = $c ; then
+ mv $packagedir/debian/compat /tmp/compat.$$
+ echo 7 > $packagedir/debian/compat
+ mv $packagedir/debian/rules /tmp/rules.$$
+ cp $packagedir/debian/rules.not-multiarch $packagedir/debian/rules
+ DEB_HOST_ARCH=`dpkg-architecture -qDEB_HOST_ARCH`
+ if test "x$DEB_HOST_ARCH" = "xamd64" ; then
+ sed -i -s 's/lib-arch/lib64/' $packagedir/debian/rules
+ else
+ sed -i -s 's/lib-arch/lib/' $packagedir/debian/rules
+ fi
+ mv $packagedir/debian/control /tmp/control.$$
+ cp $packagedir/debian/control.not-multiarch $packagedir/debian/control
+ multiarch_flg="ON"
+ echo "... Multiarch not supported."
+ break
+ fi
+ done
+fi
+
chmod 755 $packagedir/debian/rules
cd $packagedir
-
+rm -f config.status
dpkg-buildpackage -W -us -uc -rfakeroot
-mv $packagedir/../openrtm-aist* $packagedir/packages/
\ No newline at end of file
+mv $packagedir/../openrtm-aist* $packagedir/packages/
+if test "x$multiarch_flg" = "xON" ; then
+ mv /tmp/compat.$$ $packagedir/debian/compat
+ mv /tmp/rules.$$ $packagedir/debian/rules
+ mv /tmp/control.$$ $packagedir/debian/control
+fi
Deleted: trunk/OpenRTM-aist/packages/deb/dpkgbuild.sh
===================================================================
--- trunk/OpenRTM-aist/packages/deb/dpkgbuild.sh 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/deb/dpkgbuild.sh 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-export PATH=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/local/X11R6/bin:/usr/local/sbin:/usr/sbin:/sbin
-export LANG=C
-export LC_ALL=C
-
-# system information
-os=`uname -s`
-release=`uname -r`-`uname -p`
-
-dist_name=""
-dist_key=""
-# Check the lsb distribution name
-if test -f /etc/lsb-release ; then
- . /etc/lsb-release
- if test "x$DISTRIB_DESCRIPTION" != "x" ; then
- dist_name=$DISTRIB_DESCRIPTION-`uname -m`
- dist_key=$DISTRIB_ID
- fi
-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`
-fi
-#Check the Debian version
-if test "x$dist_name" = "x" && test -f /etc/debian_version ; then
- dist_name="Debian"`cat /etc/debian_version`-`uname -m`
- dist_key="Debian"
-fi
-# Check the Vine version
-if test "x$dist_name" = "x" && test -f /etc/vine-release ; then
- dist_name=`cat /etc/vine-release`-`uname -m`
- dist_key=`sed -e 's/.*\([0-9]\)\.\([0-9]\).*/vl\1\2/' /etc/vine-release`
-fi
-# Check the TuboLinux version
-if test "x$dist_name" = "x" && test -f /etc/turbolinux-release ; then
- dist_name=`cat /etc/tubolinux-release`-`uname -m`
- dist_key=""
-fi
-
-if test "x$dist_name" = "x" ; then
- dist_name=$os$release
-fi
-# Check the RedHat/Fedora version
-if test "x$dist_name" = "x" && test -f /etc/redhat-release ; then
- dist_name=`cat /etc/redhat-release`-`uname -m`
-fi
-
-# only fedora and vine
-if test ! "x$dist_key" = "xDebian" -a ! "x$dist_key" = "xUbuntu" ; then
- echo $dist_key
- echo "This is not debian/ubuntu"
- exit 0
-fi
-
-#------------------------------------------------------------
-# package build process
-#------------------------------------------------------------
-$packagedir=../../
-mkdir $packagedir/debian
-
-cp README.Debian $packagedir/debian/
-cp changelog $packagedir/debian/
-cp compat $packagedir/debian/
-cp control $packagedir/debian/
-cp copyright $packagedir/debian/
-cp dirs $packagedir/debian/
-cp docs $packagedir/debian/
-cp files $packagedir/debian/
-chmod 444 $packagedir/debian/files
-cp rules $packagedir/debian/
-chmod 755 $packagedir/debian/rules
-
-cd $packagedir
-
-dpkg-buildpackage -W -us -uc -rfakeroot
Copied: trunk/OpenRTM-aist/packages/deb/ppa_tool.sh (from rev 2379, branches/RELENG_1_1/OpenRTM-aist/packages/deb/ppa_tool.sh)
===================================================================
--- trunk/OpenRTM-aist/packages/deb/ppa_tool.sh (rev 0)
+++ trunk/OpenRTM-aist/packages/deb/ppa_tool.sh 2015-05-15 00:35:18 UTC (rev 2609)
@@ -0,0 +1,359 @@
+#!/bin/sh
+#
+# @file ppa_tool.sh
+# @brief Launchpad/PPA packaging and publising tool for multiple distroseries
+# @author Noriaki Ando <n-ando at aist.go.jp>
+# @date Fri Jul 6 02:33:15 JST 2012
+#
+
+#
+# 0. Before publishing your package on the PPA, you should create
+# account on Launchpad, and register your OpenPGP key, and create
+# PPA place.
+#
+# 1. debian/changelog should have the following text in the first line
+#
+# ex. openrtm-aist (1.1.0-1~ppa1lucid) lucid; urgency=low
+# <package name> (X.Y.Z-N~ppaMxxxx) yyyyyy; urgency=zzzzz
+# ~ppa[number] should be added to normal version string of deb package.
+#
+# 2. Before making dput your package to PPA, it is recommended to make
+# source package with '-s' option and try to build it in the local
+# enviuronment.
+#
+# $ ppa_tool.sh -p password -s lucid
+# $ cd ../ ; mkdir ../tmp
+# $ tar -C ../tmp xvzf ../your_package.tar.gz
+# $ cd ../tmp/your_package ; debuild -us -uc
+#
+# 3. If your source pacakge is built without any error, now you can
+# make dput your source package to your PPA.
+#
+# $ cd -
+# $ ppa_tool.sh -p password -t ppa:your_account/ppa_place -a
+# # -a: dput your source to all current supported distro-versions
+#
+
+# Global variables:
+#
+# DEBUG:
+# Debug flag. some functions print debug messages if some value is set.
+# PASSWORD:
+# Password to unlock gpgkey. This is used when package is signed.
+# USERNAME:
+# User name to specify GPG key to sign source package.
+# GPGKEYID
+# GPG key ID to specify GPG key.
+# VERSION
+# Version number to be inserted to the package name.
+# PPAHOST
+# PPA target host name to be given to dput command.
+# TARGETS
+# A list of distroseries name.
+# SUPPORTED
+# Supported distroseries versions.
+# SUPPORTED_LIST
+# Supported distroseries versions with version numbers. Separated by comma.
+#
+
+get_distroseries()
+{
+ if ! test -f /tmp/meta-release; then
+ wget -q -O /tmp/meta-release http://changelogs.ubuntu.com/meta-release
+ fi
+ SUPPORTED=`awk 'BEGIN{RS="";FS="\n";}{if ($5 == "Supported: 1"){sub("Dist: ",""); sub(" ","",$1); printf("%s ",$1);}}END{printf("\n")}' /tmp/meta-release`
+ SUPPORTED_LIST=`awk 'BEGIN{RS="";FS="\n";}{if ($5 == "Supported: 1"){sub("Dist: ",""); sub("Version: ",""); printf("%s\t%s,",$1,$3);}}' /tmp/meta-release`
+}
+
+print_short_usage()
+{
+ get_distroseries
+ echo "\nUsage: $(basename $0) [OPTION]... [DISTROSERIES]..."
+ echo ""
+ echo "Optinos:"
+ echo " -p <password> password to unlock gpg key"
+# echo " -u <username> username for gpg key"
+# echo " -k <key ID> gpg key ID"
+ echo " -v <version> versioned package"
+ echo " -t <ppa host> target ppa host location"
+ echo " -a publish for all supported distroseries"
+ echo " [DISTROSERIES] = $SUPPORTED"
+ echo " -s only create source package in local"
+ echo " -h print this help"
+ echo ""
+}
+
+print_usage()
+{
+ print_short_usage
+ echo "Supported Distroseries:"
+ local __IFS=$IFS
+ IFS="," # SUPPORTED_LIST'S delimter is ","
+ for dist in $SUPPORTED_LIST; do
+ echo " $dist"
+ done
+ IFS=$__IFS
+ echo ""
+ echo "EXAMPLES"
+ echo " Send packages for only LTS to openrtm/releases ppa."
+ echo ""
+ echo " $(basename $0) -p hoge -t ppa:openrtm/releases hardy lucid"
+ echo ""
+ echo " Send packages for all supported versions to my_ppa. Password is"
+ echo " required to sign for each packages."
+ echo ""
+ echo " $(basename $0) -t my_ppa -a"
+ echo ""
+ echo " Only creating source package without sending it to ppa host."
+ echo ""
+ echo " $(basename $0) -t my_ppa -t "
+ echo ""
+ exit 0
+}
+
+get_opt()
+{
+ # -p <password> password to unlock gpg key
+ # -u <username> username for gpg key
+ # -k <key ID> gpg key ID
+ # -v <version> versioned package
+ #
+ PASSWORD=""
+ PPAHOST=""
+ VERSION=""
+ NO_DPUT=""
+ while getopts "p:u:k:t:v:hsa" OPT; do
+ case $OPT in
+ \?) print_short_usage; exit 1;;
+ p) PASSWORD="$OPTARG";;
+ u) USERNAME="$OPTARG";;
+ k) GPGKEYID="$OPTARG";;
+ t) PPAHOST="$OPTARG";;
+ v) VERSION="$OPTARG";;
+ s) NO_DPUT="True";;
+ a) ALLDIST="True";;
+ h) print_usage; exit 0;
+ esac
+ done
+ shift $(( $OPTIND - 1))
+ TARGETS=$@
+
+ # No distroseries without -a is not allowed
+ if test $# -eq 0; then
+ if test "x$ALLDIST" = "x"; then
+ echo "ERROR: no distroseries name specified."
+ print_short_usage
+ exit 1
+ else
+ # Getting supported distroseries
+ get_distroseries
+ TARGETS=$SUPPORTED
+ fi
+ fi
+
+ # No -t option without -s option is now allowed
+ if test "x$PPAHOST" = "x"; then
+ if test "x$NO_DPUT" = "x"; then
+ echo "ERROR: Option -t with PPA host is necessary"
+ print_short_usage
+ exit 1
+ fi
+ fi
+ # DEBUG
+ if ! test "x$DEBUG" = "x"; then
+ echo "PASSWORD: " $PASSWORD
+ echo "USERNAME: " $USERNAME
+ echo "GPGKEYID: " $GPGKEYID
+ echo "VERSION : " $VERSION
+ echo "PPAHOST : " $PPAHOST
+ echo "TARGETS : " $TARGETS
+ fi
+}
+
+get_package_name()
+{
+ if test -f debian/changelog; then
+ PACKAGE_NAME=`head -n 1 debian/changelog | awk '{print $1;}'`
+ echo "Pacakge base name is: " $PACKAGE_NAME
+ else
+ echo "ERROR: debian/changelog not found."
+ exit 1
+ fi
+}
+
+check_debiandir()
+{
+ # checking debian directory
+ if ! test -d debian ; then
+ echo "ERROR: debian directory not found"
+ echo " This directory should have debian directory"
+ echo " and control, changelog, etc in it."
+ exit -1
+ fi
+ # checking control file
+ if ! test -f debian/control; then # if control not found,
+ for d in $TARGETS; do # control.<codename> should exist
+ if $DEBUG; then
+ echo "Checking debian/control.$d"
+ fi
+ if ! test -f debian/control.$d; then
+ echo "ERROR: No control files found."
+ echo " debian dir should have at least one control file"
+ echo " or control.<release name> files."
+ exit 1
+ fi
+ done
+ else
+ echo "\ndebian/control found."
+ for d in $TARGETS; do
+ if test -f debian/control.$d; then
+ echo "debian/control.$d used for $d"
+ else
+ echo "debian/control used for $d"
+ fi
+ done
+ echo ""
+ fi
+ # checking changelog file
+ if ! test -f debian/changelog ; then
+ echo "ERROR: No changelog file found."
+ exit -1
+ fi
+}
+
+clean_source()
+{
+ if test -f "Makefile"; then
+ make clean
+ make distclean
+ fi
+}
+
+backup_debfiles()
+{
+ trap reset_debfiles 2
+ tar czf /tmp/debian.$PACKAGE_NAME.$$.tgz debian
+ echo "Backed up debian to /tmp/debian.$PACKAGE_NAME.$$.tgz"
+}
+
+
+reset_debfiles()
+{
+ if test -f /tmp/debian.$PACKAGE_NAME.$$.tgz; then
+ rm -rf debian
+ tar xzf /tmp/debian.$PACKAGE_NAME.$$.tgz
+ echo "debian directory has been restored."
+ fi
+ trap 2
+}
+
+modify_changelog()
+{
+ # modify_changelog <release name>
+ if ! test $# -eq 1; then
+ echo "Internal ERROR: modify_changelog should have one arg."
+ finalize
+ exit 1
+ fi
+ local RELEASE=$1
+ if test -f debian/changelog.ppa; then
+ cp debian/changelog.ppa debian/changelog
+ fi
+ sed -i \
+ -e "1,1 s/^\(.*~ppa[0-9]\+\)\(.*\)\().*\)$/\1${RELEASE}\3/" \
+ -e "1,1 s/^\(.*) \)\(.*\)\(;.*\)$/\1${RELEASE}\3/" \
+ debian/changelog
+ echo "debian/changelog modified."
+ echo "$(head -n 1 debian/changelog)"
+}
+
+
+modify_control()
+{
+ # modify_control <release name>
+ if ! test $# -eq 1; then
+ echo "Internal ERROR: modify_control should have one arg."
+ finalize
+ exit 1
+ fi
+ local RELEASE=$1
+ if test -f debian/control.${RELEASE}; then
+ rm debian/control
+ cp debian/control.${RELEASE} debian/control
+ echo "Using debian/control.${RELEASE}"
+ fi
+}
+
+build_and_dput()
+{
+ if test "x$PASSWORD" = "x"; then
+ debuild -i -I -S -sa > /tmp/debuild.$$.log
+ else
+ export LC_ALL=C
+ expect -c "
+ set timeout 60
+ spawn debuild -i -I -S -sa
+ expect passphrase:\ ; send \"$PASSWORD\r\"
+ expect passphrase:\ ; send \"$PASSWORD\r\"
+ interact
+ " > /tmp/debuild.$$.log
+ fi
+ # getting changes file name
+ ls -al /tmp/debuild.$$.log
+ local CHANGES="$(sed -n 's/^.*signfile \(.*\.changes\).*$/\1/p' /tmp/debuild.$$.log)"
+ if test "x$NO_DPUT" = "x"; then
+ echo -e "\nPublishing to $DPUT_TARGET with ../$CHANGES"
+ dput $PPAHOST ../$CHANGES
+ rm ../$(basename $CHANGES _source.changes)*
+ fi
+}
+
+insert_version()
+{
+ if test "x$VERSION" = "x"; then
+ return 0
+ fi
+ local ver=$VERSION
+ local pkg=$PACKAGE_NAME
+ echo "Replacing $pkg to $pkg$ver"
+ # control files
+ sed -i "s/$pkg/$pkg$ver/g" debian/control*
+ # changelog
+ sed -i "s/$pkg/$pkg$ver/g" debian/changelog
+ # rules
+ sed -i "s/debian\/$pkg/debian\/$pkg$ver/g" debian/rules
+}
+
+finalize()
+{
+ reset_debfiles
+}
+
+
+#------------------------------------------------------------
+# main
+#------------------------------------------------------------
+# checking and getting options
+if test $# -eq 0 ; then
+ print_usage
+ exit -1
+fi
+get_opt $@
+
+# getting package name and checking debian directory and files
+check_debiandir
+get_package_name
+
+# backup debian directory
+
+for RELNAME in $TARGETS; do
+ backup_debfiles
+ clean_source
+ modify_changelog $RELNAME
+ modify_control $RELNAME
+ insert_version
+ build_and_dput
+ reset_debfiles
+done
+
+exit 0
Deleted: trunk/OpenRTM-aist/packages/deb/rules
===================================================================
--- trunk/OpenRTM-aist/packages/deb/rules 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/deb/rules 2015-05-15 00:35:18 UTC (rev 2609)
@@ -1,168 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-#Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: config.status
-
- # Add here commands to compile the arch part of the package.
- #$(MAKE)
- touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: config.status
-
- # Add here commands to compile the indep part of the package.
- #$(MAKE) doc
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
-
- # Add here commands to clean up after the build process.
- # -$(MAKE) distclean
- #rm -f config.sub config.guess
-
- dh_clean
-
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
-
- # Add here commands to install the indep part of the package into
- # debian/<package>-doc.
- #INSTALLDOC#
- # for openrtm-aist-doc package
- (cd $(CURDIR)/docs ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-doc install)
-
- dh_install -i
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
-
- # Add here commands to install the arch part of the package into
- # debian/tmp.
- $(MAKE)
-
- # for openrtm-aist package
- (cd $(CURDIR)/src/lib/coil/posix ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install-exec)
- (cd $(CURDIR)/src/lib/rtm ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install-exec)
- (cd $(CURDIR)/etc ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install-exec)
- (cd $(CURDIR)/utils/rtcd ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
- (cd $(CURDIR)/utils/rtcprof ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
- (cd $(CURDIR)/utils/rtm-naming ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
- (cd $(CURDIR)/utils/rtm-config ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install)
- (cd $(CURDIR)/src/ext ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist install-exec)
-
- # for openrtm-dev package
- #$(MAKE)
- (cd $(CURDIR)/src/lib/rtm ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install-data-recursive)
- (cd $(CURDIR)/src/lib/coil ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install-data)
- (cd $(CURDIR)/utils/rtc-template ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
- (cd $(CURDIR)/utils/rtm-skelwrapper ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
- (cd $(CURDIR)/utils/cmake ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
- (cd $(CURDIR)/src/lib/coil/utils/coil-config ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-dev install)
-
- # for openrtm-aist-example package
- #$(MAKE)
- (mkdir $(CURDIR)/debian/openrtm-aist-example/usr/)
- (ln -s $(CURDIR)/debian/openrtm-aist/usr/lib $(CURDIR)/debian/openrtm-aist-example/usr/)
- (ln -s $(CURDIR)/debian/openrtm-aist/usr/lib64 $(CURDIR)/debian/openrtm-aist-example/usr/)
- (cd $(CURDIR)/examples ; $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-example install)
- (rm $(CURDIR)/debian/openrtm-aist-example/usr/lib)
- (rm $(CURDIR)/debian/openrtm-aist-example/usr/lib64)
-
- dh_install -s
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
-
Modified: trunk/OpenRTM-aist/packages/rpm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/packages/rpm/Makefile.am 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/rpm/Makefile.am 2015-05-15 00:35:18 UTC (rev 2609)
@@ -27,7 +27,6 @@
echo "%define distname $(dist_key)" >> $@
echo "%define rtm_includedir $(rtm_includedir)" >> $@
echo "%define coil_includedir $(coil_includedir)" >> $@
- echo "%define rtm_libdir $(rtm_libdir)" >> $@
echo "%define rtm_datadir $(rtm_datadir)" >> $@
cat OpenRTM-aist.spec.in >> $@
Modified: trunk/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in
===================================================================
--- trunk/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in 2015-05-15 00:35:18 UTC (rev 2609)
@@ -11,6 +11,7 @@
%define pkgver 0
%define _unpackaged_files_terminate_build 1
%define __os_install_post %{nil}
+%define rtm_libdir %{_libdir}/openrtm-%{shortversion}
#------------------------------------------------------------
# Package information
@@ -78,7 +79,7 @@
#------------------------------------------------------------
# build section
%build
-%configure --prefix=/usr
+%configure --prefix=/usr CFLAGS="-O2 -g" CXXFLAGS="-O2 -g"
%{__make}
#------------------------------------------------------------
Modified: trunk/OpenRTM-aist/packages/rpm/rpm_build.sh.in
===================================================================
--- trunk/OpenRTM-aist/packages/rpm/rpm_build.sh.in 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/packages/rpm/rpm_build.sh.in 2015-05-15 00:35:18 UTC (rev 2609)
@@ -94,4 +94,6 @@
# We have already extracted source under BUILD directory.
# %prep process can be skiped. = --short-circuit -bc
rpm_def="_topdir $builddir"
-rpmbuild --define "$rpm_def" -ba OpenRTM-aist.spec
+rpmbuild --target `uname -i` --define "$rpm_def" -ba OpenRTM-aist.spec
+cd ..
+rm $packagename
Property changes on: trunk/OpenRTM-aist/src/ext
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_1/OpenRTM-aist/src/ext:2126-2150,2178
+ /branches/RELENG_1_1/OpenRTM-aist/src/ext:2126-2150,2178,2377-2379,2388,2520,2541,2588,2590-2591,2597-2598,2601,2603
Modified: trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am 2015-05-15 00:35:18 UTC (rev 2609)
@@ -20,8 +20,9 @@
RTPreemptEC_la_LDFLAGS = -module -shared
RTPreemptEC_la_FLAGS = -L$(top_builddir)/src/lib/rtm/.lib
RTPreemptEC_la_LIBADD = \
+ -lrt \
$(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
clean-local:
- rm -rf *~ *.o *.so
\ No newline at end of file
+ rm -rf *~ *.o *.so
Modified: trunk/OpenRTM-aist/src/lib/coil/configure.ac
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/configure.ac 2015-04-30 06:40:51 UTC (rev 2608)
+++ trunk/OpenRTM-aist/src/lib/coil/configure.ac 2015-05-15 00:35:18 UTC (rev 2609)
@@ -24,6 +24,21 @@
AM_CONFIG_HEADER([include/coil/config_coil.h])
AC_CONFIG_FILES([utils/coil-config/libcoil.pc:utils/coil-config/libcoil.pc.in])
+if test "${libdir}" = '${exec_prefix}/lib'; then
+ case `uname -m` in
+ x86_64|ppc64|powerpc64)
+ if test -f /etc/fedora-release ; then
+ libdir='${exec_prefix}/lib64'
+ else
+ libdir='${exec_prefix}/lib/x86_64-linux-gnu'
+ fi
+ ;;
+ *)
+ libdir='${exec_prefix}/lib'
+ ;;
+ esac
+fi
+
dnl ------------------------------------------------------------
dnl rename config header's PACKAGE_* definition
dnl ------------------------------------------------------------
More information about the openrtm-commit
mailing list