From 6e9708c9e49bfe2808de8cf11964c29354174712 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer <volker.hilsheimer@qt.io> Date: Thu, 6 Jun 2019 11:57:37 +0200 Subject: [PATCH] Pass make target to job --- minicoin/jobs/build-project/main.cmd | 5 ++--- minicoin/jobs/build-project/main.sh | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/minicoin/jobs/build-project/main.cmd b/minicoin/jobs/build-project/main.cmd index dfaee64..987c676 100644 --- a/minicoin/jobs/build-project/main.cmd +++ b/minicoin/jobs/build-project/main.cmd @@ -22,13 +22,12 @@ echo Building '%projectpath%' into '%projectname%' mkdir %projectname% if exist %USERPROFILE%\make.bat ( - call %USERPROFILE%\make.bat %projectpath% %projectname% + call %USERPROFILE%\make.bat %projectpath% %projectname% !PARAM_make! ) else ( cd %projectname% call %USERPROFILE%\qmake.bat "%projectpath%" echo Using %MAKETOOL% - %MAKETOOL% clean - %MAKETOOL% + %MAKETOOL% !PARAM_make! ) echo Project '%projectname%' built successfully diff --git a/minicoin/jobs/build-project/main.sh b/minicoin/jobs/build-project/main.sh index d8fad56..ee82f3b 100755 --- a/minicoin/jobs/build-project/main.sh +++ b/minicoin/jobs/build-project/main.sh @@ -8,16 +8,15 @@ if [[ $sources == "" ]]; then exit 1 fi -echo "Building project in $sources" +echo "Building project in '$sources'" project=$(basename $sources) -mkdir $project > /dev/null +mkdir $project > /dev/null 2>&1 if [[ -f "$HOME/make" ]]; then - $HOME/make $sources $project + $HOME/make $sources $project $PARAM_make else cd $project $HOME/qmake $sources - make clean - make + make $PARAM_make fi \ No newline at end of file -- GitLab