From 1369e1f84e6391df761b5ac5e143ab6841e57f7e Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 31 Dec 2023 01:47:45 +0100 Subject: [PATCH] Use a common var name for common functions Signed-off-by: falkTX --- .github/workflows/bootstrap.yml | 2 +- bootstrap-mod.sh | 4 +- setup/functions.sh | 120 ++++++++++++++++---------------- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 1f71871..6d78ec8 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -4,7 +4,7 @@ on: push: env: - CACHE_VERSION: 7 + CACHE_VERSION: 8 DEBIAN_FRONTEND: noninteractive PAWPAW_SKIP_TESTS: 1 diff --git a/bootstrap-mod.sh b/bootstrap-mod.sh index c54c9cc..0ba7b8c 100755 --- a/bootstrap-mod.sh +++ b/bootstrap-mod.sh @@ -137,7 +137,7 @@ build_meson jack-example-tools "${JACK_EXAMPLE_TOOLS_VERSION}" "${JACK_EXAMPLE_T # --------------------------------------------------------------------------------------------------------------------- # juce-6.0 -JUCE_6_0_VERSION="6648f3fee63fce603a21d467715e4314f3766a27" +JUCE_6_0_VERSION="5a7b0760aa8ccbc92e2c3abb9ce36e8dd23427ba" JUCE_6_0_URL="https://github.com/DISTRHO/JUCE.git" JUCE_6_0_EXTRAFLAGS="" @@ -155,7 +155,7 @@ install_file juce-6.0 "${JUCE_6_0_VERSION}" "extras/Build/CMake/lv2_ttl_generato # --------------------------------------------------------------------------------------------------------------------- # juce-6.1 -JUCE_6_1_VERSION="7c23c02e47739ee77f29a9bec4d5440b59dc54d3" +JUCE_6_1_VERSION="297338ad7e8215ac1448917716b7f2eb1a663014" JUCE_6_1_URL="https://github.com/DISTRHO/JUCE.git" JUCE_6_1_EXTRAFLAGS="" diff --git a/setup/functions.sh b/setup/functions.sh index c7054cd..e8c7bfe 100644 --- a/setup/functions.sh +++ b/setup/functions.sh @@ -5,7 +5,7 @@ # --------------------------------------------------------------------------------------------------------------------- function download() { - local name="${1}" + local pkgname="${1}" local version="${2}" local dlbaseurl="${3}" local dlext="${4}" @@ -16,11 +16,11 @@ function download() { dlext="tar.gz" fi if [ -z "${dlname}" ]; then - dlname="${name}" + dlname="${pkgname}" fi local dlfile="${PAWPAW_DOWNLOADDIR}/${dlname}-${version}.${dlext}" - local dlfolder="${PAWPAW_BUILDDIR}/${name}-${version}" + local dlfolder="${PAWPAW_BUILDDIR}/${pkgname}-${version}" if [ ! -f "${dlfile}" ]; then if [ -n "${dlmethod}" ] && [ "${dlmethod}" = "git" ]; then @@ -60,8 +60,8 @@ function download() { } function copy_download() { - local name1="${1}" - local name2="${2}" + local pkgname1="${1}" + local pkgname2="${2}" local version="${3}" local dlext="${4}" @@ -69,8 +69,8 @@ function copy_download() { dlext="tar.gz" fi - local dlfile1="${PAWPAW_DOWNLOADDIR}/${name1}-${version}.${dlext}" - local dlfolder2="${PAWPAW_BUILDDIR}/${name2}-${version}" + local dlfile1="${PAWPAW_DOWNLOADDIR}/${pkgname1}-${version}.${dlext}" + local dlfolder2="${PAWPAW_BUILDDIR}/${pkgname2}-${version}" if [ ! -d "${dlfolder2}" ]; then mkdir "${dlfolder2}" @@ -79,17 +79,17 @@ function copy_download() { } function git_clone() { - local name="${1}" + local pkgname="${1}" local hash="${2}" local repourl="${3}" local dlname="${4}" if [ -z "${dlname}" ]; then - dlname="${name}" + dlname="${pkgname}" fi local dlfile="${PAWPAW_DOWNLOADDIR}/${dlname}-${hash}.tar.gz" - local dlfolder="${PAWPAW_BUILDDIR}/${name}-${hash}" + local dlfolder="${PAWPAW_BUILDDIR}/${pkgname}-${hash}" if [ ! -f "${dlfile}" ]; then local tmprepodir="${PAWPAW_TMPDIR}/${dlname}-${hash}" @@ -211,11 +211,11 @@ function _postbuild() { # --------------------------------------------------------------------------------------------------------------------- function build_autoconf() { - local name="${1}" + local pkgname="${1}" local version="${2}" local extraconfrules="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" if [ "${WASM}" -eq 1 ]; then extraconfrules="--host=$(uname -m)-linux-gnu ${extraconfrules}" @@ -223,7 +223,7 @@ function build_autoconf() { extraconfrules="--host=${TOOLCHAIN_PREFIX} ac_cv_build=$(uname -m)-linux-gnu ac_cv_host=${TOOLCHAIN_PREFIX} ${extraconfrules}" fi - _prebuild "${name}" "${pkgdir}" + _prebuild "${pkgname}" "${pkgdir}" if [ ! -f "${pkgdir}/.stamp_configured" ]; then pushd "${pkgdir}" @@ -250,18 +250,18 @@ function build_autoconf() { } function build_autoconfgen() { - local name="${1}" + local pkgname="${1}" local version="${2}" local extraconfrules="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" local EXTRA_CFLAGS2="${EXTRA_CFLAGS}" local EXTRA_CXXFLAGS2="${EXTRA_CXXFLAGS}" local EXTRA_LDFLAGS2="${EXTRA_LDFLAGS}" local EXTRA_MAKE_ARGS2="${EXTRA_MAKE_ARGS}" - _prebuild "${name}" "${pkgdir}" + _prebuild "${pkgname}" "${pkgdir}" if [ ! -f "${pkgdir}/.stamp_preconfigured" ]; then pushd "${pkgdir}" @@ -281,17 +281,17 @@ function build_autoconfgen() { export EXTRA_LDFLAGS="${EXTRA_LDFLAGS2}" export EXTRA_MAKE_ARGS="${EXTRA_MAKE_ARGS2}" - build_autoconf "${name}" "${version}" "${extraconfrules}" + build_autoconf "${pkgname}" "${version}" "${extraconfrules}" } function build_conf() { - local name="${1}" + local pkgname="${1}" local version="${2}" local extraconfrules="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" - _prebuild "${name}" "${pkgdir}" + _prebuild "${pkgname}" "${pkgdir}" if [ ! -f "${pkgdir}/.stamp_configured" ]; then pushd "${pkgdir}" @@ -318,13 +318,13 @@ function build_conf() { } function build_cmake() { - local name="${1}" + local pkgname="${1}" local version="${2}" local extraconfrules="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" - _prebuild "${name}" "${pkgdir}" + _prebuild "${pkgname}" "${pkgdir}" mkdir -p "${pkgdir}/build" if [ "${WASM}" -eq 1 ]; then @@ -389,13 +389,13 @@ function build_cmake() { } function build_make() { - local name="${1}" + local pkgname="${1}" local version="${2}" local extraconfrules="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" - _prebuild "${name}" "${pkgdir}" + _prebuild "${pkgname}" "${pkgdir}" touch "${pkgdir}/.stamp_configured" @@ -417,17 +417,17 @@ function build_make() { } function build_meson() { - local name="${1}" + local pkgname="${1}" local version="${2}" local extraconfrules="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" if [ "${CROSS_COMPILING}" -eq 1 ]; then extraconfrules="--cross-file "${PAWPAW_ROOT}/setup/meson/${PAWPAW_TARGET}.ini" ${extraconfrules}" fi - _prebuild "${name}" "${pkgdir}" + _prebuild "${pkgname}" "${pkgdir}" if [ ! -f "${pkgdir}/.stamp_configured" ]; then pushd "${pkgdir}" @@ -454,14 +454,14 @@ function build_meson() { } function build_python() { - local name="${1}" + local pkgname="${1}" local version="${2}" local extraconfrules="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" local python="python$(echo ${PYTHON_VERSION} | cut -b 1,2,3)" - _prebuild "${name}" "${pkgdir}" + _prebuild "${pkgname}" "${pkgdir}" # remove flags not compatible with python export CFLAGS="$(echo ${CFLAGS} | sed -e 's/-fvisibility=hidden//')" @@ -512,13 +512,13 @@ function build_python() { } function build_qmake() { - local name="${1}" + local pkgname="${1}" local version="${2}" local extraconfrules="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" - _prebuild "${name}" "${pkgdir}" + _prebuild "${pkgname}" "${pkgdir}" # if [ "${CROSS_COMPILING}" -eq 1 ]; then # export PKG_CONFIG_LIBDIR="${TARGET_PKG_CONFIG_PATH}" @@ -553,11 +553,11 @@ function build_qmake() { } function build_waf() { - local name="${1}" + local pkgname="${1}" local version="${2}" local extraconfrules="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" local python=python3 if ! which python3 > /dev/null; then @@ -568,7 +568,7 @@ function build_waf() { export LD_LIBRARY_PATH="${PAWPAW_PREFIX}/lib" fi - _prebuild "${name}" "${pkgdir}" + _prebuild "${pkgname}" "${pkgdir}" if [ ! -f "${pkgdir}/.stamp_configured" ]; then pushd "${pkgdir}" @@ -602,13 +602,13 @@ function build_waf() { # --------------------------------------------------------------------------------------------------------------------- function run_make() { - local name="${1}" + local pkgname="${1}" local version="${2}" local makerule="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" - _prebuild "${name}" "${pkgdir}" + _prebuild "${pkgname}" "${pkgdir}" if [ ! -f "${pkgdir}/.stamp_custom_run" ]; then pushd "${pkgdir}" @@ -623,11 +623,11 @@ function run_make() { # --------------------------------------------------------------------------------------------------------------------- function build_host_autoconf() { - local name="${1}" + local pkgname="${1}" local version="${2}" local extraconfrules="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" unset AR unset CC @@ -769,12 +769,12 @@ function build_host_cmake() { # --------------------------------------------------------------------------------------------------------------------- function patch_file() { - local name="${1}" + local pkgname="${1}" local version="${2}" local file="${3}" local rule="${4}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" if [ -e "${pkgdir}/${file}" ]; then sed -i -e "${rule}" "${pkgdir}/${file}" @@ -782,12 +782,12 @@ function patch_file() { } function copy_file() { - local name="${1}" + local pkgname="${1}" local version="${2}" local source="${3}" local target="${4}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" if [ ! -e "${pkgdir}/${target}" ] || [ "${source}" -nt "${target}" ]; then pushd "${pkgdir}" @@ -797,7 +797,7 @@ function copy_file() { } function install_file() { - local name="${1}" + local pkgname="${1}" local version="${2}" local source="${3}" local targetdir="${4}" @@ -807,7 +807,7 @@ function install_file() { targetname="$(basename ${source})" fi - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" if [ ! -e "${PAWPAW_PREFIX}/${targetdir}/${targetname})" ]; then pushd "${pkgdir}" @@ -817,12 +817,12 @@ function install_file() { } function link_file() { - local name="${1}" + local pkgname="${1}" local version="${2}" local source="${3}" local target="${4}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" if [ ! -e "${pkgdir}/${target}" ]; then pushd "${pkgdir}" @@ -832,12 +832,12 @@ function link_file() { } function link_host_file() { - local name="${1}" + local pkgname="${1}" local version="${2}" local source="${3}" local target="${4}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" if [ ! -e "${PAWPAW_PREFIX}-host/${target}" ]; then ln -sfv "${source}" "${PAWPAW_PREFIX}-host/${target}" @@ -845,12 +845,12 @@ function link_host_file() { } function link_target_file() { - local name="${1}" + local pkgname="${1}" local version="${2}" local source="${3}" local target="${4}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" if [ ! -e "${PAWPAW_PREFIX}/${target}" ]; then ln -sfv "${source}" "${PAWPAW_PREFIX}/${target}" @@ -858,11 +858,11 @@ function link_target_file() { } function remove_file() { - local name="${1}" + local pkgname="${1}" local version="${2}" local file="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" if [ -e "${pkgdir}/${file}" ]; then rm -fv "${pkgdir}/${file}" @@ -893,13 +893,13 @@ function patch_osx_binary_libs() { } function patch_osx_qtapp() { - local name="${1}" + local pkgname="${1}" local version="${2}" local appfile="${3}" - local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}" - _prebuild "${name}" "${pkgdir}" + _prebuild "${pkgname}" "${pkgdir}" mkdir -p "${appfile}/Contents/PlugIns/platforms" mkdir -p "${appfile}/Contents/PlugIns/printsupport"