[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/build-kde-org/development] /: Save to fullpath on master
From:       Torgny Nyblom <nyblom () kde ! org>
Date:       2012-07-24 19:57:45
Message-ID: 20120724195745.C80A1A6094 () git ! kde ! org
[Download RAW message or body]

Git commit f845e2815145aa3c7e7f4028efd3dd769e8ec36d by Torgny Nyblom.
Committed on 24/07/2012 at 21:57.
Pushed by tnyblom into branch 'development'.

Save to fullpath on master

M  +3    -3    execute-job.sh

http://commits.kde.org/websites/build-kde-org/f845e2815145aa3c7e7f4028efd3dd769e8ec36d


diff --git a/execute-job.sh b/execute-job.sh
index 966a28c..fa5db28 100755
--- a/execute-job.sh
+++ b/execute-job.sh
@@ -151,8 +151,8 @@ function sync_to_master() {
 	if [[ "${MASTER}" != "${LOCALHOST}" ]]; then
 		echo "=> Syncing changes with master (\"${MASTER}\")..."
 		if [[ -z "${FAKE_EXECUTION}" ]] || [[ "${FAKE_EXECUTION}" == "false" ]]; then
-			ssh ${MASTER} mkdir -p "${ROOT}/install/${PROJECT}/${BRANCH}"
-			rsync ${RSYNC_OPTS} "${ROOT}/install/${PROJECT}/${REAL_BRANCH}/" \
"${MASTER}:${ROOT}/install/${PROJECT_PATH}/${BRANCH}/" +			ssh ${MASTER} mkdir -p \
"${ROOT}/install/${PROJECT_PATH}/${BRANCH}" +			rsync ${RSYNC_OPTS} \
"${ROOT}/install/${PROJECT_PATH}/${REAL_BRANCH}/" \
"${MASTER}:${ROOT}/install/${PROJECT_PATH}/${BRANCH}/"  fi
 		echo "=> done"
 	else
@@ -267,7 +267,7 @@ function main() {
 			fi
 
 			if [[ -z "${FAKE_EXECUTION}" ]] || [[ "${FAKE_EXECUTION}" == "false" ]]; then
-				${JENKINS_SLAVE_HOME}/cmake.sh ${EXTRA_VARS} \
-DCMAKE_INSTALL_PREFIX=${ROOT}/install/${PROJECT}/${REAL_BRANCH} .. \
+				${JENKINS_SLAVE_HOME}/cmake.sh ${EXTRA_VARS} \
-DCMAKE_INSTALL_PREFIX=${ROOT}/install/${PROJECT_PATH}/${REAL_BRANCH} ..  \
${JENKINS_SLAVE_HOME}/make.sh  ${JENKINS_SLAVE_HOME}/make.sh install
 			fi


[prev in list] [next in list] [prev in thread] [next in thread]