diff --git a/.ci/linux/build.sh b/.ci/linux/build.sh index 88304de00e..72eb4d5b9b 100755 --- a/.ci/linux/build.sh +++ b/.ci/linux/build.sh @@ -67,10 +67,6 @@ else export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DYUZU_USE_PRECOMPILED_HEADERS=OFF) fi -if [ "$DEVEL" != "true" ]; then - export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DENABLE_UPDATE_CHECKER=ON) -fi - if [ "$USE_WEBENGINE" = "true" ]; then WEBENGINE=ON else diff --git a/.ci/windows/build.sh b/.ci/windows/build.sh index e73b8320d6..d735563a0d 100644 --- a/.ci/windows/build.sh +++ b/.ci/windows/build.sh @@ -37,7 +37,6 @@ cmake .. -G Ninja \ -DDYNARMIC_ENABLE_LTO=ON \ -DYUZU_USE_BUNDLED_QT=${BUNDLE_QT:-false} \ -DUSE_CCACHE=${CCACHE:-false} \ - -DENABLE_UPDATE_CHECKER=${DEVEL:-true} \ "${EXTRA_CMAKE_FLAGS[@]}" \ "$@" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac67f73d00..df79c1ff9d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,7 +135,7 @@ jobs: echo $GIT_TAG_NAME - name: Build - run: ANDROID_HOME=/home/runner/sdk ./.ci/android/build.sh + run: DEVEL=true ANDROID_HOME=/home/runner/sdk ./.ci/android/build.sh env: ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }} ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml index 71cc6b4ee1..325e0a02b4 100644 --- a/.github/workflows/trigger_release.yml +++ b/.github/workflows/trigger_release.yml @@ -96,7 +96,7 @@ jobs: fetch-tags: true - name: Build - run: TARGET=appimage RELEASE=1 ./.ci/linux/build.sh v3 8 + run: TARGET=appimage RELEASE=1 DEVEL=false ./.ci/linux/build.sh v3 8 - name: Package AppImage run: ./.ci/linux/package.sh v3 &> /dev/null diff --git a/CMakeLists.txt b/CMakeLists.txt index 56d0f7f9fd..8ad2a16380 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -567,6 +567,16 @@ if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER) find_package(cpp-jwt) endif() +if (DEFINED ENV{DEVEL}) + if ("$ENV{DEVEL}" STREQUAL "false") + message(STATUS "DEVEL=false: Enabling update checker for release builds") + set(ENABLE_UPDATE_CHECKER ON) + else() + message(STATUS "DEVEL=$ENV{DEVEL}: Disabling updates checker for development builds") + set(ENABLE_UPDATE_CHECKER OFF) + endif() +endif() + if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS) find_package(oaknut) endif() diff --git a/docs/scripts/Linux.md b/docs/scripts/Linux.md index 8b18e41ced..93e76c222e 100644 --- a/docs/scripts/Linux.md +++ b/docs/scripts/Linux.md @@ -27,5 +27,5 @@ Boolean flags (set `true` to enable, `false` to disable): * AppImage packaging script: `.ci/linux/package.sh` * Accepts same arch targets as build script - * Use `DEVEL=true` to rename app to `Eden Nightly` + * Use `DEVEL=true` to rename app to `Eden Nightly` and disable the update checker * This should generally not be used unless in a tailor-made packaging environment (e.g. Actions/CI) \ No newline at end of file diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index 9e7728e47e..e8d8141711 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -166,8 +166,6 @@ android { defaultConfig { externalNativeBuild { cmake { - val enableUpdater = if (System.getenv("DEVEL") != "true") "OM" else "OFF" - arguments( "-DENABLE_QT=0", // Don't use QT "-DENABLE_SDL2=0", // Don't use SDL @@ -180,8 +178,7 @@ android { "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON", "-DBUILD_TESTING=OFF", "-DYUZU_TESTS=OFF", - "-DDYNARMIC_TESTS=OFF", - "-DENABLE_UPDATE_CHECKER=$enableUpdater" + "-DDYNARMIC_TESTS=OFF" ) abiFilters("arm64-v8a") diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt index b02317d6f2..cb17de46da 100644 --- a/src/android/app/src/main/jni/CMakeLists.txt +++ b/src/android/app/src/main/jni/CMakeLists.txt @@ -31,7 +31,7 @@ if (ENABLE_OPENSSL OR ENABLE_WEB_SERVICE) endif() if (ENABLE_UPDATE_CHECKER) - target_compile_definitions(yuzu-android PRIVATE ENABLE_UPDATE_CHECKER) + target_compile_definitions(yuzu-android PUBLIC ENABLE_UPDATE_CHECKER) endif() set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} yuzu-android)