[openrtm-commit:02665] r3011 - trunk/OpenRTM-aist/build
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 7月 7日 (金) 13:15:23 JST
Author: kawauchi
Date: 2017-07-07 13:15:23 +0900 (Fri, 07 Jul 2017)
New Revision: 3011
Modified:
trunk/OpenRTM-aist/build/pkg_install_debian.sh
trunk/OpenRTM-aist/build/pkg_install_fedora.sh
Log:
[compat,->RELENG_1_2] Graphviz and nkf have been added to the debian and fedora package installation script. refs #4136
Modified: trunk/OpenRTM-aist/build/pkg_install_debian.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_debian.sh 2017-07-06 08:00:45 UTC (rev 3010)
+++ trunk/OpenRTM-aist/build/pkg_install_debian.sh 2017-07-07 04:15:23 UTC (rev 3011)
@@ -18,7 +18,7 @@
Usage:
$(basename ${0}) [-l all/c++] [-r/-d/-s/-c] [-u]
- $(basename ${0}) [-l python/java] [-d/-c] [-u]
+ $(basename ${0}) [-l python/java] [-r/-d/-c] [-u]
$(basename ${0}) [-l openrtp/rtshell] [-d] [-u]
Example:
@@ -58,7 +58,7 @@
fi
base_tools="bc iputils-ping net-tools"
cxx_devel="gcc g++ make python-yaml"
-cmake_tools="cmake doxygen"
+cmake_tools="cmake doxygen graphviz nkf"
build_tools="subversion"
deb_pkg="uuid-dev libboost-filesystem-dev"
pkg_tools="build-essential debhelper devscripts"
@@ -81,18 +81,19 @@
#--------------------------------------- Python
omnipy="omniidl-python"
-python_devel="python python-pip python-pyorbit-omg"
+python_runtime="python python-pyorbit-omg"
+python_devel="python-pip $cmake_tools $omnipy"
openrtm_py_devel="openrtm-aist-python-doc"
openrtm_py_runtime="openrtm-aist-python openrtm-aist-python-example"
-python_base="$python_devel $cmake_tools"
-python_omni="$omni_runtime $omnipy"
+python_runtime_pkgs="$omni_runtime $python_runtime $openrtm_py_runtime"
+u_python_runtime_pkgs="$omni_runtime $openrtm_py_runtime"
-python_dev_pkgs="$python_base $python_omni $openrtm_py_runtime $openrtm_py_devel"
-u_python_dev_pkgs="$python_omni $openrtm_py_runtime $openrtm_py_devel"
+python_dev_pkgs="$python_runtime_pkgs $python_devel $openrtm_py_devel"
+u_python_dev_pkgs="$u_python_runtime_pkgs $omnipy $openrtm_py_devel"
-python_core_pkgs="$python_base $python_omni $build_tools"
-u_python_core_pkgs="$python_omni"
+python_core_pkgs="$omni_runtime $python_runtime $python_devel $build_tools"
+u_python_core_pkgs="$omni_runtime $omnipy"
#--------------------------------------- Java
java_devel="default-jdk"
@@ -99,10 +100,13 @@
openrtm_java_devel="openrtm-aist-java-doc"
openrtm_java_runtime="openrtm-aist-java openrtm-aist-java-example"
-java_dev_pkgs="$java_devel $omni_runtime $cmake_tools $openrtm_java_runtime $openrtm_java_devel"
+java_runtime_pkgs="$omni_runtime $java_devel $openrtm_java_runtime"
+u_java_runtime_pkgs="$omni_runtime $openrtm_java_runtime"
+
+java_dev_pkgs="$java_runtime_pkgs $cmake_tools $openrtm_java_devel"
u_java_dev_pkgs="$omni_runtime $openrtm_java_runtime $openrtm_java_devel"
-java_core_pkgs="$java_devel $omni_runtime $cmake_tools $build_tools"
+java_core_pkgs="$omni_runtime $java_devel $cmake_tools $build_tools"
u_java_core_pkgs="$omni_runtime"
#--------------------------------------- OpenRTP
@@ -399,6 +403,9 @@
if test "x$OPT_CORE" = "xtrue" ; then
select_opt_p="[python] install tool_packages for core developer"
install_packages $python_core_pkgs
+ elif test "x$OPT_RT" = "xtrue" ; then
+ select_opt_p="[python] install robot component runtime"
+ install_packages $python_runtime_pkgs
else
select_opt_p="[python] install robot component developer"
install_packages $python_dev_pkgs
@@ -409,6 +416,9 @@
if test "x$OPT_CORE" = "xtrue" ; then
select_opt_j="[java] install tool_packages for core developer"
install_packages $java_core_pkgs
+ elif test "x$OPT_RT" = "xtrue" ; then
+ select_opt_j="[java] install robot component runtime"
+ install_packages $java_runtime_pkgs
else
select_opt_j="[java] install robot component developer"
install_packages $java_dev_pkgs
@@ -422,7 +432,7 @@
if test "x$arg_rtshell" = "xtrue" ; then
select_opt_shl="[rtshell] install"
- install_packages $python_devel
+ install_packages python-pip
rtshell_ret=`pip install rtshell`
fi
}
@@ -452,6 +462,9 @@
if test "x$OPT_CORE" = "xtrue" ; then
select_opt_p="[python] uninstall tool_packages for core developer"
uninstall_packages `reverse $u_python_core_pkgs`
+ elif test "x$OPT_RT" = "xtrue" ; then
+ select_opt_p="[python] uninstall robot component runtime"
+ uninstall_packages `reverse $u_python_runtime_pkgs`
else
select_opt_p="[python] uninstall robot component developer"
uninstall_packages `reverse $u_python_dev_pkgs`
@@ -462,6 +475,9 @@
if test "x$OPT_CORE" = "xtrue" ; then
select_opt_j="[java] uninstall tool_packages for core developer"
uninstall_packages `reverse $u_java_core_pkgs`
+ elif test "x$OPT_RT" = "xtrue" ; then
+ select_opt_j="[java] uninstall robot component runtime"
+ uninstall_packages `reverse $u_java_runtime_pkgs`
else
select_opt_j="[java] uninstall robot component developer"
uninstall_packages `reverse $u_java_dev_pkgs`
@@ -547,7 +563,7 @@
=============================================
EOF
if [ $# -eq 0 ] && test "x$OPT_FLG" = "xtrue"; then
- echo "There is no installation package."
+ echo "There is no uninstall package."
return
fi
Modified: trunk/OpenRTM-aist/build/pkg_install_fedora.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_fedora.sh 2017-07-06 08:00:45 UTC (rev 3010)
+++ trunk/OpenRTM-aist/build/pkg_install_fedora.sh 2017-07-07 04:15:23 UTC (rev 3011)
@@ -17,7 +17,7 @@
Usage:
$(basename ${0}) [-l all/c++] [-r/-d/-s/-c] [-u]
- $(basename ${0}) [-l python/java] [-d/-c] [-u]
+ $(basename ${0}) [-l python/java] [-r/-d/-c] [-u]
$(basename ${0}) [-l openrtp] [-d] [-u]
Example:
@@ -51,7 +51,7 @@
#--------------------------------------- C++
autotools="autoconf automake libtool"
cxx_devel="gcc-c++ make PyYAML"
-cmake_tools="cmake doxygen"
+cmake_tools="cmake doxygen graphviz nkf"
build_tools="subversion"
rpm_pkg="uuid-devel libuuid-devel boost boost-devel"
rpm_tools="createrepo rpm-build"
@@ -74,18 +74,19 @@
#--------------------------------------- Python
omnipy="omniORBpy-devel"
-python_devel="python python-omniORB"
+python_runtime="python python-omniORB"
+python_devel="$cmake_tools $omnipy"
openrtm_py_devel="OpenRTM-aist-Python-doc"
openrtm_py_runtime="OpenRTM-aist-Python OpenRTM-aist-Python-example"
-python_base="$python_devel $cmake_tools"
-python_omni="$omni_runtime $omnipy"
+python_runtime_pkgs="$omni_runtime $python_runtime $openrtm_py_runtime"
+u_python_runtime_pkgs="$omni_runtime $openrtm_py_runtime"
-python_dev_pkgs="$python_base $python_omni $openrtm_py_runtime $openrtm_py_devel"
-u_python_dev_pkgs="$python_omni $openrtm_py_runtime $openrtm_py_devel"
+python_dev_pkgs="$python_runtime_pkgs $python_devel $openrtm_py_devel"
+u_python_dev_pkgs="$u_python_runtime_pkgs $omnipy $openrtm_py_devel"
-python_core_pkgs="$python_base $python_omni $build_tools"
-u_python_core_pkgs="$python_omni"
+python_core_pkgs="$omni_runtime $python_runtime $python_devel $build_tools"
+u_python_core_pkgs="$omni_runtime $omnipy"
#--------------------------------------- Java
java_devel="java-1.8.0-openjdk-devel"
@@ -92,10 +93,13 @@
openrtm_java_devel="OpenRTM-aist-Java-doc"
openrtm_java_runtime="OpenRTM-aist-Java OpenRTM-aist-Java-example"
-java_dev_pkgs="$java_devel $omni_runtime $cmake_tools $openrtm_java_runtime $openrtm_java_devel"
+java_runtime_pkgs="$omni_runtime $java_devel $openrtm_java_runtime"
+u_java_runtime_pkgs="$omni_runtime $openrtm_java_runtime"
+
+java_dev_pkgs="$java_runtime_pkgs $cmake_tools $openrtm_java_devel"
u_java_dev_pkgs="$omni_runtime $openrtm_java_runtime $openrtm_java_devel"
-java_core_pkgs="$java_devel $omni_runtime $cmake_tools $build_tools"
+java_core_pkgs="$omni_runtime $java_devel $cmake_tools $build_tools"
u_java_core_pkgs="$omni_runtime"
#--------------------------------------- OpenRTP
@@ -379,6 +383,9 @@
if test "x$OPT_CORE" = "xtrue" ; then
select_opt_p="[python] install tool_packages for core developer"
install_packages $python_core_pkgs
+ elif test "x$OPT_RT" = "xtrue" ; then
+ select_opt_p="[python] install robot component runtime"
+ install_packages $python_runtime_pkgs
else
select_opt_p="[python] install robot component developer"
install_packages $python_dev_pkgs
@@ -389,6 +396,9 @@
if test "x$OPT_CORE" = "xtrue" ; then
select_opt_j="[java] install tool_packages for core developer"
install_packages $java_core_pkgs
+ elif test "x$OPT_RT" = "xtrue" ; then
+ select_opt_j="[java] install robot component runtime"
+ install_packages $java_runtime_pkgs
else
select_opt_j="[java] install robot component developer"
install_packages $java_dev_pkgs
@@ -402,7 +412,7 @@
if test "x$arg_rtshell" = "xtrue" ; then
select_opt_shl="[rtshell] install"
- install_packages $python_devel
+ install_packages python-pip
rtshell_ret=`pip install rtshell`
fi
}
@@ -432,6 +442,9 @@
if test "x$OPT_CORE" = "xtrue" ; then
select_opt_p="[python] uninstall tool_packages for core developer"
uninstall_packages `reverse $u_python_core_pkgs`
+ elif test "x$OPT_RT" = "xtrue" ; then
+ select_opt_p="[python] uninstall robot component runtime"
+ uninstall_packages `reverse $u_python_runtime_pkgs`
else
select_opt_p="[python] uninstall robot component developer"
uninstall_packages `reverse $u_python_dev_pkgs`
@@ -442,6 +455,9 @@
if test "x$OPT_CORE" = "xtrue" ; then
select_opt_j="[java] uninstall tool_packages for core developer"
uninstall_packages `reverse $u_java_core_pkgs`
+ elif test "x$OPT_RT" = "xtrue" ; then
+ select_opt_j="[java] uninstall robot component runtime"
+ uninstall_packages `reverse $u_java_runtime_pkgs`
else
select_opt_j="[java] uninstall robot component developer"
uninstall_packages `reverse $u_java_dev_pkgs`
@@ -527,7 +543,7 @@
=============================================
EOF
if [ $# -eq 0 ] && test "x$OPT_FLG" = "xtrue"; then
- echo "There is no installation package."
+ echo "There is no uninstall package."
return
fi
More information about the openrtm-commit
mailing list