[openrtm-commit:00742] r2333 - in branches/RELENG_1_1/OpenRTM-aist: . build utils/rtm-config
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 2月 22日 (水) 17:26:23 JST
Author: n-ando
Date: 2012-02-22 17:26:23 +0900 (Wed, 22 Feb 2012)
New Revision: 2333
Added:
branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/test.sh
branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/test_pc.sh
Modified:
branches/RELENG_1_1/OpenRTM-aist/build/slntool.py
branches/RELENG_1_1/OpenRTM-aist/configure.ac
branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in
branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/rtm-config.in
Log:
New options have been added to the rtm-config.
The rtm-config is created by configure AC_CONFiG_FILES macro.
New variables have been added to the openrtm-aist.pc.
refs #2369 (for RELENG_1_1)
Property changes on: branches/RELENG_1_1/OpenRTM-aist/build/slntool.py
___________________________________________________________________
Modified: svn:mergeinfo
- /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/build/slntool.py:2173
/trunk/OpenRTM-aist/build/slntool.py:2126-2172,2174-2217
+ /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/build/slntool.py:2173
/trunk/OpenRTM-aist/build/slntool.py:2126-2172,2174-2217,2330
Modified: branches/RELENG_1_1/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/configure.ac 2012-02-22 03:42:47 UTC (rev 2332)
+++ branches/RELENG_1_1/OpenRTM-aist/configure.ac 2012-02-22 08:26:23 UTC (rev 2333)
@@ -28,6 +28,8 @@
dnl ------------------------------------------------------------
dnl pkgconfig pc file
AC_CONFIG_FILES([utils/rtm-config/openrtm-aist.pc:utils/rtm-config/openrtm-aist.pc.in])
+AC_CONFIG_FILES([utils/rtm-config/rtm-config:utils/rtm-config/rtm-config.in])
+
dnl RPM package spec file and build script
dnl AC_CONFIG_FILES([packages/rpm/OpenRTM-aist.spec:packages/rpm/OpenRTM-aist.spec.in])
dnl AC_CONFIG_FILES([packages/rpm/rpm_build.sh:packages/rpm/rpm_build.sh.in])
@@ -1544,6 +1546,7 @@
dnl OpenRTM's includedir/libdir/datadir definition
rtm_includedir=$includedir"/openrtm-"$major_version"."$minor_version
+rtm_idldir=$rtm_includedir"/rtm/idl"
rtm_libdir=$libdir"/openrtm-"$major_version"."$minor_version
rtm_datadir=$datadir"/openrtm-"$major_version"."$minor_version
coil_includedir=$includedir"/coil-"$major_version"."$minor_version
@@ -1560,6 +1563,7 @@
AC_SUBST(rtm_libdir)
AC_SUBST(rtm_datadir)
AC_SUBST(rtm_includedir)
+AC_SUBST(rtm_idldir)
AC_SUBST(coil_includedir)
AC_SUBST(rtm_rtcdir)
AC_SUBST(rtm_ecdir)
Property changes on: branches/RELENG_1_1/OpenRTM-aist/configure.ac
___________________________________________________________________
Modified: svn:mergeinfo
- /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278
+ /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/Makefile.am 2012-02-22 03:42:47 UTC (rev 2332)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/Makefile.am 2012-02-22 08:26:23 UTC (rev 2333)
@@ -21,21 +21,8 @@
bin_SCRIPTS = rtm-config
-rtm-config: rtm-config.in
- echo '#!/bin/sh' > $@
- echo '' >> $@
- echo 'rtm_prefix="'${prefix}'"' >> $@
- echo 'rtm_exec_prefix="'${exec_prefix}'"' >> $@
- echo 'rtm_cxx="'${CXX}'"' >> $@
- echo 'rtm_cflags="'${CXXFLAGS}' -I'${prefix}'/include -I'${coil_includedir}' -I'${rtm_includedir}' -I'${rtm_includedir}'/rtm/idl"' >> $@
- echo 'rtm_libs="'${LDFLAGS}' -L'${prefix}'/lib '${LIBS}' -lRTC -lcoil"' >> $@
- echo 'rtm_libdir="'${rtm_libdir}'"' >> $@
- echo 'rtm_version="'${RTM_VERSION}'"' >> $@
- echo 'rtm_orb="'${ORB}'"' >> $@
- echo 'rtm_idlc="'${IDLC}'"' >> $@
- echo 'rtm_idlflags="'${IDLFLAGS}'"' >> $@
- cat rtm-config.in >> $@
- chmod 755 $@
+all-local:
+ chmod 755 rtm-config
EXTRA_DIST = \
rtm-config.in \
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in 2012-02-22 03:42:47 UTC (rev 2332)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in 2012-02-22 08:26:23 UTC (rev 2333)
@@ -1,17 +1,33 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
+data_prefix=@datarootdir@
+rtm_prefix=@prefix@
+rtm_exec_prefix=@exec_prefix@
+rtm_data_prefix=@datarootdir@
+
libdir=@libdir@
includedir=@includedir@
-rtm_prefix=@prefix@
-rtm_exec_prefix=@exec_prefix@
+
rtm_cxx=@CXX@
-rtm_cflags=@CXXFLAGS@ -I${prefix}/include -I at coil_includedir@ -I at rtm_includedir@ -I at rtm_includedir@/rtm/idl
-rtm_libs=@LDFLAGS@ -L${prefix}/lib @LIBS@ -lRTC -lcoil
-rtm_libdir=@pkglibdir@
+rtm_cflags=@CXXFLAGS@ -I at prefix@/include -I at coil_includedir@ -I at rtm_includedir@ -I at rtm_idldir@
+rtm_libs=@LDFLAGS@ -L at libdir@ @LIBS@ -lRTC -lcoil
rtm_version=@RTM_VERSION@
rtm_orb=@ORB@
rtm_idlc=@IDLC@
-rtm_idlflags=@IDLFLAGS@
+rtm_idlflags=@IDL_FLAGS@ -I at rtm_idldir@
+# other variables
+rtm_includedir=@rtm_includedir@
+rtm_idldir=@rtm_idldir@
+rtm_libdir=@rtm_libdir@
+rtm_datadir=@rtm_datadir@
+rtm_rtcdir=@rtm_rtcdir@
+rtm_ecdir=@rtm_ecdir@
+rtm_rtmdir=@rtm_rtmdir@
+rtm_svcdir=@rtm_svcdir@
+rtm_docdir=@rtm_docdir@
+rtm_exampledir=@rtm_exampledir@
+coil_includedir=@coil_includedir@
Name: @PACKAGE@
Description: @RTM_DESCRIPTION@
Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/rtm-config.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/rtm-config.in 2012-02-22 03:42:47 UTC (rev 2332)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/rtm-config.in 2012-02-22 08:26:23 UTC (rev 2333)
@@ -1,3 +1,5 @@
+#!/bin/sh
+# -*- shell-script -*-
#
# @file rtm-config
# @brief OpenRTM-aist configuration access utility
@@ -3,30 +5,87 @@
# @date $Date: 2005-05-12 09:06:18 $
# @author Noriaki Ando <n-ando at aist.go.jp>
-#
-# Copyright (C) 2003-2005
-# Task-intelligence Research Group,
+#
+# Copyright (C) 2003-2005, 2012
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
-#
+#
# $Id$
-#
+#
+rtm_prefix="@prefix@"
+rtm_exec_prefix="@exec_prefix@"
+rtm_data_prefix="@datarootdir@"
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
+
+init_variables()
+{
+# basic options
+rtm_cxx="@CXX@"
+rtm_cflags=`echo @CXXFLAGS@ -I at prefix@/include -I at coil_includedir@ -I at rtm_includedir@ -I at rtm_idldir@ | sed -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_cflags_I=`echo $rtm_cflags | sed -e 's/-[^I][^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_cflags_o=`echo $rtm_cflags | sed -e 's/-I[^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_libs=`echo @LDFLAGS@ -L at libdir@ @LIBS@ -lRTC -lcoil | sed -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_libs_l=`echo $rtm_libs | sed -e 's/-[^l][^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_libs_L=`echo $rtm_libs | sed -e 's/-[^L][^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_libs_o=`echo $rtm_libs | sed -e 's/-[lL][^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_version="@RTM_VERSION@"
+rtm_orb="@ORB@"
+rtm_idlc="@IDLC@"
+rtm_idlflags=` echo @IDL_FLAGS@ -I at rtm_idldir@ | sed -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_idlflags_I=` echo $rtm_idlflags | sed -e 's/-[^I][^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+rtm_idlflags_o=` echo $rtm_idlflags | sed -e 's/-I[^ ]*//g' -e 's/^[ ]*//g' -e 's/ \{2,\}/ /g'`
+# other variables
+rtm_includedir="@rtm_includedir@"
+rtm_idldir="@rtm_idldir@"
+rtm_libdir="@rtm_libdir@"
+rtm_datadir="@rtm_datadir@"
+rtm_rtcdir="@rtm_rtcdir@"
+rtm_ecdir="@rtm_ecdir@"
+rtm_rtmdir="@rtm_rtmdir@"
+rtm_svcdir="@rtm_svcdir@"
+rtm_docdir="@rtm_docdir@"
+rtm_exampledir="@rtm_exampledir@"
+coil_includedir="@coil_includedir@"
+}
+
usage()
{
cat <<EOF
Usage: rtm-config [OPTIONS]
Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--version]
- [--cxx]
- [--cflags]
- [--libs]
- [--libdir]
- [--orb]
- [--idlc]
- [--idlflags]
+ [--prefix[=DIR]] ${prefix}
+ [--exec-prefix[=DIR]] ${exec_prefix}
+ [--data-prefix[=DIR]] ${datarootdir}
+ [--version] ${rtm_version}
+ [--cxx] ${rtm_cxx}
+ [--cflags] ${rtm_cflags}
+ [--cflags-only-I] ${rtm_cflags_I}
+ [--cflags-only-other] ${rtm_cflags_o}
+ [--libs] ${rtm_libs}
+ [--libs-only-l] ${rtm_libs_l}
+ [--libs-only-L] ${rtm_libs_L}
+ [--libs-only-other] ${rtm_libs_o}
+ [--libdir] ${rtm_libdir}
+ [--orb] ${rtm_orb}
+ [--idlc] ${rtm_idlc}
+ [--idlflags] ${rtm_idlflags}
+ [--idlflags-only-I] ${rtm_idlflags_I}
+ [--idlflags-only-other] ${rtm_idlflags_o}
+Advanced Options:
+ [--rtm-includedir] ${rtm_includedir}
+ [--rtm-idldir] ${rtm_idldir}
+ [--rtm-libdir] ${rtm_libdir}
+ [--rtm-datadir] ${rtm_datadir}
+ [--rtm-rtcdir] ${rtm_rtcdir}
+ [--rtm-ecdir] ${rtm_ecdir}
+ [--rtm-rtmdir] ${rtm_rtmdir}
+ [--rtm-svcdir] ${rtm_svcdir}
+ [--rtm-docdir] ${rtm_docdir}
+ [--rtm-exampledir] ${rtm_exampledir}
+ [--coil-includedir] ${coil_includedir}
EOF
exit $1
@@ -40,29 +99,42 @@
while test $# -gt 0; do
case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ --*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
*) optarg= ;;
esac
-
case $1 in
+ --help|-h)
+ init_variables
+ usage 1 1>&2
+ ;;
--prefix=*)
prefix=$optarg
- if test $exec_prefix_set = no ; then
+ if test "x$exec_prefix_set" = "x" ; then
exec_prefix=$optarg
fi
+ if test "x$data_prefix_set" = "x" ; then
+ data_prefix=$optarg
+ fi
;;
--prefix)
echo_prefix=yes
;;
--exec-prefix=*)
- rtm_exec_prefix=$optarg
+ exec_prefix=$optarg
exec_prefix_set=yes
;;
--exec-prefix)
echo_exec_prefix=yes
;;
+ --data-prefix=*)
+ datarootdir=$optarg
+ data_prefix_set=yes
+ ;;
+ --data-prefix)
+ echo_data_prefix=yes
+ ;;
--version)
- echo $rtm_version
+ echo_rtm_version=yes
;;
--cxx)
echo_cxx=yes
@@ -70,9 +142,24 @@
--cflags)
echo_cflags=yes
;;
+ --cflags-only-I)
+ echo_cflags_I=yes
+ ;;
+ --cflags-only-other)
+ echo_cflags_o=yes
+ ;;
--libs)
echo_libs=yes
;;
+ --libs-only-l)
+ echo_libs_l=yes
+ ;;
+ --libs-only-L)
+ echo_libs_L=yes
+ ;;
+ --libs-only-other)
+ echo_libs_o=yes
+ ;;
--libdir)
echo_libdir=yes
;;
@@ -85,45 +172,103 @@
--idlflags)
echo_idlflags=yes
;;
+ --idlflags-only-I)
+ echo_idlflags_I=yes
+ ;;
+ --idlflags-only-other)
+ echo_idlflags_o=yes
+ ;;
*)
- usage 1 1>&2
+ init_variables
+ optstr0=`echo $1 | sed -e 's/^\-\-//'`
+ optstr=`echo $optstr0 | sed -e 's/-/_/g'`
+ variable=`eval echo \$"$optstr"`
+ if test "x$variable" = "x"; then
+ echo "Unknown option: " $1
+ usage 1 1>&2
+ else
+ variable_exists=yes
+ variables="$variables \$$optstr"
+ fi
;;
esac
shift
done
+init_variables
+
if test "$echo_prefix" = "yes"; then
- echo $rtm_prefix
+ echo $prefix
fi
if test "$echo_exec_prefix" = "yes"; then
- echo $rtm_exec_prefix
+ echo $exec_prefix
fi
+if test "$echo_data_prefix" = "yes"; then
+ echo $datarootdir
+fi
+
+if test "$echo_rtm_version" = "yes"; then
+ echo $rtm_version
+fi
+
if test "$echo_cxx" = "yes"; then
- echo $rtm_cxx
+ echo $rtm_cxx
fi
if test "$echo_cflags" = "yes"; then
- echo $rtm_cflags
+ echo $rtm_cflags
fi
+if test "$echo_cflags_I" = "yes"; then
+ echo $rtm_cflags_I
+fi
+
+if test "$echo_cflags_o" = "yes"; then
+ echo $rtm_cflags_o
+fi
+
if test "$echo_libs" = "yes"; then
- echo $rtm_libs
-fi
+ echo $rtm_libs
+fi
+if test "$echo_libs_l" = "yes"; then
+ echo $rtm_libs_l
+fi
+
+if test "$echo_libs_L" = "yes"; then
+ echo $rtm_libs_L
+fi
+
+if test "$echo_libs_o" = "yes"; then
+ echo $rtm_libs_o
+fi
+
if test "$echo_libdir" = "yes"; then
- echo $rtm_libdir
-fi
+ echo $rtm_libdir
+fi
if test "$echo_orb" = "yes"; then
- echo $rtm_orb
-fi
+ echo $rtm_orb
+fi
if test "$echo_idlc" = "yes"; then
- echo $rtm_idlc
-fi
+ echo $rtm_idlc
+fi
if test "$echo_idlflags" = "yes"; then
- echo $rtm_idlflags
-fi
+ echo $rtm_idlflags
+fi
+
+if test "$echo_idlflags_I" = "yes"; then
+ echo $rtm_idlflags_I
+fi
+
+if test "$echo_idlflags_o" = "yes"; then
+ echo $rtm_idlflags_o
+fi
+
+if test "$variable_exists" = "yes"; then
+ eval echo $variables
+fi
Copied: branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/test.sh (from rev 2330, trunk/OpenRTM-aist/utils/rtm-config/test.sh)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/test.sh (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/test.sh 2012-02-22 08:26:23 UTC (rev 2333)
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+rtm_config_test()
+{
+echo "------------------------------------------------------------"
+echo "cmd:" $*
+echo "------------------------------------------------------------"
+echo "Prefix : " `$cmd --prefix`
+echo "Exec Prefix : " `$cmd --exec-prefix`
+echo "Data Prefix : " `$cmd --data-prefix`
+echo "Version : " `$cmd --version`
+echo "CXX : " `$cmd --cxx`
+echo "Cflags : " `$cmd --cflags`
+echo "Cflags -I : " `$cmd --cflags-only-I`
+echo "Cflags other : " `$cmd --cflags-only-other`
+echo "Libs : " `$cmd --libs`
+echo "Libs -l : " `$cmd --libs-only-l`
+echo "Libs -L : " `$cmd --libs-only-L`
+echo "Libs other : " `$cmd --libs-only-other`
+echo "Lib Dir : " `$cmd --libdir`
+echo "ORB : " `$cmd --orb`
+echo "IDLC : " `$cmd --idlc`
+echo "IDLFLAGS : " `$cmd --idlflags`
+echo "IDLFLAGS -I : " `$cmd --idlflags-only-I`
+echo "IDLFLAGS other: " `$cmd --idlflags-only-other`
+echo "RTM inc dir : " `$cmd --rtm-includedir`
+echo "RTM IDL dir : " `$cmd --rtm-idldir`
+echo "RTM lib dir : " `$cmd --rtm-libdir`
+echo "RTM data dir : " `$cmd --rtm-datadir`
+echo "RTM rtcd dir : " `$cmd --rtm-rtcdir`
+echo "RTM EC dir : " `$cmd --rtm-ecdir`
+echo "RTM rtm dir : " `$cmd --rtm-rtmdir`
+echo "RTM svc dir : " `$cmd --rtm-svcdir`
+echo "RTM doc dir : " `$cmd --rtm-docdir`
+echo "RTM exp dir : " `$cmd --rtm-exampledir`
+echo "coil inc dir : " `$cmd --coil-includedir`
+}
+
+cmd="./rtm-config"
+rtm_config_test $cmd
+cmd="./rtm-config --prefix=/opt"
+rtm_config_test $cmd
+cmd="./rtm-config --prefix=/opt --exec-prefix=/Applications"
+rtm_config_test $cmd
+cmd="./rtm-config --prefix=/opt --exec-prefix=/Applications --data-prefix=/var"
+rtm_config_test $cmd
+
+echo "------------------------------------------------------------"
Copied: branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/test_pc.sh (from rev 2330, trunk/OpenRTM-aist/utils/rtm-config/test_pc.sh)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/test_pc.sh (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtm-config/test_pc.sh 2012-02-22 08:26:23 UTC (rev 2333)
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+pkg_config_test()
+{
+echo "------------------------------------------------------------"
+echo " cmd:" $1
+echo "------------------------------------------------------------"
+echo "Prefix : " `$cmd --variable=prefix`
+echo "Exec Prefix : " `$cmd --variable=exec_prefix`
+echo "Data Prefix : " `$cmd --variable=data_prefix`
+echo "Version : " `$cmd --modversion`
+echo "CXX : " `$cmd --variable=rtm_cxx`
+echo "Cflags : " `$cmd --cflags`
+echo "Cflags -I : " `$cmd --cflags-only-I`
+echo "Cflags other: " `$cmd --cflags-only-other`
+echo "Libs : " `$cmd --libs`
+echo "Libs static : " `$cmd --static`
+echo "Libs -L : " `$cmd --libs-only-L`
+echo "Libs -l : " `$cmd --libs-only-l`
+echo "Libs other : " `$cmd --libs-only-other`
+echo "Lib Dir : " `$cmd --variable=libdir`
+echo "ORB : " `$cmd --variable=rtm_orb`
+echo "IDLC : " `$cmd --variable=rtm_idlc`
+echo "IDLFLAGS : " `$cmd --variable=rtm_idlflags`
+echo "RTM inc dir : " `$cmd --variable=rtm_includedir`
+echo "RTM IDL dir : " `$cmd --variable=rtm_idldir`
+echo "RTM lib dir : " `$cmd --variable=rtm_libdir`
+echo "RTM data dir: " `$cmd --variable=rtm_datadir`
+echo "RTM rtcd dir: " `$cmd --variable=rtm_rtcdir`
+echo "RTM EC dir : " `$cmd --variable=rtm_ecdir`
+echo "RTM rtm dir : " `$cmd --variable=rtm_rtmdir`
+echo "RTM svc dir : " `$cmd --variable=rtm_svcdir`
+echo "RTM doc dir : " `$cmd --variable=rtm_docdir`
+echo "RTM exp dir : " `$cmd --variable=rtm_exampledir`
+echo "coil inc dir: " `$cmd --variable=coil_includedir`
+}
+export PKG_CONFIG_PATH=./
+cmd="pkg-config openrtm-aist"
+pkg_config_test $cmd
+
+echo "------------------------------------------------------------"
openrtm-commit メーリングリストの案内