From 94f53480f2cba868378ac728a514a98ca9119b1c Mon Sep 17 00:00:00 2001
From: Simon Piette <simon.piette@savoirfairelinux.com>
Date: Wed, 17 Sep 2014 15:10:53 -0400
Subject: [PATCH] build-system: get-kde.sh as a separate script
Refs #55333
Change-Id: I75ca3188301649388576dea8dc9ec561f9d168f6
---
tools/build-system/get-kde.sh | 15 +++++++++++++++
.../build-system/launch-build-machine-jenkins.sh | 11 +----------
tools/build-system/setenv.sh | 6 +++---
3 files changed, 19 insertions(+), 13 deletions(-)
create mode 100755 tools/build-system/get-kde.sh
diff --git a/tools/build-system/get-kde.sh b/tools/build-system/get-kde.sh
new file mode 100755
index 0000000000..fb502dbad1
--- /dev/null
+++ b/tools/build-system/get-kde.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Get the KDE client
+# To get all files, you have to create the tarball from scratch,
+# then extract files from it. The directory is renamed "kde".
+# $WORKSPACE is declared in setenv.sh
+set -o errexit
+source $(basename $0)/setenv.sh
+cd "$WORKSPACE"
+curl -O https://projects.kde.org/projects/playground/network/sflphone-kde/repository/revisions/master/raw/data/config.ini
+curl -O https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts/repository/revisions/master/raw/createtarball/create_tarball.rb
+ruby create_tarball.rb --noaccount --application sflphone-kde
+rm -rf kde
+rm -rf sflphone-kde-*.tar.*
+rm create_tarball.rb config.ini
+mv sflphone-kde-* kde
diff --git a/tools/build-system/launch-build-machine-jenkins.sh b/tools/build-system/launch-build-machine-jenkins.sh
index 054b4d6f2b..3187b211cd 100755
--- a/tools/build-system/launch-build-machine-jenkins.sh
+++ b/tools/build-system/launch-build-machine-jenkins.sh
@@ -16,16 +16,7 @@ done
source $(dirname $0)/setenv.sh
-# Update KDE client
-# $WORKSPACE is declared in setenv.sh
-cd "$WORKSPACE"
-curl -O https://projects.kde.org/projects/playground/network/sflphone-kde/repository/revisions/master/raw/data/config.ini
-curl -O https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts/repository/revisions/master/raw/createtarball/create_tarball.rb
-ruby create_tarball.rb -n -a sflphone-kde
-rm -rf kde
-rm -rf sflphone-kde-*.tar.*
-rm create_tarball.rb config.ini
-mv sflphone-kde-* kde
+./$(dirname $0)/get-kde.sh
IS_RELEASE=
VERSION_INDEX="1"
diff --git a/tools/build-system/setenv.sh b/tools/build-system/setenv.sh
index bc5e43966b..e65c18496d 100755
--- a/tools/build-system/setenv.sh
+++ b/tools/build-system/setenv.sh
@@ -4,6 +4,9 @@
# home directory
export ROOT_DIR=${HOME}
+# In case the script is executed manually, replace the variables set by Jenkins
+export WORKSPACE=${WORKSPACE:=.}
+
# gpg passphrase file
export GPG_FILE="${WORKSPACE}/.gpg-sflphone"
@@ -11,9 +14,6 @@ export EDITOR="echo"
export REFERENCE_REPOSITORY="${WORKSPACE}"
-# In case the script is executed manually, replace the variables set by Jenkins
-WORKSPACE=${WORKSPACE:=.}
-
export WORKING_DIR="${WORKSPACE}/tools/build-system"
export LAUNCHPAD_DIR="${WORKING_DIR}/launchpad"
export LAUNCHPAD_DISTRIBUTIONS=("trusty utopic")
--
GitLab