[openrtm-commit:01092] r587 - in branches/RELENG_1_1/OpenRTM-aist-Python: . OpenRTM_aist OpenRTM_aist/examples/AutoTest packages packages/deb
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2013年 5月 17日 (金) 10:39:30 JST
Author: n-ando
Date: 2013-05-17 10:39:30 +0900 (Fri, 17 May 2013)
New Revision: 587
Added:
branches/RELENG_1_1/OpenRTM-aist-Python/packages/Makefile
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/Makefile
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/bin/
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian/
branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/
Removed:
branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST_examples.in
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/README.Debian
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/changelog
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/compat
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/control
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/copyright
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian_debcp.sh
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian_repo.sh
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/docs
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/files
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/make_package.sh
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/rules
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/ubuntu_debcp.sh
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/ubuntu_repo.sh
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/Manager.py
branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/examples/AutoTest/ConnectTest.py
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/dpkg_build.sh
branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
Log:
[merge] r570-586 merged from trunk. alart has been added to handler func in Manager.py
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
+ /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
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in 2013-05-17 01:39:30 UTC (rev 587)
@@ -2,7 +2,9 @@
include MANIFEST.in
include setup.py
include README
-recursive-include packages/deb *.sh copyright changelog rules README* control control.* files
+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 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
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST_examples.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST_examples.in 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST_examples.in 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,5 +0,0 @@
-include MANIFEST.in
-include README
-include OpenRTM_aist/__init__.py
-include setup.py
-recursive-include OpenRTM_aist/examples *.py *.pth *.conf README *.idl
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/Manager.py 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/Manager.py 2013-05-17 01:39:30 UTC (rev 587)
@@ -64,6 +64,7 @@
def handler(signum, frame):
mgr = OpenRTM_aist.Manager.instance()
mgr.terminate()
+ signal.alarm(2)
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/examples/AutoTest/ConnectTest.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/examples/AutoTest/ConnectTest.py 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/examples/AutoTest/ConnectTest.py 2013-05-17 01:39:30 UTC (rev 587)
@@ -87,7 +87,7 @@
g_conprof3 = RTC.ConnectorProfile(g_name3, g_connector_id3, [g_out_ports[g_port3], g_in_ports[g_port3]], [SDOPackage.NameValue("dataport.interface_type",any.to_any(g_interface_type3))])
##--------------------------------------------------------------------
-## 騾∝女菫｡邨先棡蛻､螳夐未騾｣
+## ‚⎢êŽÁ¼£ü¹ŽÀðݘëïô²ŽÔöÎŽ¤‚â¼¥
g_diff_send_file = "./original-data"
g_diff_recv_file = "./received-data"
g_check_message = g_diff_recv_file + " file not found."
@@ -106,7 +106,7 @@
##--------------------------------------------------------------------
## éæªë¦ªñöŽ¢ëõŽ°þ¾Ô夵åãºå¤±å⎿å㎼åãÎ妯åãÊ夣å⎤å㎫ðªŽê°š(åã®å¦¾å⎿åãÚ妾åãˆ)
##
-## (蠑墓焚)
+## (ôÀŽÊðÌŽ²)
## subscription_type : "flush", "new", "periodic"
## push_policy : "ALL", "FIFO", "SKIP", "NEW", ""
## connect_direction : 0:outport -> inport, 1:inport -> outport
@@ -138,7 +138,7 @@
##--------------------------------------------------------------------
## éæªë¦ªñöŽ¢ëõŽ°þ¾Ôç½÷èÁŽ¡åãÊ夣å⎤å㎫éé´ëÒ¦
##
-## (蠑墓焚)
+## (ôÀŽÊðÌŽ²)
## åᎪåá—
##--------------------------------------------------------------------
def delete_recv_file():
@@ -151,7 +151,7 @@
##--------------------------------------------------------------------
## éæªë¦ªñöŽ¢ëõŽ°þ¾Ô뀢ç½÷èÁŽ¡åãÊ夣å⎤å㎫åᎮåã®å¦¾å⎿ì±Èꎼƒ
##
-## (蠑墓焚)
+## (ôÀŽÊðÌŽ²)
## åᎪåá—
## (ë莻åâ´ç€Ž¤) True : 躀ï玴åà False : 躺掸€ï玴
##--------------------------------------------------------------------
Copied: branches/RELENG_1_1/OpenRTM-aist-Python/packages/Makefile (from rev 586, trunk/OpenRTM-aist-Python/packages/Makefile)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/Makefile (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/Makefile 2013-05-17 01:39:30 UTC (rev 587)
@@ -0,0 +1,9 @@
+subsystem:
+ $(MAKE) -C deb
+ $(MAKE) -C rpm
+
+clean:
+ $(MAKE) -C deb clean
+ $(MAKE) -C rpm clean
+ rm -rf *.deb *.tar.gz *.dsc *.changes
+ rm -rf *.rpm
Copied: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/Makefile (from rev 586, trunk/OpenRTM-aist-Python/packages/deb/Makefile)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/Makefile (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/Makefile 2013-05-17 01:39:30 UTC (rev 587)
@@ -0,0 +1,5 @@
+all:
+ sh dpkg_build.sh
+
+clean:
+ sh dpkg_build.sh clean
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/README.Debian
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/README.Debian 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/README.Debian 2013-05-17 01:39:30 UTC (rev 587)
@@ -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: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/changelog
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/changelog 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/changelog 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,11 +0,0 @@
-openrtm-aist-python (1.1.0-1) experimental; urgency=low
-
- * 1.1.0-1 (1.1.0-RELEASE). OpenRTM-aist-1.1.0-RELEASE
-
- -- Noriaki Ando <n-ando at aist.go.jp> Fri, 26 Apr 2013 02:00:00 +0900
-
-openrtm-aist-python (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> Fri, 26 Apr 2013 01:36:44 +0900
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/compat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/compat 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/compat 2013-05-17 01:39:30 UTC (rev 587)
@@ -1 +0,0 @@
-4
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/control
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/control 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/control 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,30 +0,0 @@
-Source: openrtm-aist-python
-Section: main
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, python, python-omniorb
-Standards-Version: 3.8.4
-Homepage: http://www.openrtm.org
-
-Package: openrtm-aist-python
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenRTM-aist is a reference implementation of RT-Middleware
- and RT-Component framework. RT-Component (RTC) is a component model
- standardized in OMG (Object Management Group) as Robotic Technology
- Component Specification 1.0 (formal/08-04-04,
- http://www.omg.org/spec/RTC/1.0). 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://openrtm.org/ for more details.
-
-Package: openrtm-aist-python-example
-Architecture: any
-Depends: openrtm-aist-python
-Description: OpenRTM-aist-Python examples
- Example components and sources
-
-Package: openrtm-aist-python-doc
-Architecture: all
-Description: Documentation for openrtm-aist-python
- Developer documentation.
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/copyright
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/copyright 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/copyright 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,35 +0,0 @@
-This package was debianized by Noriaki Ando <n-ando at aist.go.jp> on
-Fri, 26 Apr 2013 01:40: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-2013
- 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.
-
-
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian_debcp.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian_debcp.sh 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian_debcp.sh 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,101 +0,0 @@
-#!/bin/sh
-#
-# @file vine_repo
-# @brief apt-rpm repository database creation for VineLinux
-# @date $Date$
-# @author Noriaki Ando <n-ando at aist.go.jp>
-#
-# Copyright (C) 2008
-# Noriaki Ando
-# Task-intelligence Research Group,
-# Intelligent Systems Research Institute,
-# National Institute of
-# Advanced Industrial Science and Technology (AIST), Japan
-# All rights reserved.
-#
-# $Id$
-#
-
-# Base directory of repository
-basedir="/exports/pub/repository/pub/Linux/debian/dists"
-pkgdir="/usr/users/builder/PackageBuild/"
-# debian versions
-codenames="etch sarge lenny"
-# VineLinux architectures
-darchs="i386 amd64"
-
-debcode2ver () {
- case $1 in
- "sarge")
- echo "3.1"
- ;;
- "etch")
- echo "4.0"
- ;;
- "lenny")
- echo "5.0"
- ;;
- *)
- echo "unknown code name"
- exit 1
- ;;
- esac
-}
-
-debarch2arch () {
- case $1 in
- "i386")
- echo "i686"
- ;;
- "amd64")
- echo "x86_64"
- ;;
- *)
- echo "unknown arch"
- exit 1
- ;;
- esac
-}
-
-
-
-for codename in $codenames; do
- for darch in $darchs ; do
- version=`debcode2ver $codename`
- arch=`debarch2arch $darch`
-
- debs="$pkgdir/Debian$version-$arch/"
- repo="$basedir/$codename/main/binary-$darch"
-
- # ディレクトリが存在しないならスキップ
- if test ! -d $debs ; then
- echo $debs "does not exists. skiped."
- continue
- fi
-
- # ディレクトリが存在しないなら作成
- if test ! -d $repo ; then
- mkdir -p $repo
- fi
-
- echo ""
- echo "Copying debs to repository:"
- echo "dir: "$repo
-
- for deb in $debs/* ; do
- debname=`basename $deb`
- if test -f $repo/$debname ; then
- echo "$repo/$debname already exists"
- read -p "Overwrite? $rpmname [Y/n]" ow
- if test ! "$ow" = "n" ; then
- echo "copying $debname"
- cp $debs/$debname $repo
- echo "copy done"
- fi
- else
- cp $debs/$debname $repo
- echo "copy done"
- fi
- done
- done
-done
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian_repo.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian_repo.sh 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian_repo.sh 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# @file debian_repo
-# @brief apt-deb repository database creation for debian
-# @date $Date$
-# @author Noriaki Ando <n-ando at aist.go.jp>
-#
-# Copyright (C) 2008
-# Noriaki Ando
-# Task-intelligence Research Group,
-# Intelligent Systems Research Institute,
-# National Institute of
-# Advanced Industrial Science and Technology (AIST), Japan
-# All rights reserved.
-#
-# $Id$
-#
-
-# Base directory of repository
-cd /exports/pub/repository/pub/Linux/debian
-
-# debian versions
-versions="etch sarge lenny"
-
-# debian architectures
-archs="binary-i386 binary-amd64"
-
-for version in $versions; do
- for arch in $archs ; do
- debs="dists/$version/main/$arch"
- echo ""
- echo "Creating apt-dev database under:"
- echo $debs
- apt-ftparchive packages $debs | gzip -c9 > $debs/Packages.gz
- done
-# dpkg-scansources $version/main/source | gzip > $version/main/source/Sources.gz
-done
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/docs
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/docs 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/docs 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,3 +0,0 @@
-NEWS
-README
-README.jp
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/dpkg_build.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/dpkg_build.sh 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/dpkg_build.sh 2013-05-17 01:39:30 UTC (rev 587)
@@ -10,7 +10,7 @@
# - copyright
# - dirs
# - docs
-# - rules
+# - rules
#
# the following files shoud be generated at make-dist
# - files
@@ -18,7 +18,7 @@
# Package build process
#
# 1. edit "changelog" file with appropriate package version number
-# like "1.1.0-2." This version number will be used for actual
+# like "1.1.0-2." This version number will be used for actual
# deb package files.
#
# 2. Check permissions of the parent directory of distribution sourcecode
@@ -29,96 +29,158 @@
# This script do everithings.
#
-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`
+BUILD_ROOT=""
-dist_name=""
-dist_key=""
-# Check the lsb distribution name
-if test -f /etc/lsb-release ; then
+cleanup_files()
+{
+ get_version_info
+ rm -f ../openrtm-aist*.deb
+ rm -f ../openrtm-aist*.dsc
+ rm -f ../openrtm-aist*.changes
+ rm -f ../openrtm-aist*.tar.gz
+ rm -rf ${BUILD_ROOT}
+}
+
+get_opt()
+{
+ if test "x$1" = "xclean"; then
+ cleanup_files
+ exit 0
+ fi
+}
+
+check_distribution()
+{
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ fi
-if test "x$dist_name" = "x" ; then
+ 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
+ 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
+ fi
-# only fedora and vine
-if test ! "x$dist_key" = "xDebian" -a ! "x$dist_key" = "xUbuntu" ; then
+ # 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
+ fi
+ DIST_KEY=$dist_key
+ DIST_NAME=`echo $dist_name | sed 's/[ |\(|\)]//g'`
+}
-#------------------------------------------------------------
-# create "files" file
-#------------------------------------------------------------
-if test ! -f "files" ; then
- PKGVER=`head -n 1 changelog | sed 's/.*(\([0-9\.\-]*\).*/\1/'`
- echo "openrtm-aist-python_"${PKGVER}"_amd64.deb main extra" > files
- echo "openrtm-aist-python-example_"${PKGVER}"_amd64.deb main extra" >> files
- echo "openrtm-aist-python-doc_"${PKGVER}"_all.deb main extra" >> files
-fi
+get_version_info()
+{
+ VERSION=`../../setup.py --version`
+ SHORT_VERSION=`echo $VERSION | sed 's/\.[0-9]*$//'`
+ BUILD_ROOT="buildroot"
+ PKG_NAME="OpenRTM-aist-Python-${VERSION}"
+}
-#------------------------------------------------------------
-# package build process
-#------------------------------------------------------------
-packagedir=`pwd`/../../
-mkdir $packagedir/debian
+create_source_package()
+{
+ cd ../../
+ ./setup.py build
+ ./setup.py sdist
+ cd -
+}
-rm -f $packagedir/packages/openrtm-aist*
+extract_source()
+{
+ tar xvzf ../../dist/${PKG_NAME}.tar.gz
+ mv ${PKG_NAME} ${BUILD_ROOT}
+}
-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
+create_files()
+{
+ eval `dpkg-architecture`
+ ARCH=$DEB_HOST_ARCH
+cat << EOF >> debian/files
+openrtm-aist-python_1.1.0-1_$ARCH.deb main extra
+openrtm-aist-python-example_1.1.0-1_$ARCH.deb main extra
+openrtm-aist-python-doc_1.1.0-1_all.deb main extra
+EOF
+}
-cd $packagedir
+copy_control_files()
+{
+ chmod 444 debian/files
+ chmod 755 debian/rules
+ cp -r debian ${BUILD_ROOT}/
+}
-dpkg-buildpackage -W -us -uc -rfakeroot
-if test $? -ne 0; then
- echo "dpkg-build failed"
- exit -1
-fi
+build_package()
+{
+ if test ! -d ${BUILD_ROOT} ; then
+ echo "${BUILD_ROOT} not found. Aborting."
+ exit -1
+ fi
+ cd $BUILD_ROOT
+ dpkg-buildpackage -W -us -uc -rfakeroot
+ if test $? -ne 0; then
+ echo "dpkg-build failed"
+ exit -1
+ fi
+ cd -
+}
-mv $packagedir/../openrtm-aist* $packagedir/packages/
+copy_debfiles()
+{
+ mv ./openrtm-aist*.deb ..
+ mv ./openrtm-aist*.dsc ..
+ mv ./openrtm-aist*.changes ..
+ mv ./openrtm-aist*.tar.gz ..
+}
+
+#==============================
+# main
+#==============================
+get_opt $*
+
+check_distribution
+get_version_info
+
+cleanup_files
+create_source_package
+extract_source
+create_files
+copy_control_files
+
+build_package
+copy_debfiles
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/files
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/files 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/files 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,3 +0,0 @@
-openrtm-aist-python_1.1.0-0_amd64.deb main extra
-openrtm-aist-python-example_1.1.0-0_amd64.deb main extra
-openrtm-aist-python-doc_1.1.0-0_all.deb main extra
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/make_package.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/make_package.sh 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/make_package.sh 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,699 +0,0 @@
-#!/bin/sh
-
-openrtm_deb_makefile () {
-cat <<'EOF'
-# -*- Makefile -*-
-
-all: install
-install:
- python setup.py install
-EOF
-}
-
-openrtm_example_deb_makefile () {
-cat <<'EOF'
-# -*- Makefile -*-
-
-all: install
-install:
- python setup.py install
-EOF
-}
-
-openrtm_deb_makefile_py26 () {
-cat <<'EOF'
-# -*- Makefile -*-
-
-all: install
-install:
- python setup.py install --install-layout=deb
-EOF
-}
-
-openrtm_deb_readme () {
-cat <<'EOF'
-openrtm-aist for Debian
------------------------
-Debian package of OpenRTM-aist
-
- -- Noriaki Ando <n-ando at aist.go.jp> Mon, 23 Jun 2008 16:18:55 +0900
-EOF
-}
-
-openrtm_example_deb_readme () {
-cat <<'EOF'
-openrtm-aist for Debian
------------------------
-Debian package of OpenRTM-aist example
-
- -- Noriaki Ando <n-ando at aist.go.jp> Mon, 23 Jun 2008 16:18:55 +0900
-EOF
-}
-
-openrtm_deb_changelog () {
-cat <<'EOF'
-openrtm-aist-python (1.1.0-rc1) unstable; urgency=low
-
- * Initial release.
- -- Noriaki Ando <n-ando at aist.go.jp> Mon, 23 Jun 2008 16:18:55 +0900
-EOF
-}
-
-openrtm_example_deb_changelog () {
-cat <<'EOF'
-openrtm-aist-python-example (1.1.0-rc1) unstable; urgency=low
-
- * Initial release.
- -- Noriaki Ando <n-ando at aist.go.jp> Mon, 23 Jun 2008 16:18:55 +0900
-EOF
-}
-
-openrtm_deb_compat () {
-cat <<EOF
-4
-EOF
-}
-
-openrtm_deb_control () {
-cat<<'EOF'
-Source: openrtm-aist-python
-Section: main
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, python, python-omniorb
-Standards-Version: 3.7.2
-
-Package: openrtm-aist-python
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-omniorb
-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
- Task Intelligence Research Group, Intelligent Systems Research Institute,
- National Institute of Advanced Industrial Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/openrtm/ for more detail.
-
-EOF
-}
-
-openrtm_example_deb_control () {
-cat<<'EOF'
-Source: openrtm-aist-python-example
-Section: main
-Priority: extra
-Maintainer: Noriaki Ando <n-ando at aist.go.jp>
-Build-Depends: debhelper, python
-Standards-Version: 3.7.2
-
-Package: openrtm-aist-python-example
-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
- Task Intelligence Research Group, Intelligent Systems Research Institute,
- National Institute of Advanced Industrial Science and Technology (AIST), Japan.
- Please see http://www.openrtm.org/openrtm/ for more detail.
-
-EOF
-}
-
-openrtm_deb_copyright () {
-cat <<'EOF'
-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-2008
- 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-0.4 (AIST Software Distribution Number: H19PRO-693) 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)
- 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.
-
-The Debian packaging is (C) 2008, Noriaki Ando <n-ando at aist.go.jp> and
-is licensed under the LGPL, see `/usr/share/common-licenses/LGPL'.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-EOF
-}
-
-openrtm_deb_dirs () {
-cat <<EOF
-usr/bin
-usr/sbin
-EOF
-}
-
-openrtm_deb_docs () {
-cat <<EOF
-README
-EOF
-}
-
-openrtm_deb_files () {
-cat <<EOF
-openrtm-aist-python_1.1.0-rc1_i386.deb main extra
-EOF
-}
-
-openrtm_example_deb_files () {
-cat <<EOF
-openrtm-aist-python-example_1.1.0-rc1_i386.deb main extra
-EOF
-}
-
-openrtm_deb_rules () {
-cat <<'EOF'
-#!/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.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- #$(MAKE)
- #docbook-to-man debian/openrtm-aist-python.sgml > openrtm-aist-python.1
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- #$(MAKE) clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/openrtm-aist-python.
- # $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-python install
- python setup.py install --prefix=$(CURDIR)/debian/openrtm-aist-python/usr
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installchangelogs
-# dh_installdocs
- dh_installexamples
-# dh_install
-# 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
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
-EOF
-}
-
-openrtm_deb_rules_py26 () {
-cat <<'EOF'
-#!/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.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- #$(MAKE)
- #docbook-to-man debian/openrtm-aist-python.sgml > openrtm-aist-python.1
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- #$(MAKE) clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/openrtm-aist-python.
- # $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-python install
- python setup.py install --prefix=$(CURDIR)/debian/openrtm-aist-python/usr --install-layout=deb
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installchangelogs
-# dh_installdocs
- dh_installexamples
-# dh_install
-# 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
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
-EOF
-}
-
-openrtm_deb_example_rules () {
-cat <<'EOF'
-#!/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.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- #$(MAKE)
- #docbook-to-man debian/openrtm-aist-python.sgml > openrtm-aist-python.1
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- #$(MAKE) clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/openrtm-aist-python.
- # $(MAKE) DESTDIR=$(CURDIR)/debian/openrtm-aist-python install
- python setup.py install --prefix=$(CURDIR)/debian/openrtm-aist-python-example/usr
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installchangelogs
-# dh_installdocs
- dh_installexamples
-# dh_install
-# 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
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
-EOF
-}
-
-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
-
-# date
-date=`date "+%y%m%d%H%M"`
-time=/usr/bin/time
-# package location and build directory
-# package=/usr/users/builder/PackageBuild/src/OpenRTM-aist-1.1.0.tar.gz
-package=/usr/users/builder/PyPackageBuild/src/OpenRTM-aist-Python-1.1.0.tar.gz
-package_example=/usr/users/builder/PyPackageBuild/src/OpenRTM-aist-Python-example-1.1.0.tar.gz
-packagedir=openrtm-aist-python-1.1.0
-packagedir_example=openrtm-aist-python-example-1.1.0
-decomp_packagedir=OpenRTM-aist-Python-1.1.0
-decomp_example_packagedir=OpenRTM-aist-Python-example-1.1.0
-package_date=`ls -al $package | awk '{printf("%s/%s %s\n",$6,$7,$8);}'`
-package_date=`diff -ac $package /dev/null | head -1 |awk '{print $3,$4,$5,$6,$7,$8;}'`
-package_name=`basename $package`
-python_ver=`python -V 3>&1 > /dev/null 2>&3| sed -e's/Python //'`
-echo "python version" $python_ver
-py_major=`echo $python_ver | cut -f1 -d'.'`
-py_minor=`echo $python_ver | cut -f2 -d'.'`
-py_release=`echo $python_ver | cut -f3 -d'.'`
-echo "py_major" $py_major
-echo "py_minor" $py_minor
-echo "py_release" $py_release
-
-python_version=""
-
-if test $py_major -ge 2; then
- if test $py_minor -ge 6; then
- python_version="python26"
- fi
-fi
-
-# buildroot=/usr/users/builder/PackageBuild
-buildroot=/usr/users/builder/PyPackageBuild
-
-logheader="<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\"><html><body><pre>"
-logfooter="</pre></body></html>"
-
-# system information
-hostname=`hostname`
-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
-
-echo $dist_key
-
-distname=`echo $dist_name | sed 's/[ |\(|\)]//g'`
-# system dependent build directory and log file name
-builddir=$buildroot/$distname
-timestamp=$buildroot/.$distname
-logfile=$distname-Python$date.log
-
-build=""
-echo $dist_key
-# check package
-if test -f $package ; then
- echo "Package found: " $package
-else
- echo "Package not found: " $pacakge
- exit 1
-fi
-cd $buildroot
-
-# check if package is new
-if test -f $timestamp ; then
- if test $package -nt $timestamp ; then
- build=yes
- echo "New source file was found."
- touch $timestamp
- fi
-else
- echo "Timestamp not found."
- touch $timestamp
- build=yes
-fi
-
-if test "x$build" = "x" ; then
- echo "No new package."
- exit 1
-fi
-
-# cleanup
-echo "cleanup " $builddir/$packagedir
-rm -rf $builddir
-
-mkdir -p $builddir
-cd $builddir
-
-echo "distribution: " $dist_name >> $buildroot/$logfile
-echo "package: $package_date " >> $buildroot/$logfile
-
-
-#------------------------------------------------------------
-# package build process
-#------------------------------------------------------------
-echo $logheader > $buildroot/make-$logfile
-
-tar xvzf $package
-mv $decomp_packagedir $packagedir
-mkdir $packagedir/debian
-echo "packagedir " $packagedir
-tar xvzf $package_example
-mv $decomp_example_packagedir $packagedir_example
-mkdir $packagedir_example/debian
-echo "packagedir_example " $packagedir_example
-
-if test "x$python_version" = "x" ; then
- openrtm_deb_makefile > $packagedir/Makefile
-else
- openrtm_deb_makefile_py26 > $packagedir/Makefile
-fi
-#openrtm_deb_readme > $packagedir/debian/README.Debian
-openrtm_deb_changelog > $packagedir/debian/changelog
-openrtm_deb_compat > $packagedir/debian/compat
-openrtm_deb_control > $packagedir/debian/control
-openrtm_deb_copyright > $packagedir/debian/copyright
-openrtm_deb_dirs > $packagedir/debian/dirs
-openrtm_deb_docs > $packagedir/debian/docs
-openrtm_deb_files > $packagedir/debian/files
-chmod 444 $packagedir/debian/files
-if test "x$python_version" = "x" ; then
- openrtm_deb_rules > $packagedir/debian/rules
-else
- openrtm_deb_rules_py26 > $packagedir/debian/rules
-fi
-chmod 755 $packagedir/debian/rules
-
-#for example
-openrtm_example_deb_makefile > $packagedir_example/Makefile
-openrtm_example_deb_changelog > $packagedir_example/debian/changelog
-openrtm_deb_compat > $packagedir_example/debian/compat
-openrtm_example_deb_control > $packagedir_example/debian/control
-openrtm_deb_copyright > $packagedir_example/debian/copyright
-openrtm_deb_dirs > $packagedir_example/debian/dirs
-openrtm_deb_docs > $packagedir_example/debian/docs
-openrtm_example_deb_files > $packagedir_example/debian/files
-chmod 444 $packagedir_example/debian/files
-openrtm_deb_example_rules > $packagedir_example/debian/rules
-chmod 755 $packagedir_example/debian/rules
-
-cd $packagedir
-
-if $time -p -o make_time-$logfile dpkg-buildpackage -us -uc -rfakeroot >> $buildroot/make-$logfile 2>&1 ; then
- cd ../
- cd $packagedir_example
- if $time -p -o make_time-$logfile dpkg-buildpackage -us -uc -rfakeroot >> $buildroot/make-$logfile 2>&1 ; then
- echo $logfooter >> $buildroot/make-$logfile
- make_time=`awk '/real/{printf("%s[s] ", $0);}' make_time-$logfile`
- echo "make: OK" >> $buildroot/$logfile
- echo "make_time: $make_time" >> $buildroot/$logfile
- rm -f make_time-$logfile
-
- else
- echo "make: NG" >> $buildroot/$logfile
- rm -f make_time-$logfile
- exit 1
- fi
-else
- echo "make: NG" >> $buildroot/$logfile
- rm -f make_time-$logfile
- exit 1
-fi
-
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/rules
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/rules 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/rules 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,87 +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.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
- python setup.py build
-
-build-stamp: configure-stamp
- dh_testdir
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- python setup.py clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # installing core
- python setup.py install_core --prefix=$(CURDIR)/debian/openrtm-aist-python/usr
- # installing examples
- (mkdir $(CURDIR)/debian/openrtm-aist-python-example/usr/)
- python setup.py install_example --install-dir=$(CURDIR)/debian/openrtm-aist-python-example/usr/
- # installing examples
- (mkdir $(CURDIR)/debian/openrtm-aist-python-doc/usr/)
- python setup.py install_doc --install-dir=$(CURDIR)/debian/openrtm-aist-python-doc/usr/
- dh_install -s
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installchangelogs
-# dh_installdocs
- dh_installexamples
-# dh_install
-# 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
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/ubuntu_debcp.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/ubuntu_debcp.sh 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/ubuntu_debcp.sh 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,120 +0,0 @@
-#!/bin/sh
-#
-# @file vine_repo
-# @brief apt-rpm repository database creation for VineLinux
-# @date $Date$
-# @author Noriaki Ando <n-ando at aist.go.jp>
-#
-# Copyright (C) 2008
-# Noriaki Ando
-# Task-intelligence Research Group,
-# Intelligent Systems Research Institute,
-# National Institute of
-# Advanced Industrial Science and Technology (AIST), Japan
-# All rights reserved.
-#
-# $Id$
-#
-
-# Base directory of repository
-basedir="/exports/pub/repository/pub/Linux/ubuntu/dists"
-pkgdir="/usr/users/builder/PackageBuild/"
-# debian versions
-codenames="edgy feisty gutsy hardy intrepid jaunty karmic lucid"
-codenames="lucid maverick"
-# VineLinux architectures
-darchs="i386 amd64"
-
-debcode2ver () {
- case $1 in
- "edgy")
- echo "6.10"
- ;;
- "feisty")
- echo "7.04"
- ;;
- "gutsy")
- echo "7.10"
- ;;
- "hardy")
- echo "8.04"
- ;;
- "intrepid")
- echo "8.10"
- ;;
- "jaunty")
- echo "9.04"
- ;;
- "karmic")
- echo "9.10"
- ;;
- "lucid")
- echo "10.04LTS"
- ;;
- "maverick")
- echo "10.10"
- ;;
- *)
- echo "unknown code name"
- exit 1
- ;;
- esac
-}
-
-debarch2arch () {
- case $1 in
- "i386")
- echo "i686"
- ;;
- "amd64")
- echo "x86_64"
- ;;
- *)
- echo "unknown arch"
- exit 1
- ;;
- esac
-}
-
-
-
-for codename in $codenames; do
- for darch in $darchs ; do
- version=`debcode2ver $codename`
- arch=`debarch2arch $darch`
-
- debs="$pkgdir/Ubuntu$version-$arch/"
- repo="$basedir/$codename/main/binary-$darch"
-
- # ディレクトリが存在しないならスキップ
- if test ! -d $debs ; then
- echo $debs "does not exists. skiped."
- continue
- fi
-
- # ディレクトリが存在しないなら作成
- if test ! -d $repo ; then
- mkdir -p $repo
- fi
-
- echo ""
- echo "Copying debs to repository:"
- echo "dir: "$repo
-
- for deb in $debs* ; do
- debname=`basename $deb`
- if test -f $repo/$debname ; then
- echo "$repo/$debname already exists"
- read -p "Overwrite? $rpmname [Y/n]" ow
- if test ! "$ow" = "n" ; then
- echo "copying $debname"
- cp $debs/$debname $repo
- echo "copy done"
- fi
- else
- cp $debs/$debname $repo
- echo "copy done"
- fi
- done
- done
-done
Deleted: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/ubuntu_repo.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/ubuntu_repo.sh 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/ubuntu_repo.sh 2013-05-17 01:39:30 UTC (rev 587)
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# @file Ubuntu_repo
-# @brief apt-deb repository database creation for Ubuntu
-# @date $Date$
-# @author Noriaki Ando <n-ando at aist.go.jp>
-#
-# Copyright (C) 2008
-# Noriaki Ando
-# Task-intelligence Research Group,
-# Intelligent Systems Research Institute,
-# National Institute of
-# Advanced Industrial Science and Technology (AIST), Japan
-# All rights reserved.
-#
-# $Id$
-#
-
-# Base directory of repository
-cd /exports/pub/repository/pub/Linux/ubuntu
-
-# Ubuntu versions
-versions="edgy feisty gutsy hardy intrepid jaunty karmic lucid maverick"
-
-# Ubuntu architectures
-archs="binary-i386 binary-amd64"
-
-for version in $versions; do
- for arch in $archs ; do
- debs=dists/$version/main/$arch
- echo ""
- echo "Creating apt-dev database under:"
- echo $debs
- touch package
- dpkg-scanpackages -m $debs package | gzip > $debs/Packages.gz
-# apt-ftparchive packages $debs | gzip -c9 > $debs/Packages.gz
- done
-# dpkg-scansources $version/main/source | gzip > $version/main/source/Sources.gz
-done
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/setup.py 2013-05-16 16:37:37 UTC (rev 586)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/setup.py 2013-05-17 01:39:30 UTC (rev 587)
@@ -214,14 +214,12 @@
# scripts settings
#
pkg_scripts_unix = ['OpenRTM_aist/utils/rtcd/rtcd_python',
- 'OpenRTM_aist/utils/rtcprof/rtcprof_python',
- 'OpenRTM_aist/ext/sdo/observer/setup.bat']
+ 'OpenRTM_aist/utils/rtcprof/rtcprof_python']
pkg_scripts_win32 = ['OpenRTM_aist/utils/rtcd/rtcd.py',
'OpenRTM_aist/utils/rtcd/rtcd_python.exe',
'OpenRTM_aist/utils/rtcd/rtcd_python.bat',
'OpenRTM_aist/utils/rtcprof/rtcprof_python.py',
- 'OpenRTM_aist/utils/rtcprof/rtcprof_python.bat',
- 'OpenRTM_aist/ext/sdo/observer/setup.bat']
+ 'OpenRTM_aist/utils/rtcprof/rtcprof_python.bat']
#
# ext modules
#
@@ -233,14 +231,14 @@
# examples
#
example_dir = "OpenRTM_aist/examples"
-target_example_dir = "share/openrtm-" + pkg_shortver + "/examples/python"
+target_example_dir = "share/openrtm-" + pkg_shortver + "/example/python"
example_match_regex = ".*\.(py|conf|sh|xml|idl)$"
example_path = os.path.normpath(current_dir + "/" + example_dir)
#
# documents
#
document_dir = "OpenRTM_aist/docs"
-target_doc_dir = "share/openrtm-" + pkg_shortver + "/docs/python"
+target_doc_dir = "share/openrtm-" + pkg_shortver + "/doc/python"
document_match_regex = ".*\.(css|gif|png|html||hhc|hhk|hhp)$"
document_path = os.path.normpath(current_dir + "/" + document_dir)
@@ -439,7 +437,9 @@
# clean
# clean_core
# clean_example
-# clean_doc
+# clean_doc (clean_doc is not subcommand of clean, because
+# documentation files are included sdist pakcage
+# )
# sdist
# sdist_tgz
# sdist_zip
@@ -553,7 +553,22 @@
current_dir = baseidl_path
idl_files = [os.path.join(baseidl_path, f) for f in baseidl_files]
compile_idl(self.omniidl, include_dirs, current_dir, idl_files)
+ self.run_command("build_py")
+from distutils.command.build_py import build_py as _build_py
+class build_py(_build_py):
+ """
+ This class is a subcommand of build_core command. The command copies
+ modules into build directory.
+ # This class was created for only copying OpenRTM-aist.pth file
+ """
+ description = "Copying pure python modules into build directory."
+ def run(self):
+ _build_py.run(self)
+ # copying OpenRTM-aist.pth file
+ self.copy_file(os.path.join(".", "OpenRTM-aist.pth"), self.build_lib,
+ preserve_mode=False)
+
#------------------------------------------------------------
# "build_example" sub command
#------------------------------------------------------------
@@ -637,6 +652,12 @@
if os.path.exists(target_dir):
shutil.rmtree(target_dir)
+def remove_files(base_dir, file_names):
+ for f in file_names:
+ target_file = os.path.normpath(base_dir + "/" + f)
+ if os.path.exists(target_file):
+ os.remove(target_file)
+
#------------------------------------------------------------
# "clean" command
#------------------------------------------------------------
@@ -684,6 +705,9 @@
return
def run(self):
remove_stubs(baseidl_path, baseidl_files, baseidl_mods)
+ remove_dirs('.', ["build"])
+ remove_dirs('.', ["dist"])
+ remove_files('.', ["MANIFEST"])
#------------------------------------------------------------
# "clean_example" sub command
@@ -897,8 +921,13 @@
# IDL file list
#
pkg_package_data_files = {
- 'OpenRTM_aist': ['RTM_IDL/*.idl'],
- 'OpenRTM_aist': ['RTM_IDL/device_interfaces/*.idl']
+ 'OpenRTM_aist': ['RTM_IDL/*.idl',
+ 'RTM_IDL/device_interfaces/*.idl',
+ 'ext/sdo/observer/*.conf',
+ 'ext/sdo/observer/*.bat',
+ 'ext/sdo/observer/*.sh',
+ 'ext/sdo/observer/*.idl',
+ ],
}
#
# scripts
@@ -907,17 +936,6 @@
pkg_scripts = pkg_scripts_win32
else:
pkg_scripts = pkg_scripts_unix
-#
-# ext modules
-#
-if os_is() == "win32":
- ext_match_regex = ext_match_regex_win32
-else:
- ext_match_regex = ext_match_regex_unix
- pkg_ext_files = create_filelist(ext_dir,
- "OpenRTM_aist/",
- target_ext_dir,
- ext_match_regex)
#
# example file list -> MyDistribution.example_files
@@ -955,6 +973,7 @@
distclass = MyDistribution,
cmdclass = { "build": build_all,
"build_core": build_core,
+ "build_py": build_py,
"build_example": build_example,
"build_doc": build_doc,
"clean": clean_all,
Property changes on: branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478
/trunk/OpenRTM-aist-Python/setup.py:559,565-568
+ /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478
/trunk/OpenRTM-aist-Python/setup.py:559,565-568,570-586
More information about the openrtm-commit
mailing list