diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/common/include-apps-build-app.sh | 24 | ||||
| -rw-r--r-- | jjb/common/include-apps-prepare-upload-folder-merged.sh | 17 | ||||
| -rw-r--r-- | jjb/common/include-apps-prepare-upload-folder.sh | 16 |
3 files changed, 45 insertions, 12 deletions
diff --git a/jjb/common/include-apps-build-app.sh b/jjb/common/include-apps-build-app.sh index d79c88eb..91105eae 100644 --- a/jjb/common/include-apps-build-app.sh +++ b/jjb/common/include-apps-build-app.sh @@ -73,11 +73,31 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); t # Fixme: use aglbuild script set -x + export DONE=0 export isAUTOBUILD=0 + if [[ -f autobuild/agl/autobuild ]] + then + mkdir -p $(pwd)/package/ + chmod a+x autobuild/agl/autobuild + autobuild/agl/autobuild package DEST=$(pwd)/package + export isAUTOBUILD=1 + export DONE=1 + else + echo "Your binding doesn't use an autobuild script. Please add it in your project." + echo "It has to be stored in your root project directory in autobuild/agl/autobuild file" + echo "and be able to generate an AGL package in the build root directory using the call" + echo "autobuild/agl/autobuild package DEST=build" + fi + + ###################################################################### + # /!\/!\/!\ DEPRECATED FALLBACK WAY TO BUILD AGL APPS /!\/!\/!\ # + ###################################################################### + export isCMAKE=0 export isMAKE=0 export isQMAKE=0 + if test x"0" = x"$DONE" -a -f conf.d/autobuild/agl/autobuild ; then mkdir -p $(pwd)/package/ conf.d/autobuild/agl/autobuild package DEST=$(pwd)/package/ @@ -113,6 +133,10 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); t export isQMAKE=1 export DONE=1 fi + ###################################################################### + # /!\/!\/!\ Ends Here /!\/!\/!\ # + ###################################################################### + popd HANDLED="yes" diff --git a/jjb/common/include-apps-prepare-upload-folder-merged.sh b/jjb/common/include-apps-prepare-upload-folder-merged.sh index a5dc0152..2847a7bd 100644 --- a/jjb/common/include-apps-prepare-upload-folder-merged.sh +++ b/jjb/common/include-apps-prepare-upload-folder-merged.sh @@ -44,12 +44,6 @@ export DEST=$(pwd)/UPLOAD/${PROJECTPATTERN} pushd ${MYPROJECT} pwd -if test x"$isCMAKE" = x"1" ; then - echo "isCMAKE" - # use cmake build/package folder for wgt's ... - ls build/package/ || true - cp build/package/*.wgt $DEST -fi if test x"$isAUTOBUILD" = x"1" ; then echo "isAUTOBUILD" if [ "$(ls -l package/*.wgt | wc -l)" = "1" ] ; then @@ -62,6 +56,17 @@ if test x"$isAUTOBUILD" = x"1" ; then cp build/package/*.wgt $DEST fi fi + +###################################################################### +# /!\/!\/!\ DEPRECATED FALLBACK WAY TO BUILD AGL APPS /!\/!\/!\ # +###################################################################### + +if test x"$isCMAKE" = x"1" ; then + echo "isCMAKE" + # use cmake build/package folder for wgt's ... + ls build/package/ || true + cp build/package/*.wgt $DEST +fi if test x"$isMAKE" = x"1" ; then echo "isMAKE" # use just ./package/ for wgt's diff --git a/jjb/common/include-apps-prepare-upload-folder.sh b/jjb/common/include-apps-prepare-upload-folder.sh index 83b939a3..7bb69fe4 100644 --- a/jjb/common/include-apps-prepare-upload-folder.sh +++ b/jjb/common/include-apps-prepare-upload-folder.sh @@ -25,12 +25,6 @@ pushd ${MYPROJECT} pwd ls -alh -if test x"$isCMAKE" = x"1" ; then - echo "isCMAKE" - # use cmake build/package folder for wgt's ... - ls build/package/ || true - cp build/package/*.wgt $DEST -fi if test x"$isAUTOBUILD" = x"1" ; then if [ "$(ls -l package/*.wgt | wc -l)" = "1" ] ; then echo "isAUTOBUILD" @@ -43,6 +37,16 @@ if test x"$isAUTOBUILD" = x"1" ; then cp build/package/*.wgt $DEST fi fi +###################################################################### +# /!\/!\/!\ DEPRECATED FALLBACK WAY TO BUILD AGL APPS /!\/!\/!\ # +###################################################################### + +if test x"$isCMAKE" = x"1" ; then + echo "isCMAKE" + # use cmake build/package folder for wgt's ... + ls build/package/ || true + cp build/package/*.wgt $DEST +fi if test x"$isMAKE" = x"1" ; then echo "isMAKE" # use just ./package/ for wgt's |