summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2014-03-02 13:55:37 +0100
committerBenjamin Chrétien2015-06-20 02:25:12 +0900
commita6a9c43088c00d5f23fd4d1f4068fc72bfec0c86 (patch)
tree00d16664c46a283cc4e99ff68f1ef65a87b866d1
parent7b7694e0ed4ea898c0f5ea3b5ea97c43de890cb3 (diff)
downloadaur-a6a9c43088c00d5f23fd4d1f4068fc72bfec0c86.tar.gz
Minor updates.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD5
-rwxr-xr-ximport_catkin_packages.py13
3 files changed, 18 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 338c1ea70038..536cc76cfa13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,15 @@
pkgbase = ros-build-tools
pkgdesc = Utilities for building arch packages for ROS stacks.
pkgver = 0.0.5
- pkgrel = 1
+ pkgrel = 2
url = http://www.ros.org
arch = i686
arch = x86_64
license = BSD
+ optdepends = python2
+ optdepends = python2-catkin_pkg
+ optdepends = python2-termcolor
+ optdepends = python2-yaml
source = fix-python-scripts.sh
source = stack-install-tools.sh
source = create-arch-ros-package-legacy.sh
@@ -22,7 +26,7 @@ pkgbase = ros-build-tools
md5sums = d257f7f20384e894b0431ee61068aa96
md5sums = 563c9d1320a3a997db25d3087303dcfb
md5sums = 8d6d7eb89a12c449497b209f1a06655b
- md5sums = 1f24db984558a3df7be93cba472136fe
+ md5sums = 23e856627875ead5565661afa7f0caf0
md5sums = 07f5253eb3f8cb5295c32026a20ab6c0
pkgname = ros-build-tools
diff --git a/PKGBUILD b/PKGBUILD
index 8dc5a01dbc19..c2a3bd38fd5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,11 @@ url=http://www.ros.org
pkgname='ros-build-tools'
pkgver='0.0.5'
arch=('i686' 'x86_64')
-pkgrel=1
+pkgrel=2
license=('BSD')
makedepends=()
depends=()
+optdepends=('python2' 'python2-catkin_pkg' 'python2-termcolor' 'python2-yaml')
pkg_destination_dir="/usr/share/ros-build-tools"
@@ -40,5 +41,5 @@ md5sums=('8b2e864de97e97298ebfb8da471f2df1'
'd257f7f20384e894b0431ee61068aa96'
'563c9d1320a3a997db25d3087303dcfb'
'8d6d7eb89a12c449497b209f1a06655b'
- '1f24db984558a3df7be93cba472136fe'
+ '23e856627875ead5565661afa7f0caf0'
'07f5253eb3f8cb5295c32026a20ab6c0')
diff --git a/import_catkin_packages.py b/import_catkin_packages.py
index 0ce7f005480c..f2be13f80e8f 100755
--- a/import_catkin_packages.py
+++ b/import_catkin_packages.py
@@ -11,6 +11,7 @@ import urlparse
import yaml
import re
from collections import OrderedDict
+from termcolor import colored, cprint
class PackageBase(object):
@@ -458,11 +459,15 @@ def generate_pkgbuild(distro, package, directory, force=False,
pkgbuild_file = os.path.join(output_directory, 'PKGBUILD')
if update:
if package.is_same_version(pkgbuild_file):
- print('PKGBUILD for package %s already up-to-date (%s-%s)'
- % (package.name, package.version, package.version_patch))
+ print('PKGBUILD for package %s already up-to-date (%s)'
+ % (colored(package.name, 'yellow', attrs=['bold']),
+ colored(package.version + '-' + package.version_patch, 'white',
+ attrs=['bold'])))
return
- print('Generating PKGBUILD for package %s (%s-%s)'
- % (package.name, package.version, package.version_patch))
+ print('Generating PKGBUILD for package %s (%s)'
+ % (colored(package.name, 'green', attrs=['bold']),
+ colored(package.version + '-' + package.version_patch, 'white',
+ attrs=['bold'])))
with open(pkgbuild_file, 'w') as pkgbuild:
pkgbuild.write(package.generate(exclude_dependencies, rosdep_urls))