[openrtm-commit:01084] r581 - branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts

2013年 5月 10日 (金) 09:32:07 JST

Author: kawauchi
Date: 2013-05-10 09:32:06 +0900 (Fri, 10 May 2013)
New Revision: 581

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh
   branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh
   branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh
Log:
Python?\231?\148?\168?\228?\184?\128?\230?\139?\172?\227?\130?\164?\227?\131?\179?\227?\130?\185?\227?\131?\136?\227?\131?\188?\227?\131?\171?\227?\130?\185?\227?\130?\175?\227?\131?\170?\227?\131?\151?\227?\131?\136?\228?\191?\174?\230?\173?\163?\227?\128?\130trunk?\227?\129?\174?\229?\134?\133?\229?\174?\185?\227?\129?\171?\229?\144?\136?\227?\130?\143?\227?\129?\155?\227?\130?\139?\227?\128?\130

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh
===================================================================

--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh	2013-05-08 04:44:25 UTC (rev 580)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh	2013-05-10 00:32:06 UTC (rev 581)
@@ -6,15 +6,25 @@
 #         Shinji Kurihara
 #         Tetsuo Ando
 #         Harumi Miyamoto
+#         Nobu Kawauchi
 #
 
 #---------------------------------------
 # ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒªã‚¹ãƒˆ
 #---------------------------------------
-omnipy="python python-omniorb2-omg python-omniorb2 omniidl4-python omniorb4-nameserver"
-openrtm="openrtm-aist-python openrtm-aist-python-example"
-packages="$omnipy $openrtm"
-u_packages="$omnipy $openrtm "
+set_package_list()
+{
+	if [ "$code_name" = "sarge" ] || [ "$code_name" = "etch" ] || [ "$code_name" = "lenny" ]; then
+		omnipy="python python-omniorb2-omg python-omniorb2 omniidl4-python omniorb4-nameserver"
+	elif [ "$code_name" = "squeeze" ]; then	# 6.0
+		omnipy="python python-omniorb-omg python-omniorb omniidl-python omniorb4-nameserver"
+	else
+		omnipy="python python-omniorb-omg python-omniorb omniidl-python omniorb-nameserver"
+	fi
+	openrtm="openrtm-aist-python openrtm-aist-python-example"
+	packages="$omnipy $openrtm"
+	u_packages="$omnipy $openrtm "
+}
 
 #---------------------------------------
 # ãƒã‚±ãƒ¼ãƒ«ã®è¨€èªžç¢ºèª
@@ -55,10 +65,10 @@
 }
 
 #---------------------------------------
-# ãƒªãƒã‚¸ãƒˆãƒªã‚µãƒ¼ãƒ
+# ã‚³ãƒ¼ãƒ‰ãƒãƒ¼ãƒ å–å¾—
 #---------------------------------------
-create_srclist () {
-    cnames="sarge etch lenny"
+check_codename () {
+    cnames="sarge etch lenny squeeze wheezy"
     for c in $cnames; do
 	if test -f "/etc/apt/sources.list"; then
 	    res=`grep $c /etc/apt/sources.list`
@@ -76,6 +86,12 @@
 	echo $msg3
 	exit
     fi
+}
+
+#---------------------------------------
+# ãƒªãƒã‚¸ãƒˆãƒªã‚µãƒ¼ãƒ
+#---------------------------------------
+create_srclist () {
     openrtm_repo="deb http://www.openrtm.org/pub/Linux/debian/ $code_name main"
 }
 
@@ -150,6 +166,9 @@
 #---------------------------------------
 check_lang
 check_root
+check_codename
+set_package_list
+
 if test "x$1" = "x-u" ; then
     uninstall_packages `reverse $u_packages`
 else

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh	2013-05-08 04:44:25 UTC (rev 580)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh	2013-05-10 00:32:06 UTC (rev 581)
@@ -5,23 +5,30 @@
 # @author Noriaki Ando <n-ando at aist.go.jp>
 #         Shinji Kurihara
 #         Tetsuo Ando
+#         Nobu Kawauchi
 #
-# このシェルスクリプトは、aceおよびomniORBのパッケージをインストールし、
-# fedoraの開発環境を構築します。
+# ã“ã®ã‚·ã‚§ãƒ«ã‚¹ã‚¯ãƒªãƒ—ãƒˆã¯ã€aceãŠã‚ˆã³omniORBã®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã€
+# fedoraã®é–‹ç™ºç’°å¢ƒã‚’æ§‹ç¯‰ã—ã¾ã™ã€‚
 #
 # $Id$
 #
 
 #---------------------------------------
-# パッケージリスト
+# ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒªã‚¹ãƒˆ
 #---------------------------------------
-omnipy="python omniORB-servers omniORBpy omniORBpy-devel omniORBpy-standard"
+version_num=`cat /etc/fedora-release | awk '/Fedora/{print $3}' -`
+if [ $version_num -ge 16 ] && [ $version_num -le 18 ]; then
+	# ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ16,17,18ã®å ´åˆ
+	omnipy="python python-devel openssl-devel doxygen omniORB-servers omniORBpy omniORBpy-devel omniORBpy-standard"
+else
+	omnipy="python omniORB-servers omniORBpy omniORBpy-devel omniORBpy-standard"
+fi
 openrtm="OpenRTM-aist-Python OpenRTM-aist-Python-example"
 packages="$omnipy $openrtm"
 
 
 #----------------------------------------
-# root かどうかをチェック
+# root ã‹ã©ã†ã‹ã‚’ãƒã‚§ãƒƒã‚¯
 #----------------------------------------
 check_root () {
     if test ! `id -u` = 0 ; then
@@ -34,7 +41,7 @@
 }
 
 #---------------------------------------
-# インストール済パッケージリスト
+# ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ¸ˆãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒªã‚¹ãƒˆ
 #---------------------------------------
 rpm_qa="/tmp/yum_list.txt"
 get_pkg_list () {
@@ -45,7 +52,7 @@
 }
 
 #---------------------------------------
-# リポジトリサイト設定ファイルを生成
+# ãƒªãƒã‚¸ãƒˆãƒªã‚µã‚¤ãƒˆè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç”Ÿæˆ
 #---------------------------------------
 openrtm_repo () {
 cat <<EOF
@@ -61,13 +68,13 @@
 create_repo() {
     repo="/etc/yum.repos.d/openrtm.repo"
     if test ! -f $repo ; then
-	echo "OpenRTM-aist のリポジトリが登録されていません。"
-	echo "OpenRTM-aist のリポジトリ: "
+	echo "OpenRTM-aist ã®ãƒªãƒã‚¸ãƒˆãƒªãŒç™»éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚"
+	echo "OpenRTM-aist ã®ãƒªãƒã‚¸ãƒˆãƒª: "
 	echo "  http://www.openrtm.org/pub/Linux/Fedora/"
-	read -p "を追加します。よろしいですか？ (y/n) [y] " kick_shell
+	read -p "ã‚’è¿½åŠ ã—ã¾ã™ã€‚ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ (y/n) [y] " kick_shell
 
 	if test "x$kick_shell" = "xn" ; then
-	    echo "中断します。"
+	    echo "ä¸æ–ã—ã¾ã™ã€‚"
 	    exit 0
 	else
 	    openrtm_repo > /etc/yum.repos.d/openrtm.repo
@@ -76,7 +83,7 @@
 }
 
 #----------------------------------------
-# パッケージインストール関数
+# ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«é–¢æ•°
 #----------------------------------------
 install_packages () {
     for p in $*; do
@@ -113,7 +120,7 @@
 
 
 #------------------------------------------------------------
-# リストを逆順にする
+# ãƒªã‚¹ãƒˆã‚’é€†é †ã«ã™ã‚‹
 #------------------------------------------------------------
 reverse () {
     for i in $*; do
@@ -122,7 +129,7 @@
 }
 
 #----------------------------------------
-# パッケージをアンインストールする
+# ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹
 #----------------------------------------
 uninstall_packages () {
     for p in $*; do
@@ -134,7 +141,7 @@
 }
 
 #---------------------------------------
-# メイン
+# ãƒ¡ã‚¤ãƒ³
 #---------------------------------------
 check_root
 if test "x$1" = "x-u" ; then

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh	2013-05-08 04:44:25 UTC (rev 580)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh	2013-05-10 00:32:06 UTC (rev 581)
@@ -6,16 +6,36 @@
 #         Shinji Kurihara
 #         Tetsuo Ando
 #         Harumi Miyamoto
+#         Nobu Kawauchi
 #
 
+this_file=${0##*/}
+
+rtm_ver=`echo "$this_file" | sed -e "s/pkg_install_python_ubuntu-//g" -e "s/\.sh//g"`
+
+if test "$rtm_ver" = "pkg_install_python_ubuntu";then
+	rtm_ver=""
+else
+	rtm_ver="=$rtm_ver"
+fi
+
+echo "rtm_ver is $rtm_ver"
+
 #---------------------------------------
 # ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãƒªã‚¹ãƒˆ
 #---------------------------------------
-omnipy_old="python python-omniorb2-omg omniidl4-python omniorb4-nameserver"
-omnipy="$omnipy_old python-omniorb-omg omniidl-python omniorb-nameserver"
-openrtm="openrtm-aist-python openrtm-aist-python-example"
-packages="$omnipy $openrtm"
-u_packages="$omnipy $openrtm "
+set_package_list()
+{
+	if [ "$code_name" = "hardy" ] || [ $code_name = "lucid" ]; then
+		omnipy="python python-omniorb2-omg omniidl4-python omniorb4-nameserver"
+	else
+		# oneiric, precise, quantal
+		omnipy="python python-pyorbit-omg omniidl-python omniorb-nameserver"
+	fi
+	openrtm="openrtm-aist-python$rtm_ver openrtm-aist-python-example$rtm_ver"
+	packages="$omnipy $openrtm"
+	u_packages="$omnipy $openrtm "
+}
 
 #---------------------------------------
 # ãƒã‚±ãƒ¼ãƒ«ã®è¨€èªžç¢ºèª
@@ -54,11 +74,10 @@
 
 }
 
-
 #---------------------------------------
-# ãƒªãƒã‚¸ãƒˆãƒªã‚µãƒ¼ãƒ
+# ã‚³ãƒ¼ãƒ‰ãƒãƒ¼ãƒ å–å¾—
 #---------------------------------------
-create_srclist () {
+check_codename () {
     codename=`sed -n /DISTRIB_CODENAME=/p /etc/lsb-release`
     cnames=`echo "$codename" | sed 's/DISTRIB_CODENAME=//'`
     #cnames="sarge edgy feisty gutsy hardy intrepid"
@@ -79,6 +98,12 @@
 	echo $msg3
 	exit
     fi
+}
+
+#---------------------------------------
+# ãƒªãƒã‚¸ãƒˆãƒªã‚µãƒ¼ãƒ
+#---------------------------------------
+create_srclist () {
     openrtm_repo="deb http://www.openrtm.org/pub/Linux/ubuntu/ $code_name main"
 }
 
@@ -153,6 +178,9 @@
 #---------------------------------------
 check_lang
 check_root
+check_codename
+set_package_list
+
 if test "x$1" = "x-u" ; then
     uninstall_packages `reverse $u_packages`
 else

