Browse Source

Cleanup, update carla

tags/v2.3.0-RC2
falkTX 2 years ago
parent
commit
66a97b67ad
3 changed files with 8 additions and 36 deletions
  1. +1
    -1
      Carla
  2. +1
    -1
      PawPaw
  3. +6
    -34
      build.sh

+ 1
- 1
Carla

@@ -1 +1 @@
Subproject commit 2d6b710b1eb7eabe9bbf9a00ab4182df2b896e74
Subproject commit 8684782eb6943d662c89021971e2dbc1b883599a

+ 1
- 1
PawPaw

@@ -1 +1 @@
Subproject commit 016f7d3be034f2fa98c80748d7a42fcb927a2553
Subproject commit 5a492ee61cb9b5d2b5527dc0d83014655ed6d418

+ 6
- 34
build.sh View File

@@ -35,7 +35,10 @@ BUILD_VERSION=$((${LAST_BUILD_VERSION} + 1))

mkdir -p ${PAWPAW_BUILDDIR}
echo ${BOOTSTRAP_VERSION} > ${PAWPAW_BUILDDIR}/.last-bootstrap-version
echo ${BUILD_VERSION} > ${PAWPAW_BUILDDIR}/.last-build-version

if [ ${BUILD_VERSION} -lt 4 ]; then
echo ${BUILD_VERSION} > ${PAWPAW_BUILDDIR}/.last-build-version
fi

echo "Carla-Releases build v${BUILD_VERSION}"

@@ -49,45 +52,14 @@ if [ ${BUILD_VERSION} -eq 1 ]; then
fi

if [ ${BUILD_VERSION} -eq 2 ]; then
# qt build takes too long on macos-universal target, download and use premade builds
if [ "${TARGET}" = "macos-universal" ]; then
CROSS_COMPILING=0
MACOS=1
MACOS_OLD=0
MACOS_UNIVERSAL=1
WIN32=0
source "${TRAVIS_BUILD_DIR}/PawPaw/setup/versions.sh"
mkdir -p "${PAWPAW_BUILDDIR}/qtbase-everywhere-src-${QT5_VERSION}"
touch "${PAWPAW_BUILDDIR}/qtbase-everywhere-src-${QT5_VERSION}/.stamp_configured"
touch "${PAWPAW_BUILDDIR}/qtbase-everywhere-src-${QT5_VERSION}/.stamp_built"
touch "${PAWPAW_BUILDDIR}/qtbase-everywhere-src-${QT5_VERSION}/.stamp_installed"
touch "${PAWPAW_BUILDDIR}/qtbase-everywhere-src-${QT5_VERSION}/.stamp_applied_01_force-10.12-universal-build.patch"
mkdir -p "${PAWPAW_BUILDDIR}/qtmacextras-everywhere-src-${QT5_VERSION}"
touch "${PAWPAW_BUILDDIR}/qtmacextras-everywhere-src-${QT5_VERSION}/.stamp_configured"
touch "${PAWPAW_BUILDDIR}/qtmacextras-everywhere-src-${QT5_VERSION}/.stamp_built"
touch "${PAWPAW_BUILDDIR}/qtmacextras-everywhere-src-${QT5_VERSION}/.stamp_installed"
mkdir -p "${PAWPAW_BUILDDIR}/qtsvg-everywhere-src-${QT5_VERSION}"
touch "${PAWPAW_BUILDDIR}/qtsvg-everywhere-src-${QT5_VERSION}/.stamp_configured"
touch "${PAWPAW_BUILDDIR}/qtsvg-everywhere-src-${QT5_VERSION}/.stamp_built"
touch "${PAWPAW_BUILDDIR}/qtsvg-everywhere-src-${QT5_VERSION}/.stamp_installed"
mkdir -p "${PAWPAW_BUILDDIR}/qttools-everywhere-src-${QT5_VERSION}"
touch "${PAWPAW_BUILDDIR}/qttools-everywhere-src-${QT5_VERSION}/.stamp_configured"
touch "${PAWPAW_BUILDDIR}/qttools-everywhere-src-${QT5_VERSION}/.stamp_built"
touch "${PAWPAW_BUILDDIR}/qttools-everywhere-src-${QT5_VERSION}/.stamp_installed"
pushd "${PAWPAW_DIR}/targets"
curl -L "https://falktx.com/data/pawpaw-qt-macos-universal.tar.xz" -o "pawpaw-qt-macos-universal.tar.xz" --fail
tar xvf pawpaw-qt-macos-universal.tar.xz
popd
fi
${TRAVIS_BUILD_DIR}/PawPaw/bootstrap-qt.sh ${TARGET}
${TRAVIS_BUILD_DIR}/PawPaw/.cleanup.sh ${TARGET}
exit 0
fi

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

if [ ${BUILD_VERSION} -eq 3 ]; then
${TRAVIS_BUILD_DIR}/PawPaw/bootstrap-carla.sh ${TARGET}
${TRAVIS_BUILD_DIR}/PawPaw/.cleanup.sh ${TARGET}
exit 0
fi



Loading…
Cancel
Save