Update to version 0.4.0-1

2 files changed, 6 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2cf4b56c8f30..5b904330c74a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 18:42:12 UTC 2017
+# Thu Dec 21 22:29:46 UTC 2017
 pkgbase = ros-ardent-launch-testing
 	pkgdesc = ROS - Helper scripts for tests that use the ROS launch tool.
 	pkgver = 0.4.0
@@ -9,8 +9,8 @@ pkgbase = ros-ardent-launch-testing
 	license = Apache License 2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
-	depends = ros-ardent-launch
 	depends = ros-ardent-ament-index-python
+	depends = ros-ardent-launch
 	source = ros-ardent-launch-testing-0.4.0-0.tar.gz::https://github.com/ros2-gbp/launch-release/archive/release/ardent/launch_testing/0.4.0-0.tar.gz
 	sha256sums = 396700f72c251aaa4f67627583b69d7097af0044d28f93b85a5ca87c7e6a95d2
 
diff --git a/PKGBUILD b/PKGBUILD
index 70fcc904c472..46b98ffe5839 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ ros_makedepends=()
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-ardent-launch
-  ros-ardent-ament-index-python)
+ros_depends=(ros-ardent-ament-index-python
+  ros-ardent-launch)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
@@ -29,33 +29,7 @@ _dir="launch-release-release-ardent-launch_testing-${pkgver}-${_pkgver_patch}"
 source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/launch-release/archive/release/ardent/launch_testing/${pkgver}-${_pkgver_patch}.tar.gz")
 sha256sums=('396700f72c251aaa4f67627583b69d7097af0044d28f93b85a5ca87c7e6a95d2')
 
-build() {
-  # Use ROS environment variables
-  source /usr/share/ros-build-tools/clear-ros-env.sh
-  [ -f /opt/ros/ardent/setup.bash ] && source /opt/ros/ardent/setup.bash
-
-  # Create build directory
-  [ -d "${srcdir}/build" ] || mkdir "${srcdir}/build"
-  cd "${srcdir}/build"
-
-  # Fix Python2/Python3 conflicts
-  /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 "${srcdir}/${_dir}"
-
-  # 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
-  make
-}
-
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}/" install
+  cd "${srcdir}/${_dir}"
+  python setup.py install --root="$pkgdir" --prefix="/opt/ros/ardent" --optimize=1
 }