Merge pull request #1128 from n-kawauchi/change-deb-pkg-config

Linux版ネームサービス起動を2.0.2版から新debパッケージで定義

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.5.1)
 
 project (OpenRTM_aist
-	VERSION 2.0.1
+	VERSION 2.0.2
 	LANGUAGES CXX)
 
 set(CORBA omniORB CACHE STRING "set CORBA ")

packages/deb/debian/changelog

@@ -1,3 +1,9 @@
+openrtm2 (2.0.2-0) experimental; urgency=low
+
+  * 2.0.2-0 (2.0.2-RELEASE). OpenRTM-aist-2.0.2-RELEASE
+
+ --  Noriaki Ando <[email protected]>  Thu, 09 Nov 2023 17:08:39 +0900
+
 openrtm2 (2.0.1-2) experimental; urgency=low
 
   * Update ROS2[ROS]TransportConfig.cmake.

packages/deb/debian/control.focal

@@ -10,7 +10,7 @@ Package: openrtm2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, omniorb-nameserver
+Depends: ${misc:Depends}, omniorb-nameserver, openrtm2-naming
 Description: OpenRTM-aist, RT-Middleware distributed by AIST
  OpenRTM-aist is a reference implementation of RTC (Robotic Technology
  Component Version 1.1, formal/12-09-01) specification which is OMG
@@ -22,6 +22,11 @@ Description: OpenRTM-aist, RT-Middleware distributed by AIST
  National Institute of Advanced Industrial Science and Technology
  (AIST), Japan. Please see http://www.openrtm.org/ for more detail.
 
+Package: openrtm2-naming
+Architecture: any
+Multi-Arch: same
+Description: OpenRTM-aist name server launcher
+
 Package: openrtm2-ros-tp
 Architecture: any
 Multi-Arch: same

packages/deb/debian/control.jammy

@@ -10,7 +10,7 @@ Package: openrtm2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, omniorb-nameserver
+Depends: ${misc:Depends}, omniorb-nameserver, openrtm2-naming
 Description: OpenRTM-aist, RT-Middleware distributed by AIST
  OpenRTM-aist is a reference implementation of RTC (Robotic Technology
  Component Version 1.1, formal/12-09-01) specification which is OMG
@@ -22,6 +22,11 @@ Description: OpenRTM-aist, RT-Middleware distributed by AIST
  National Institute of Advanced Industrial Science and Technology
  (AIST), Japan. Please see http://www.openrtm.org/ for more detail.
 
+Package: openrtm2-naming
+Architecture: any
+Multi-Arch: same
+Description: OpenRTM-aist name server launcher
+
 Package: openrtm2-ros2-tp
 Architecture: any
 Multi-Arch: same

packages/deb/debian/control.not-ros-support

@@ -10,7 +10,7 @@ Package: openrtm2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, omniorb-nameserver
+Depends: ${misc:Depends}, omniorb-nameserver, openrtm2-naming
 Description: OpenRTM-aist, RT-Middleware distributed by AIST
  OpenRTM-aist is a reference implementation of RTC (Robotic Technology
  Component Version 1.1, formal/12-09-01) specification which is OMG
@@ -22,6 +22,11 @@ Description: OpenRTM-aist, RT-Middleware distributed by AIST
  National Institute of Advanced Industrial Science and Technology
  (AIST), Japan. Please see http://www.openrtm.org/ for more detail.
 
+Package: openrtm2-naming
+Architecture: any
+Multi-Arch: same
+Description: OpenRTM-aist name server launcher
+
 Package: openrtm2-dev
 Architecture: any
 Multi-Arch: same

packages/deb/debian/rules.in

@@ -48,6 +48,7 @@ TARGET_dev = $(CURDIR)/debian/openrtm2-dev/usr
 TARGET_idl = $(CURDIR)/debian/openrtm2-idl/usr
 TARGET_example = $(CURDIR)/debian/openrtm2-example/usr
 TARGET_doc = $(CURDIR)/debian/openrtm2-doc/usr
+TARGET_naming = $(CURDIR)/debian/openrtm2-naming/usr
 
 #Architecture 
 build: build-arch build-indep
@@ -87,7 +88,7 @@ install-indep:
 	# Add here commands to install the indep part of the package into
 	# debian/<package>-doc.
 	#INSTALLDOC#
-	# for openrtm-aist-doc package
+	# for openrtm2-doc package
 	(mkdir -p $(TARGET_doc)/share/openrtm-$(SHORT_VER))
 	(cp -r $(INSTALL_PREFIX)/share/openrtm-$(SHORT_VER)/doc $(TARGET_doc)/share/openrtm-$(SHORT_VER))	
 	dh_install -i
@@ -101,12 +102,11 @@ install-arch:
 	# Add here commands to install the arch part of the package into 
 	# debian/tmp.
 
-	# for openrtm-aist package
+	# for openrtm2 package
 	(mkdir -p $(TARGET)/bin)
 	(cp $(INSTALL_PREFIX)/bin/rtcd2 $(TARGET)/bin)
 	(cp $(INSTALL_PREFIX)/bin/rtcprof2 $(TARGET)/bin)
 	(cp $(INSTALL_PREFIX)/bin/rtm2-config $(TARGET)/bin)
-	(cp $(INSTALL_PREFIX)/bin/rtm2-naming $(TARGET)/bin)
 	(cp -r $(INSTALL_PREFIX)/etc $(TARGET))
 	(mkdir -p $(TARGET)/${RTM_EXT_DIR})
 	(cp -R $(INSTALL_PREFIX)/${RTM_LIB_DIR}/*.so* $(TARGET)/${RTM_LIB_DIR})
@@ -118,20 +118,24 @@ install-arch:
 	(rm -r $(TARGET)/${RTM_EXT_DIR}/transport)
 	(cp -r $(INSTALL_PREFIX)/${RTM_LIB_DIR}/pkgconfig $(TARGET)/${RTM_LIB_DIR})
 
-	# for openrtm-aist-ros package
+	# for openrtm2-naming package
+	(mkdir -p $(TARGET_naming)/bin)
+	(cp $(INSTALL_PREFIX)/bin/rtm2-naming $(TARGET_naming)/bin)
+
+	# for openrtm2-ros package
 	(mkdir -p $(TARGET_ros)/${RTM_EXT_DIR}/transport)
 	(cp -r $(INSTALL_PREFIX)/${RTM_EXT_DIR}/transport/ROSTransport.so $(TARGET_ros)/${RTM_EXT_DIR}/transport)
 	(mkdir -p $(TARGET_ros)/${ROSTRANSPORT_CMAKE_DIR})
 	(cp -r $(INSTALL_PREFIX)/${ROSTRANSPORT_CMAKE_DIR}/* $(TARGET_ros)/${ROSTRANSPORT_CMAKE_DIR})
 
-	# for openrtm-aist-ros2 package
+	# for openrtm2-ros2 package
 	(mkdir -p $(TARGET_ros2)/${RTM_EXT_DIR}/transport)
 	(cp -r $(INSTALL_PREFIX)/${RTM_EXT_DIR}/transport/ROS2*.so $(TARGET_ros2)/${RTM_EXT_DIR}/transport)
 	(cp -r $(INSTALL_PREFIX)/${RTM_EXT_DIR}/transport/Fast*.so $(TARGET_ros2)/${RTM_EXT_DIR}/transport)
 	(mkdir -p $(TARGET_ros2)/${ROS2TRANSPORT_CMAKE_DIR})
 	(cp -r $(INSTALL_PREFIX)/${ROS2TRANSPORT_CMAKE_DIR}/* $(TARGET_ros2)/${ROS2TRANSPORT_CMAKE_DIR})
 
-	# for openrtm-dev package
+	# for openrtm2-dev package
 	(mkdir -p $(TARGET_dev)/bin)
 	(cp $(INSTALL_PREFIX)/bin/rtm2-skelwrapper $(TARGET_dev)/bin)
 	(cp -r $(INSTALL_PREFIX)/include $(TARGET_dev))
@@ -140,15 +144,15 @@ install-arch:
 	(cp -r $(INSTALL_PREFIX)/${RTM_EXT_DIR}/cmake $(TARGET_dev)/${RTM_EXT_DIR})
 	(cp -r $(INSTALL_PREFIX)/${RTM_EXT_DIR}/py_helper $(TARGET_dev)/${RTM_EXT_DIR})
 
-	# for openrtm-aist-idl package
+	# for openrtm2-idl package
 	(mkdir -p $(TARGET_idl)/include/openrtm-$(SHORT_VER)/rtm/idl)
 	(mv $(TARGET_dev)/include/openrtm-$(SHORT_VER)/rtm/idl/*.idl $(TARGET_idl)/include/openrtm-$(SHORT_VER)/rtm/idl)
 	(mkdir -p $(TARGET_idl)/share/openrtm-$(SHORT_VER)/idl)
 	(cp $(TARGET_idl)/include/openrtm-$(SHORT_VER)/rtm/idl/* $(TARGET_idl)/share/openrtm-$(SHORT_VER)/idl)
 	(mkdir -p $(CURDIR)/debian/openrtm2-idl/etc/profile.d)
 	(echo "export RTM_IDL_DIR2=/usr/share/openrtm-$(SHORT_VER)/idl" > $(CURDIR)/debian/openrtm2-idl/etc/profile.d/openrtm2-idl.sh)
 
-	# for openrtm-aist-example package
+	# for openrtm2-example package
 	(mkdir -p $(TARGET_example)/share/openrtm-$(SHORT_VER))
 	(cp -R $(INSTALL_PREFIX)/share/openrtm-$(SHORT_VER)/components $(TARGET_example)/share/openrtm-$(SHORT_VER))