From 95fab5661547c55069efc5dca9d9e764bf9b2bfd Mon Sep 17 00:00:00 2001
From: Simon Piette <simon.piette@savoirfairelinux.com>
Date: Thu, 18 Sep 2014 18:51:32 -0400
Subject: [PATCH] build-system: jenkins build script support for 1.4.x
Refs #55550
Change-Id: I9c3d1a7bf4db7d11ccc6ecb2d88ca22f94249ae2
---
.../launch-build-machine-jenkins.sh | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/tools/build-system/launch-build-machine-jenkins.sh b/tools/build-system/launch-build-machine-jenkins.sh
index 008ce8d40f..fd6e661397 100755
--- a/tools/build-system/launch-build-machine-jenkins.sh
+++ b/tools/build-system/launch-build-machine-jenkins.sh
@@ -274,12 +274,17 @@ END
cd ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}
if [ "${DIRNAME}" == "daemon" ]; then
- mkdir -p contrib/native
- pushd contrib/native
- ../bootstrap
- # only fetch it, don't build it
- make iax
- popd
+ if [ -d contrib ]; then
+ mkdir -p contrib/native
+ pushd contrib/native
+ ../bootstrap
+ # only fetch it, don't build it
+ make iax
+ else
+ pushd libs
+ ./compile_pjsip.sh
+ fi
+ popd
fi
if [ "${LAUNCHPAD_PACKAGE}" != "sflphone-kde" ]; then
./autogen.sh
--
GitLab