From 716ca0a66bc4499803499bc299a83cee090ea858 Mon Sep 17 00:00:00 2001 From: Eilionoir Tunnicliff Date: Wed, 19 Apr 2023 10:50:30 -0400 Subject: [PATCH] Set slimmed builds to be development only Oh yeah, changed "debug" to "development" --- .github/workflows/release.yml | 8 +------- Natives/config.h.in | 2 +- Natives/main.m | 5 +++++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 768cc0fd..1d33a4b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -107,7 +107,7 @@ jobs: password: ${{ secrets.ELLIE_MINI_SECRET }} run: | export PATH=/opt/procursus/bin:/opt/homebrew/bin:$PATH - export RUNNER=1 SLIMMED=1 + export RUNNER=1 gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }} - name: Upload regular ipa @@ -116,12 +116,6 @@ jobs: name: net.kdt.pojavlauncher-${{ matrix.platform_name }}.ipa path: artifacts/net.kdt.pojavlauncher-*-${{ matrix.platform_name }}.ipa - - name: Upload slimmed ipa - uses: actions/upload-artifact@v2 - with: - name: net.kdt.pojavlauncher.slimmed-${{ matrix.platform_name }}.ipa - path: artifacts/net.kdt.pojavlauncher.slimmed-*-${{ matrix.platform_name }}.ipa - - name: Upload PojavLauncher.dSYM uses: actions/upload-artifact@v2 with: diff --git a/Natives/config.h.in b/Natives/config.h.in index f154618c..6732350f 100644 --- a/Natives/config.h.in +++ b/Natives/config.h.in @@ -9,7 +9,7 @@ #if CONFIG_RELEASE # define CONFIG_TYPE "release" #else -# define CONFIG_TYPE "debug" +# define CONFIG_TYPE "development" #endif #cmakedefine CONFIG_BRANCH "@CONFIG_BRANCH@" diff --git a/Natives/main.m b/Natives/main.m index 99c2ea1c..c433ee6a 100644 --- a/Natives/main.m +++ b/Natives/main.m @@ -139,11 +139,16 @@ void init_logDeviceAndVer(char *argument) { NSLog(@"[Pre-Init] Device: %s", getenv("POJAV_DETECTEDHW")); NSLog(@"[Pre-Init] iOS %s (%s)", getenv("POJAV_DETECTEDSW"), getenv("POJAV_DETECTEDINST")); + NSString *jvmPath = [NSString stringWithFormat:@"%s/java_runtimes", getenv("BUNDLE_PATH")]; if (![fm fileExistsAtPath:jvmPath]) { +#if !CONFIG_RELEASE setenv("POJAV_PREFER_EXTERNAL_JRE", "1", 1); NSLog(@"[Java] !!! THIS FEATURE IS A WORK IN PROGRESS !!!"); NSLog(@"[Java] Loading runtimes from Documents directory."); +#else + NSLog(@"[Java] No runtimes available to use."); +#endif } NSLog(@"[Pre-init] Entitlements availability:");