[openrtm-commit:02953] r1080 - in branches/RELENG_1_2/OpenRTM-aist-Java/packages: deb/debian rpm

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-12-08 16:13:29 +0900 (Fri, 08 Dec 2017)
New Revision: 1080

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Java/packages/deb/debian/rules
   branches/RELENG_1_2/OpenRTM-aist-Java/packages/rpm/openrtm-aist.spec.in
Log:
[merge] r1078-1079 have been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/packages/deb/debian/rules
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/packages/deb/debian/rules	2017-12-08 07:07:13 UTC (rev 1079)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/packages/deb/debian/rules	2017-12-08 07:13:29 UTC (rev 1080)
@@ -92,11 +92,18 @@
 	# for openrtm-aist-java package
 	(cd $(CURDIR) ; mkdir -p $(CURDIR)/debian/openrtm-aist-java/usr/lib/$(DEB_HOST_MULTIARCH)/openrtm-$(SHORT_VER))
 	(cd $(CURDIR) ; cp -R jar $(CURDIR)/debian/openrtm-aist-java/usr/lib/$(DEB_HOST_MULTIARCH)/openrtm-$(SHORT_VER))
+	(cd $(CURDIR) ; mkdir -p $(CURDIR)/debian/openrtm-aist-java/usr/bin)
+	(cd $(CURDIR) ; cp examples/rtcd_java $(CURDIR)/debian/openrtm-aist-java/usr/bin ; chmod 755 $(CURDIR)/debian/openrtm-aist-java/usr/bin/rtcd_java)
+	(cd $(CURDIR) ; cp examples/rtcprof_java $(CURDIR)/debian/openrtm-aist-java/usr/bin ; chmod 755 $(CURDIR)/debian/openrtm-aist-java/usr/bin/rtcprof_java)
 	
 	# for openrtm-aist-java-example package
 	(cd $(CURDIR) ; mkdir -p $(CURDIR)/debian/openrtm-aist-java-example/usr/share/openrtm-$(SHORT_VER)/components/java)
 	(cd $(CURDIR) ; cp -R examples/* $(CURDIR)/debian/openrtm-aist-java-example/usr/share/openrtm-$(SHORT_VER)/components/java)
 	(rm -f $(CURDIR)/debian/openrtm-aist-java-example/usr/share/openrtm-$(SHORT_VER)/components/java/*.bat)
+	(rm -f $(CURDIR)/debian/openrtm-aist-java-example/usr/share/openrtm-$(SHORT_VER)/components/java/*.vbs)
+	(rm -f $(CURDIR)/debian/openrtm-aist-java-example/usr/share/openrtm-$(SHORT_VER)/components/java/rtcd_java)
+	(rm -f $(CURDIR)/debian/openrtm-aist-java-example/usr/share/openrtm-$(SHORT_VER)/components/java/rtcd_java.sh)
+	(rm -f $(CURDIR)/debian/openrtm-aist-java-example/usr/share/openrtm-$(SHORT_VER)/components/java/rtcprof_java*)
 
 	dh_install -s
 # Must not depend on anything. This is to be called by

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/packages/rpm/openrtm-aist.spec.in
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/packages/rpm/openrtm-aist.spec.in	2017-12-08 07:07:13 UTC (rev 1079)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/packages/rpm/openrtm-aist.spec.in	2017-12-08 07:13:29 UTC (rev 1080)
@@ -66,6 +66,9 @@
 # install section
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+cp %{_topdir}/../../examples/rtcd_java $RPM_BUILD_ROOT/usr/bin 
+cp %{_topdir}/../../examples/rtcprof_java $RPM_BUILD_ROOT/usr/bin 
 mkdir -p $RPM_BUILD_ROOT%{rtm_libdir}
 cp -r %{_topdir}/../../jar $RPM_BUILD_ROOT%{rtm_libdir}
 mkdir -p $RPM_BUILD_ROOT%{rtm_datadir}/doc/java
@@ -77,6 +80,9 @@
 cp %{_topdir}/../../examples/*.sh %{install_dir_example}
 cp %{_topdir}/../../examples/*.conf %{install_dir_example}
 cp %{_topdir}/../../examples/*.func %{install_dir_example}
+rm -f %{install_dir_example}/rtcd_java
+rm -f %{install_dir_example}/rtcd_java.sh
+rm -f %{install_dir_example}/rtcprof_java*
   
 #------------------------------------------------------------
 # clean section
@@ -88,6 +94,7 @@
 %files
 %defattr(-,root,root)
 %attr(755,root,root) %{rtm_libdir}/jar/*
+%attr(755,root,root) /usr/bin/*
 
 #------------------------------------------------------------
 # doc package file list