[openrtm-commit:01484] r2584 - in branches/RELENG_1_1/OpenRTM-aist: . build docs src/lib/coil/common
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 10月 21日 (火) 12:58:24 JST
Author: kawauchi
Date: 2014-10-21 12:58:24 +0900 (Tue, 21 Oct 2014)
New Revision: 2584
Modified:
branches/RELENG_1_1/OpenRTM-aist/
branches/RELENG_1_1/OpenRTM-aist/build/pkg_install100_vine.sh
branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh
branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh
branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh
branches/RELENG_1_1/OpenRTM-aist/docs/doxygen_classref.conf
branches/RELENG_1_1/OpenRTM-aist/docs/doxygen_idlref.conf
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Properties.cpp
Log:
Merged r2568,2573,2574
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
+ /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,2573-2574
Modified: branches/RELENG_1_1/OpenRTM-aist/build/pkg_install100_vine.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/pkg_install100_vine.sh 2014-10-21 02:29:26 UTC (rev 2583)
+++ branches/RELENG_1_1/OpenRTM-aist/build/pkg_install100_vine.sh 2014-10-21 03:58:24 UTC (rev 2584)
@@ -18,7 +18,8 @@
# リポジトリサーバ
#---------------------------------------
openrtm_repo="rpm http://$reposerver/pub/Linux/Vine/apt $vinever/\$(ARCH) main"
-reposervers="www.openrtm.org www.openrtm.de"
+default_reposerver="openrtm.org"
+reposervers="openrtm.org"
reposerver=""
#---------------------------------------
@@ -66,7 +67,8 @@
done
if test "x$nearhost" = "x"; then
echo "Repository servers unreachable.", $hosts
- exit 1
+ echo "Check your internet connection. (or are you using proxy?)"
+ nearhost=$default_reposerver
fi
reposerver=$nearhost
}
Modified: branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh 2014-10-21 02:29:26 UTC (rev 2583)
+++ branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh 2014-10-21 03:58:24 UTC (rev 2584)
@@ -27,7 +27,8 @@
packages="$devel $omni $pyyaml $openrtm"
u_packages="$omni $ace $openrtm "
-reposervers="www.openrtm.org www.openrtm.de"
+default_reposerver="openrtm.org"
+reposervers="openrtm.org"
reposerver=""
}
@@ -112,7 +113,8 @@
done
if test "x$nearhost" = "x"; then
echo "Repository servers unreachable.", $hosts
- exit 1
+ echo "Check your internet connection. (or are you using proxy?)"
+ nearhost=$default_reposerver
fi
reposerver=$nearhost
}
Modified: branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh 2014-10-21 02:29:26 UTC (rev 2583)
+++ branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh 2014-10-21 03:58:24 UTC (rev 2584)
@@ -29,7 +29,8 @@
devel="gcc-c++ uuid-devel libuuid-devel"
packages="$devel $omni $openrtm"
-reposervers="www.openrtm.org www.openrtm.de"
+default_reposerver="openrtm.org"
+reposervers="openrtm.org"
reposerver=""
#----------------------------------------
@@ -75,7 +76,8 @@
done
if test "x$nearhost" = "x"; then
echo "Repository servers unreachable.", $hosts
- exit 1
+ echo "Check your internet connection. (or are you using proxy?)"
+ nearhost=$default_reposerver
fi
reposerver=$nearhost
}
Modified: branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh 2014-10-21 02:29:26 UTC (rev 2583)
+++ branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh 2014-10-21 03:58:24 UTC (rev 2584)
@@ -14,12 +14,13 @@
omni="libomniorb4 libomniorb4-dev omniidl4 omniorb4-nameserver omniidl omniorb-nameserver"
ace="libace libace-dev"
openrtm="openrtm-aist openrtm-aist-doc openrtm-aist-dev openrtm-aist-example python-yaml"
-openrtm04="openrtm-aist=0.4.2-1 openrtm-aist-doc=0.4.2-1 openrtm-aist-dev=0.4.2-1 openrtm-aist-example=0.4.2-1 python-yaml"
+openrtm04="openrtm-aist=0.4.2-1 openrtm-aist-doc=0.4.2-1 openrtm-aist-dev=0.4.2-1 openrtm-aist-example=0.4.2-1 python-yaml"
devel="gcc g++ make uuid-dev libboost-filesystem-dev"
packages="$devel $omni $openrtm"
u_packages="$omni $ace $openrtm "
-reposervers="www.openrtm.org www.openrtm.de"
+default_reposerver="openrtm.org"
+reposervers="openrtm.org"
reposerver=""
#---------------------------------------
@@ -78,7 +79,8 @@
done
if test "x$nearhost" = "x"; then
echo "Repository servers unreachable.", $hosts
- exit 1
+ echo "Check your internet connection. (or are you using proxy?)"
+ nearhost=$default_reposerver
fi
reposerver=$nearhost
}
Modified: branches/RELENG_1_1/OpenRTM-aist/docs/doxygen_classref.conf
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/docs/doxygen_classref.conf 2014-10-21 02:29:26 UTC (rev 2583)
+++ branches/RELENG_1_1/OpenRTM-aist/docs/doxygen_classref.conf 2014-10-21 03:58:24 UTC (rev 2584)
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 1.0.0
+PROJECT_NUMBER = 1.1.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
Modified: branches/RELENG_1_1/OpenRTM-aist/docs/doxygen_idlref.conf
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/docs/doxygen_idlref.conf 2014-10-21 02:29:26 UTC (rev 2583)
+++ branches/RELENG_1_1/OpenRTM-aist/docs/doxygen_idlref.conf 2014-10-21 03:58:24 UTC (rev 2584)
@@ -23,7 +23,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 1.0.0
+PROJECT_NUMBER = 1.1.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
@@ -409,6 +409,12 @@
DataPort.idl \
Manager.idl \
OpenRTM.idl \
+ ExtendedDataTypes.idl \
+ InterfaceDataTypes.idl \
+ CameraCommonInterface.idl \
+ ManipulatorCommonInterface_Common.idl \
+ ManipulatorCommonInterface_DataTypes.idl \
+ ManipulatorCommonInterface_Middle.idl \
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
# should be searched for input files as well. Possible values are YES and NO.
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Properties.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2014-10-21 02:29:26 UTC (rev 2583)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2014-10-21 03:58:24 UTC (rev 2584)
@@ -346,7 +346,8 @@
coil::eraseHeadBlank(tmp);
// Skip comments or empty lines
- if (tmp[0] == '#' || tmp[0] == '!' || tmp == "") continue;
+ if (tmp.empty()) { continue; }
+ if (tmp[0] == '#' || tmp[0] == '!') { continue; }
// line-end '\' continues entry
if (tmp[tmp.size() - 1] == '\\' && !coil::isEscaped(tmp, tmp.size() - 1))
@@ -358,7 +359,7 @@
pline += tmp;
// Skip empty line (made of only ' ' or '\t')
- if (pline == "") continue;
+ if (pline.empty()) { continue; }
std::string key, value;
splitKeyValue(pline, key, value);
More information about the openrtm-commit
mailing list