Update to version 0.4.0-1

2 files changed, 28 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ccea68943954..179d27ae99b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 18:43:46 UTC 2017
+# Thu Dec 21 22:29:50 UTC 2017
 pkgbase = ros-ardent-rosidl-typesupport-opensplice-cpp
 	pkgdesc = ROS - Generate the C++ interfaces for PrismTech OpenSplice.
 	pkgver = 0.4.0
@@ -9,14 +9,16 @@ pkgbase = ros-ardent-rosidl-typesupport-opensplice-cpp
 	license = Apache License 2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-ardent-rosidl-generator-cpp
-	makedepends = ros-ardent-rosidl-generator-c
-	makedepends = ros-ardent-opensplice-cmake-module
-	makedepends = ros-ardent-ament-cmake
-	makedepends = ros-ardent-rosidl-cmake
-	makedepends = opensplice
-	depends = ros-ardent-rosidl-typesupport-interface
+	depends = ros-ardent-rosidl-cmake
 	depends = ros-ardent-rosidl-parser
+	depends = ros-ardent-ament-cmake
+	depends = ros-ardent-rosidl-typesupport-interface
+	depends = ros-ardent-rosidl-generator-c
+	depends = ros-ardent-opensplice-cmake-module
+	depends = ros-ardent-rmw
+	depends = ros-ardent-rosidl-generator-cpp
+	depends = ros-ardent-rosidl-generator-dds-idl
+	depends = opensplice-dds
 	source = ros-ardent-rosidl-typesupport-opensplice-cpp-0.4.0-0.tar.gz::https://github.com/ros2-gbp/rmw_opensplice-release/archive/release/ardent/rosidl_typesupport_opensplice_cpp/0.4.0-0.tar.gz
 	sha256sums = da0b40c4c0ca11ba02f7656f49e1cb5b4485488c4fca9290088d27ac709724e1
 
diff --git a/PKGBUILD b/PKGBUILD
index dd8955018ae4..ec98aded5641 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,18 +10,21 @@ arch=('any')
 pkgrel=1
 license=('Apache License 2.0')
 
-ros_makedepends=(ros-ardent-rosidl-generator-cpp
-  ros-ardent-rosidl-generator-c
-  ros-ardent-opensplice-cmake-module
-  ros-ardent-ament-cmake
-  ros-ardent-rosidl-cmake)
+ros_makedepends=()
 makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]}
-  opensplice)
+  ${ros_makedepends[@]})
 
-ros_depends=(ros-ardent-rosidl-typesupport-interface
-  ros-ardent-rosidl-parser)
-depends=(${ros_depends[@]})
+ros_depends=(ros-ardent-rosidl-cmake
+  ros-ardent-rosidl-parser
+  ros-ardent-ament-cmake
+  ros-ardent-rosidl-typesupport-interface
+  ros-ardent-rosidl-generator-c
+  ros-ardent-opensplice-cmake-module
+  ros-ardent-rmw
+  ros-ardent-rosidl-generator-cpp
+  ros-ardent-rosidl-generator-dds-idl)
+depends=(${ros_depends[@]}
+  opensplice-dds)
 
 # Git version (e.g. for debugging)
 # _tag=release/ardent/rosidl_typesupport_opensplice_cpp/${pkgver}-${_pkgver_patch}
@@ -46,17 +49,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
 }