[openrtm-commit:01955] r2735 - in branches/RELENG_1_1/OpenRTM-aist: . packages/rpm src/lib/rtm/ext

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-05-25 15:29:29 +0900 (Wed, 25 May 2016)
New Revision: 2735

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/packages/rpm/rpm_build.sh.in
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ext/Makefile.am
Log:
[merge] r2733-2734 have been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724,2728-2730
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724,2728-2730,2733-2734

Modified: branches/RELENG_1_1/OpenRTM-aist/packages/rpm/rpm_build.sh.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/rpm/rpm_build.sh.in	2016-05-25 05:58:10 UTC (rev 2734)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/rpm/rpm_build.sh.in	2016-05-25 06:29:29 UTC (rev 2735)
@@ -59,11 +59,13 @@
 
 echo "distribution: " $dist_name
 
+arch=`uname -i | sed -s 's/i[3-5]/i6/g'`
+
 #------------------------------------------------------------
 # package build process
 #------------------------------------------------------------
 mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-mkdir -p RPMS/{i386,i586,i686,x86_64,noarch}
+mkdir -p RPMS/{$arch,noarch}
 
 # fake tar-ball is created under SOURCES dir
 rm -f $packagename
@@ -94,6 +96,6 @@
 # We have already extracted source under BUILD directory.
 # %prep process can be skiped. = --short-circuit -bc
 rpm_def="_topdir $builddir"
-rpmbuild --target `uname -i` --define "$rpm_def" -ba OpenRTM-aist.spec
+rpmbuild --target "$arch" --define "$rpm_def" -ba OpenRTM-aist.spec
 cd ..
 rm $packagename

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ext/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ext/Makefile.am	2016-05-25 05:58:10 UTC (rev 2734)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/ext/Makefile.am	2016-05-25 06:29:29 UTC (rev 2735)
@@ -147,23 +147,25 @@
 		$(MAKE) $(AM_MAKEFLAGS) idl-stamp ; \
 	fi ;
 
+#------------------------------------------------------------
 # Install directory of headers and idl files
+#------------------------------------------------------------
 rtmheaderdir = $(rtm_includedir)/rtm
-idldir =       $(rtmheaderdir)/idl
-rtmskeldir =   $(rtmheaderdir)/idl
+idldir =       $(rtmheaderdir)/ext
+extskeldir =   $(rtmheaderdir)/ext
 
 idl_DATA = $(IDL_SOURCES)
+nodist_extskel_HEADERS = $(ALL_SRC)
 
-nodist_rtmskel_HEADERS = $(ALL_SRC) 
-
 #------------------------------------------------------------
-
+# libraries
+#------------------------------------------------------------
 lib_LTLIBRARIES = \
 	librtmManipulator.la \
 	librtmCamera.la
 
-librtmManipulator_la_SOURCES = $(MANIPULATORSKEL_CPP)
-librtmCamera_la_SOURCES = $(CAMERASKEL_CPP)
+nodist_librtmManipulator_la_SOURCES = $(MANIPULATORSKEL_CPP)
+nodist_librtmCamera_la_SOURCES = $(CAMERASKEL_CPP)
 
 librtmManipulator_la_LIBADD = $(LIBS) -lRTC
 librtmCamera_la_LIBADD = $(LIBS) -lRTC