Update to version 0.4.0-1

2 files changed, 19 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5fc9d7f04f5..153fe69711e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 18:42:55 UTC 2017
+# Thu Dec 21 22:29:50 UTC 2017
 pkgbase = ros-ardent-rcl
 	pkgdesc = ROS - The ROS client library common implementation.
 	pkgver = 0.4.0
@@ -9,13 +9,14 @@ pkgbase = ros-ardent-rcl
 	license = Apache License 2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-ardent-rcl-interfaces
 	makedepends = ros-ardent-ament-cmake-ros
-	makedepends = ros-ardent-rosidl-generator-c
-	depends = ros-ardent-ament-cmake
-	depends = ros-ardent-rcutils
 	depends = ros-ardent-rosidl-default-runtime
 	depends = ros-ardent-rmw-implementation
+	depends = ros-ardent-ament-cmake
+	depends = ros-ardent-rosidl-generator-c
+	depends = ros-ardent-rmw
+	depends = ros-ardent-rcl-interfaces
+	depends = ros-ardent-rcutils
 	source = ros-ardent-rcl-0.4.0-0.tar.gz::https://github.com/ros2-gbp/rcl-release/archive/release/ardent/rcl/0.4.0-0.tar.gz
 	sha256sums = 5c2ca0cc0e6acbe6407213c9471373597753c1d693191f5af30b082abda5441f
 
diff --git a/PKGBUILD b/PKGBUILD
index 79ccbb2cdd84..b65a04c30d19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,16 +10,17 @@ arch=('any')
 pkgrel=1
 license=('Apache License 2.0')
 
-ros_makedepends=(ros-ardent-rcl-interfaces
-  ros-ardent-ament-cmake-ros
-  ros-ardent-rosidl-generator-c)
+ros_makedepends=(ros-ardent-ament-cmake-ros)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-ardent-ament-cmake
-  ros-ardent-rcutils
-  ros-ardent-rosidl-default-runtime
-  ros-ardent-rmw-implementation)
+ros_depends=(ros-ardent-rosidl-default-runtime
+  ros-ardent-rmw-implementation
+  ros-ardent-ament-cmake
+  ros-ardent-rosidl-generator-c
+  ros-ardent-rmw
+  ros-ardent-rcl-interfaces
+  ros-ardent-rcutils)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
@@ -45,17 +46,14 @@ build() {
   # Fix Python2/Python3 conflicts
   /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 "${srcdir}/${_dir}"
 
+  export PYTHONPATH=/opt/ros/ardent/lib/python3.6/site-packages
+  export AMENT_PREFIX_PATH=/opt/ros/ardent
+
   # Build project
   cmake "${srcdir}/${_dir}" \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent \
-        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python3.5m \
-        -DPYTHON_LIBRARY=/usr/lib/libpython3.5m.so \
-        -DPYTHON_BASENAME=.cpython-35m \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF \
-        -DCATKIN_ENABLE_TESTING=OFF
+        -DBUILD_TESTING=Off \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent
   make
 }