tb/tb_internals.sh | 8 ++++----
tb/tb_phases.sh | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 6468079dcdde5e608c959fff7b58a1f9788e29c4
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Thu Feb 28 00:13:55 2013 -0600
tb: in autogen keep in mind that possibly SRCDIR <> BUILDDIR
diff --git a/tb/tb_phases.sh b/tb/tb_phases.sh
index 0d9f2e8..7472198 100644
--- a/tb/tb_phases.sh
+++ b/tb/tb_phases.sh
@@ -22,7 +22,7 @@ pre_autogen()
canonical_do_autogen()
{
if [ "${R}" = "0" ] ; then
- if ! ${TB_NICE} ./autogen.sh > "tb_${B}_autogen.log" 2>&1 ; then
+ if ! ${TB_NICE} ${TB_GIT_DIR?}/autogen.sh > "tb_${B}_autogen.log" 2>&1
; then
tb_REPORT_LOG=tb_${B}_autogen.log
tb_REPORT_MSGS="autogen/configure failed - error is:"
R=1
commit 9ac8af91a7501b04da4ef82b22560370e4515dc3
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Thu Feb 28 00:13:25 2013 -0600
tb: bug in branch check. need to pass the branch name
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index e977be7..110537a 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -213,7 +213,7 @@ check_branch_profile_gerrit()
exit -1;
fi
- check_branch_profile_common
+ check_branch_profile_common "${b?}"
# if CCACHE_DIR is set it has been set by the branch's profile
# if TB_CCACHE_SIZE is set make sure the cache is as big as specified
@@ -249,7 +249,7 @@ check_branch_profile_tb()
exit -1;
fi
- check_branch_profile_common
+ check_branch_profile_common "${b?}"
if [ -z "${TB_TINDERBOX_BRANCH}" ] ; then
TB_TINDERBOX_BRANCH=$(determine_default_tinderbox_branch "${b?}")
@@ -1550,7 +1550,7 @@ source_branch_level_config()
local t="$2"
if [ -f "${tb_PROFILE_DIR?}/branches/${b?}/config" ] ; then
- source "${tb_PROFILE_DIR?}/branches/${B?}/config"
+ source "${tb_PROFILE_DIR?}/branches/${b?}/config"
fi
if [ -f "${tb_PROFILE_DIR?}/branches/${b?}/config_${t?}" ] ; then
source "${tb_PROFILE_DIR?}/branches/${b?}/config_${t?}"
@@ -1560,7 +1560,7 @@ source_branch_level_config()
TB_TINDERBOX_BRANCH=$(determine_default_tinderbox_branch "${b?}")
fi
if [ -f "${tb_PROFILE_DIR?}/branches/${b?}/phase.sh" ] ; then
- source "${tb_PROFILE_DIR?}/branches/${B?}/phase.sh"
+ source "${tb_PROFILE_DIR?}/branches/${b?}/phase.sh"
fi
if [ -f "${tb_PROFILE_DIR?}/branches/${b?}/phase_${t?}.sh" ] ; then
source "${tb_PROFILE_DIR?}/branches/${b?}/phase_${t?}.sh"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
