[openrtm-commit:02704] r3014 - trunk/OpenRTM-aist/build

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-07-26 11:45:03 +0900 (Wed, 26 Jul 2017)
New Revision: 3014

Modified:
   trunk/OpenRTM-aist/build/pkg_install_debian.sh
   trunk/OpenRTM-aist/build/pkg_install_fedora.sh
   trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh
Log:
[compat,->RELENG_1_2] Ant and git have been added to package installation script. refs #4136

Modified: trunk/OpenRTM-aist/build/pkg_install_debian.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_debian.sh	2017-07-14 08:38:34 UTC (rev 3013)
+++ trunk/OpenRTM-aist/build/pkg_install_debian.sh	2017-07-26 02:45:03 UTC (rev 3014)
@@ -56,10 +56,10 @@
 else
   autotools="autoconf libtool libtool-bin"
 fi
-base_tools="bc iputils-ping net-tools"
+base_tools="bc iputils-ping net-tools zip"
 cxx_devel="gcc g++ make python-yaml"
 cmake_tools="cmake doxygen graphviz nkf"
-build_tools="subversion"
+build_tools="subversion git"
 deb_pkg="uuid-dev libboost-filesystem-dev"
 pkg_tools="build-essential debhelper devscripts"
 omni_devel="libomniorb4-dev omniidl"
@@ -70,19 +70,19 @@
 runtime_pkgs="$omni_runtime $openrtm_runtime"
 u_runtime_pkgs=$runtime_pkgs
 
-src_pkgs="$cxx_devel $cmake_tools $deb_pkg $omni_runtime $omni_devel"
+src_pkgs="$cxx_devel $cmake_tools $deb_pkg $base_tools $omni_runtime $omni_devel"
 u_src_pkgs="$omni_runtime $omni_devel"
 
 dev_pkgs="$runtime_pkgs $src_pkgs $openrtm_devel"
 u_dev_pkgs="$u_runtime_pkgs $omni_devel $openrtm_devel"
 
-core_pkgs="$src_pkgs $autotools $base_tools $build_tools $pkg_tools"
+core_pkgs="$src_pkgs $autotools $build_tools $pkg_tools"
 u_core_pkgs="$u_src_pkgs"
 
 #--------------------------------------- Python
 omnipy="omniidl-python"
 python_runtime="python python-pyorbit-omg"
-python_devel="python-pip $cmake_tools $omnipy"
+python_devel="python-pip $cmake_tools $base_tools $omnipy"
 openrtm_py_devel="openrtm-aist-python-doc"
 openrtm_py_runtime="openrtm-aist-python openrtm-aist-python-example"
 
@@ -92,21 +92,22 @@
 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="$omni_runtime $python_runtime $python_devel $build_tools"
+python_core_pkgs="$omni_runtime $python_runtime $python_devel $build_tools $pkg_tools"
 u_python_core_pkgs="$omni_runtime $omnipy"
 
 #--------------------------------------- Java
 java_devel="default-jdk"
-openrtm_java_devel="openrtm-aist-java-doc"
-openrtm_java_runtime="openrtm-aist-java openrtm-aist-java-example"
+java_build="ant"
+openrtm_j_devel="openrtm-aist-java-doc"
+openrtm_j_runtime="openrtm-aist-java openrtm-aist-java-example"
 
-java_runtime_pkgs="$omni_runtime $java_devel $openrtm_java_runtime"
-u_java_runtime_pkgs="$omni_runtime $openrtm_java_runtime"
+java_runtime_pkgs="$omni_runtime $java_devel $openrtm_j_runtime"
+u_java_runtime_pkgs="$omni_runtime $openrtm_j_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_dev_pkgs="$java_runtime_pkgs $cmake_tools $base_tools $openrtm_j_devel"
+u_java_dev_pkgs="$omni_runtime $openrtm_j_runtime $openrtm_j_devel"
 
-java_core_pkgs="$omni_runtime $java_devel $cmake_tools $build_tools"
+java_core_pkgs="$omni_runtime $java_devel $cmake_tools $base_tools $build_tools $java_build $pkg_tools"
 u_java_core_pkgs="$omni_runtime"
 
 #--------------------------------------- OpenRTP
@@ -331,7 +332,7 @@
 install_packages () {
   for p in $*; do
     echo $msg9 $p
-    dpkg -l | grep $p > /dev/null 2>&1
+    echo $install_pkgs | grep $p > /dev/null 2>&1
     if [ $? -ne 0 ]; then
       tmp_pkg="$install_pkgs $p"
       install_pkgs=$tmp_pkg
@@ -366,9 +367,11 @@
 uninstall_packages () {
   for p in $*; do
     echo $msg11 $p
-    tmp_pkg="$uninstall_pkgs $p"
-    uninstall_pkgs=$tmp_pkg
-
+    echo $uninstall_pkgs | grep $p > /dev/null 2>&1
+    if [ $? -ne 0 ]; then
+      tmp_pkg="$uninstall_pkgs $p"
+      uninstall_pkgs=$tmp_pkg
+    fi
     apt-get --purge remove $p
     if test "$?" != 0; then
       apt-get purge $p

Modified: trunk/OpenRTM-aist/build/pkg_install_fedora.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_fedora.sh	2017-07-14 08:38:34 UTC (rev 3013)
+++ trunk/OpenRTM-aist/build/pkg_install_fedora.sh	2017-07-26 02:45:03 UTC (rev 3014)
@@ -52,7 +52,7 @@
 autotools="autoconf automake libtool"
 cxx_devel="gcc-c++ make PyYAML"
 cmake_tools="cmake doxygen graphviz nkf"
-build_tools="subversion"
+build_tools="subversion git"
 rpm_pkg="uuid-devel libuuid-devel boost boost-devel"
 rpm_tools="createrepo rpm-build"
 omni_devel="omniORB-devel omniORB-doc  omniORB-utils"
@@ -85,21 +85,22 @@
 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="$omni_runtime $python_runtime $python_devel $build_tools"
+python_core_pkgs="$omni_runtime $python_runtime $python_devel $build_tools $rpm_tools"
 u_python_core_pkgs="$omni_runtime $omnipy"
 
 #--------------------------------------- Java
 java_devel="java-1.8.0-openjdk-devel"
-openrtm_java_devel="OpenRTM-aist-Java-doc"
-openrtm_java_runtime="OpenRTM-aist-Java OpenRTM-aist-Java-example"
+java_build="ant"
+openrtm_j_devel="OpenRTM-aist-Java-doc"
+openrtm_j_runtime="OpenRTM-aist-Java OpenRTM-aist-Java-example"
 
-java_runtime_pkgs="$omni_runtime $java_devel $openrtm_java_runtime"
-u_java_runtime_pkgs="$omni_runtime $openrtm_java_runtime"
+java_runtime_pkgs="$omni_runtime $java_devel $openrtm_j_runtime"
+u_java_runtime_pkgs="$omni_runtime $openrtm_j_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_dev_pkgs="$java_runtime_pkgs $cmake_tools $openrtm_j_devel"
+u_java_dev_pkgs="$omni_runtime $openrtm_j_runtime $openrtm_j_devel"
 
-java_core_pkgs="$omni_runtime $java_devel $cmake_tools $build_tools"
+java_core_pkgs="$omni_runtime $java_devel $cmake_tools $build_tools $java_build $rpm_tools"
 u_java_core_pkgs="$omni_runtime"
 
 #--------------------------------------- OpenRTP

Modified: trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh	2017-07-14 08:38:34 UTC (rev 3013)
+++ trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh	2017-07-26 02:45:03 UTC (rev 3014)
@@ -60,7 +60,7 @@
 base_tools="bc iputils-ping net-tools"
 cxx_devel="gcc g++ make python-yaml"
 cmake_tools="cmake doxygen graphviz nkf"
-build_tools="subversion"
+build_tools="subversion git"
 deb_pkg="uuid-dev libboost-filesystem-dev"
 pkg_tools="build-essential debhelper devscripts"
 omni_devel="libomniorb4-dev omniidl"
@@ -71,19 +71,19 @@
 runtime_pkgs="$omni_runtime $openrtm_runtime"
 u_runtime_pkgs=$runtime_pkgs
 
-src_pkgs="$cxx_devel $cmake_tools $deb_pkg $omni_runtime $omni_devel"
+src_pkgs="$cxx_devel $cmake_tools $deb_pkg $base_tools $omni_runtime $omni_devel"
 u_src_pkgs="$omni_runtime $omni_devel"
 
 dev_pkgs="$runtime_pkgs $src_pkgs $openrtm_devel"
 u_dev_pkgs="$u_runtime_pkgs $omni_devel $openrtm_devel"
 
-core_pkgs="$src_pkgs $autotools $base_tools $build_tools $pkg_tools"
+core_pkgs="$src_pkgs $autotools $build_tools $pkg_tools"
 u_core_pkgs="$u_src_pkgs"
 
 #--------------------------------------- Python
 omnipy="omniidl-python"
 python_runtime="python python-pyorbit-omg"
-python_devel="python-pip $cmake_tools $omnipy"
+python_devel="python-pip $cmake_tools $base_tools $omnipy"
 openrtm_py_devel="openrtm-aist-python-doc"
 openrtm_py_runtime="openrtm-aist-python openrtm-aist-python-example"
 
@@ -93,21 +93,22 @@
 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="$omni_runtime $python_runtime $python_devel $build_tools"
+python_core_pkgs="$omni_runtime $python_runtime $python_devel $build_tools $pkg_tools"
 u_python_core_pkgs="$omni_runtime $omnipy"
 
 #--------------------------------------- Java
 java_devel="default-jdk"
-openrtm_java_devel="openrtm-aist-java-doc"
-openrtm_java_runtime="openrtm-aist-java openrtm-aist-java-example"
+java_build="ant"
+openrtm_j_devel="openrtm-aist-java-doc"
+openrtm_j_runtime="openrtm-aist-java openrtm-aist-java-example"
 
-java_runtime_pkgs="$omni_runtime $java_devel $openrtm_java_runtime"
-u_java_runtime_pkgs="$omni_runtime $openrtm_java_runtime"
+java_runtime_pkgs="$omni_runtime $java_devel $openrtm_j_runtime"
+u_java_runtime_pkgs="$omni_runtime $openrtm_j_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_dev_pkgs="$java_runtime_pkgs $cmake_tools $base_tools $openrtm_j_devel"
+u_java_dev_pkgs="$omni_runtime $openrtm_j_runtime $openrtm_j_devel"
 
-java_core_pkgs="$omni_runtime $java_devel $cmake_tools $build_tools"
+java_core_pkgs="$omni_runtime $java_devel $cmake_tools $base_tools $build_tools $java_build $pkg_tools"
 u_java_core_pkgs="$omni_runtime"
 
 #--------------------------------------- OpenRTP
@@ -327,7 +328,7 @@
 install_packages () {
   for p in $*; do
     echo $msg9 $p
-    dpkg -l | grep $p > /dev/null 2>&1
+    echo $install_pkgs | grep $p > /dev/null 2>&1
     if [ $? -ne 0 ]; then
       tmp_pkg="$install_pkgs $p"
       install_pkgs=$tmp_pkg
@@ -362,9 +363,11 @@
 uninstall_packages () {
   for p in $*; do
     echo $msg11 $p
-    tmp_pkg="$uninstall_pkgs $p"
-    uninstall_pkgs=$tmp_pkg
-
+    echo $uninstall_pkgs | grep $p > /dev/null 2>&1
+    if [ $? -ne 0 ]; then
+      tmp_pkg="$uninstall_pkgs $p"
+      uninstall_pkgs=$tmp_pkg
+    fi
     apt-get --purge remove $p
     if test "$?" != 0; then
       apt-get purge $p