Browse Source

Cleanup

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.3.0-RC1
falkTX 7 months ago
parent
commit
9ffb431649
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 14 additions and 8 deletions
  1. +1
    -1
      .travis/before_install.sh
  2. +13
    -7
      build.sh

+ 1
- 1
.travis/before_install.sh View File

@@ -2,7 +2,7 @@

set -e

if [ "${TARGET}" = "macos" ]; then
if [ "${TARGET}" = "macos" ] || [ "${TARGET}" = "macos-universal" ]; then
exit 0
fi



+ 13
- 7
build.sh View File

@@ -14,12 +14,7 @@ if [ -z "${target}" ]; then
fi

# ---------------------------------------------------------------------------------------------------------------------

pushd PawPaw
source local.env ${target}
popd

# ---------------------------------------------------------------------------------------------------------------------
# check if building from scratch

if [ -e ${PAWPAW_BUILDDIR}/.last-bootstrap-version ]; then
LAST_BOOTSTRAP_VERSION=$(cat ${PAWPAW_BUILDDIR}/.last-bootstrap-version)
@@ -31,19 +26,30 @@ mkdir -p ${PAWPAW_BUILDDIR}
echo ${BOOTSTRAP_VERSION} > ${PAWPAW_BUILDDIR}/.last-bootstrap-version

# ---------------------------------------------------------------------------------------------------------------------

# stop at qt build if bootstrap environment starts from scratch

if [ ${LAST_BOOTSTRAP_VERSION} -ne ${BOOTSTRAP_VERSION} ]; then
${TRAVIS_BUILD_DIR}/PawPaw/bootstrap-qt.sh ${TARGET}
${TRAVIS_BUILD_DIR}/PawPaw/.cleanup.sh ${TARGET}
exit 0
fi

# ---------------------------------------------------------------------------------------------------------------------
# build dependencies

${TRAVIS_BUILD_DIR}/PawPaw/bootstrap-carla.sh ${TARGET}
${TRAVIS_BUILD_DIR}/PawPaw/.cleanup.sh ${TARGET}

# ---------------------------------------------------------------------------------------------------------------------
# import PawPaw environment

pushd PawPaw
source local.env ${target}
popd

# ---------------------------------------------------------------------------------------------------------------------
# build and package carla

pushd Carla
make features
make EXTERNAL_PLUGINS=false ${MAKE_ARGS}


Loading…
Cancel
Save