From f3f91d4018283f6510ed18abcb3edff579bef5a8 Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Sun, 16 Feb 2025 16:05:30 +0100 Subject: [PATCH 1/7] [no ci] I don't like piracy --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index d5158c0..bed21fd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +> [!WARNING] +> Deprecated CI scripts, I don't like piracy + ### Can I play with an APK? No, this allowed piracy that is forbidden in this project. From 775d999ccf247c3c727ef997743932f84c6d78ad Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Sun, 11 May 2025 01:04:19 +0200 Subject: [PATCH 2/7] [no ci] Update sdk sha --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8469654..05c1d41 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ on: default: ChristopherHX/MacOSX10.14.sdk MacOSX1014sdkRef: type: string - default: 5d1c9b28f01ef0b01225f92670ee587b430efa8e + default: 18f574aa8d71402560dd3cbf349a9f8b2cec3833 use-repo-files: type: boolean default: false From f1099bf54d754cd4c6d77985654c8c286934f18e Mon Sep 17 00:00:00 2001 From: mrjasonn <120269221+mrjasonn@users.noreply.github.com> Date: Fri, 19 Sep 2025 00:01:22 +0800 Subject: [PATCH 3/7] Add game mode support (#48) --- templates/Info.plist.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/Info.plist.tmpl b/templates/Info.plist.tmpl index b02418f..2a72165 100644 --- a/templates/Info.plist.tmpl +++ b/templates/Info.plist.tmpl @@ -30,6 +30,8 @@ SUAutomaticallyUpdate + LSSupportsGameMode + LSMinimumSystemVersion {{ cf_bundle_macos_min }} CFBundleDocumentTypes From b1fea39a492839c92651d8e7fd0c7bee2b829c44 Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Sun, 28 Sep 2025 12:30:44 +0200 Subject: [PATCH 4/7] [no ci] Set CMAKE_POLICY_VERSION_MINIMUM=4.0 --- .github/workflows/m1.yml | 2 +- .github/workflows/main.yml | 6 +++--- __main__.py | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/m1.yml b/.github/workflows/m1.yml index d299229..8dea206 100644 --- a/.github/workflows/m1.yml +++ b/.github/workflows/m1.yml @@ -259,7 +259,7 @@ jobs: } $EXTRA_FLAGS += '-DOPENSSL_ROOT_DIR=${{steps.openssl.outputs.download-path}}' } - cmake ../mcpelauncher '-DCMAKE_BUILD_TYPE=Release' '-DBUILD_UI=OFF' ('-DCMAKE_INSTALL_PREFIX=' + $INSDIR) -DCMAKE_ASM_FLAGS="--target=${{ matrix.triple }}" -DCMAKE_C_FLAGS="--target=${{ matrix.triple }} ${{ matrix.cflags }}" -DCMAKE_CXX_FLAGS="--target=${{ matrix.triple }} ${{ matrix.cxxflags }}" -DCMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} $EXTRA_FLAGS ${{ matrix.cmakeextraflags }} '-DMSA_DAEMON_PATH=.' '-DENABLE_DEV_PATHS=OFF' '-DXAL_WEBVIEW_QT_PATH=.' + cmake ../mcpelauncher '-DCMAKE_POLICY_VERSION_MINIMUM=4.0' '-DCMAKE_BUILD_TYPE=Release' '-DBUILD_UI=OFF' ('-DCMAKE_INSTALL_PREFIX=' + $INSDIR) -DCMAKE_ASM_FLAGS="--target=${{ matrix.triple }}" -DCMAKE_C_FLAGS="--target=${{ matrix.triple }} ${{ matrix.cflags }}" -DCMAKE_CXX_FLAGS="--target=${{ matrix.triple }} ${{ matrix.cxxflags }}" -DCMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} $EXTRA_FLAGS ${{ matrix.cmakeextraflags }} '-DMSA_DAEMON_PATH=.' '-DENABLE_DEV_PATHS=OFF' '-DXAL_WEBVIEW_QT_PATH=.' make install -j4 popd popd diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 05c1d41..5cc54d7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,7 +88,7 @@ jobs: git clone https://github.com/llvm/llvm-project.git llvm -b release/10.x mkdir -p libcxx32-build cd libcxx32-build - cmake ../llvm/llvm -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release -DLIBCXX_BUILD_32_BITS=ON -DLIBCXXABI_BUILD_32_BITS=ON -DLLVM_BUILD_32_BITS=ON + cmake ../llvm/llvm -DCMAKE_POLICY_VERSION_MINIMUM=4.0 -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release -DLIBCXX_BUILD_32_BITS=ON -DLIBCXXABI_BUILD_32_BITS=ON -DLLVM_BUILD_32_BITS=ON make -j8 cxx cxxabi build-libcxx64: runs-on: macos-13 @@ -122,7 +122,7 @@ jobs: git clone https://github.com/llvm/llvm-project.git llvm -b release/10.x mkdir -p libcxx64-build cd libcxx64-build - cmake ../llvm/llvm -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release + cmake ../llvm/llvm -DCMAKE_POLICY_VERSION_MINIMUM=4.0 -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release make -j8 cxx cxxabi build-libcxx: runs-on: macos-13 @@ -647,7 +647,7 @@ jobs: git -C libzip checkout v1.9.2 - name: Build libzip run: | - cmake libzip -B libzip-build -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DENABLE_ZSTD=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DENABLE_FDOPEN=OFF + cmake libzip -B libzip-build -DCMAKE_POLICY_VERSION_MINIMUM=4.0 -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DENABLE_ZSTD=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DENABLE_FDOPEN=OFF cmake --build libzip-build --parallel sudo cmake --build libzip-build --target install --parallel - name: Install python dependencies diff --git a/__main__.py b/__main__.py index 5574cfe..ad02fba 100644 --- a/__main__.py +++ b/__main__.py @@ -103,13 +103,15 @@ def clone_repo(name, url, branch): if not path.isdir(CMAKE_INSTALL_PREFIX): makedirs(CMAKE_INSTALL_PREFIX) +cmake_cmd = ['cmake', source_dir, '-DCMAKE_INSTALL_PREFIX=' + CMAKE_INSTALL_PREFIX, '-DCMAKE_POLICY_VERSION_MINIMUM=4.0'] + def build_component(name, cmake_opts): display_stage("Building: " + name) source_dir = path.abspath(path.join(SOURCE_DIR, name)) build_dir = path.join(SOURCE_DIR, "build", name) if not path.isdir(build_dir): makedirs(build_dir) - call(['cmake', source_dir, '-DCMAKE_INSTALL_PREFIX=' + CMAKE_INSTALL_PREFIX] + cmake_opts, cwd=build_dir) + call(cmake_cmd + cmake_opts, cwd=build_dir) call(['make', '-j' + str(cpu_count()), 'install'], cwd=build_dir) def build_component32(name, cmake_opts): @@ -118,7 +120,7 @@ def build_component32(name, cmake_opts): build_dir = path.join(SOURCE_DIR, "build", name) if not path.isdir(build_dir): makedirs(build_dir) - call(['cmake', source_dir, '-DCMAKE_INSTALL_PREFIX=' + CMAKE_INSTALL_PREFIX] + cmake_opts, cwd=build_dir) + call(cmake_cmd + cmake_opts, cwd=build_dir) call(['make', '-j' + str(cpu_count())], cwd=build_dir) shutil.copy2(path.join(build_dir, 'mcpelauncher-client', 'mcpelauncher-client'), path.join(CMAKE_INSTALL_PREFIX, 'bin', 'mcpelauncher-client32')) From c1410a812080ea1c1e9818e8e3d3792a29b52fea Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Sun, 28 Sep 2025 18:05:46 +0200 Subject: [PATCH 5/7] [no ci] Refactor cmake_cmd to accept source_dir parameter --- __main__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/__main__.py b/__main__.py index ad02fba..4e6e3e0 100644 --- a/__main__.py +++ b/__main__.py @@ -103,7 +103,8 @@ def clone_repo(name, url, branch): if not path.isdir(CMAKE_INSTALL_PREFIX): makedirs(CMAKE_INSTALL_PREFIX) -cmake_cmd = ['cmake', source_dir, '-DCMAKE_INSTALL_PREFIX=' + CMAKE_INSTALL_PREFIX, '-DCMAKE_POLICY_VERSION_MINIMUM=4.0'] +def cmake_cmd(source_dir): + return ['cmake', source_dir, '-DCMAKE_INSTALL_PREFIX=' + CMAKE_INSTALL_PREFIX, '-DCMAKE_POLICY_VERSION_MINIMUM=4.0'] def build_component(name, cmake_opts): display_stage("Building: " + name) @@ -111,7 +112,7 @@ def build_component(name, cmake_opts): build_dir = path.join(SOURCE_DIR, "build", name) if not path.isdir(build_dir): makedirs(build_dir) - call(cmake_cmd + cmake_opts, cwd=build_dir) + call(cmake_cmd(source_dir) + cmake_opts, cwd=build_dir) call(['make', '-j' + str(cpu_count()), 'install'], cwd=build_dir) def build_component32(name, cmake_opts): @@ -120,7 +121,7 @@ def build_component32(name, cmake_opts): build_dir = path.join(SOURCE_DIR, "build", name) if not path.isdir(build_dir): makedirs(build_dir) - call(cmake_cmd + cmake_opts, cwd=build_dir) + call(cmake_cmd(source_dir) + cmake_opts, cwd=build_dir) call(['make', '-j' + str(cpu_count())], cwd=build_dir) shutil.copy2(path.join(build_dir, 'mcpelauncher-client', 'mcpelauncher-client'), path.join(CMAKE_INSTALL_PREFIX, 'bin', 'mcpelauncher-client32')) From 4d70a64dfcbc9cb9a5ffc9be365d7fd246355a84 Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Sun, 28 Sep 2025 21:50:09 +0200 Subject: [PATCH 6/7] [no ci] tell cmake to force x86_64 Is this needed? archive member: libglfw3.a(cocoa_init.m.o) cputype (16777223) does not match previous archive members cputype (7) (all members must match) --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5cc54d7..0cc2984 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -462,6 +462,8 @@ jobs: QT_PACKAGE_PREFIX: qt.qt5.5150. QT_PACKAGE_SUFFIX: clang_64 QT_PREBUILT_SUFFIX: -MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64 + env: + CMAKE_OSX_ARCHITECTURES: x86_64 # Is this needed? archive member: libglfw3.a(cocoa_init.m.o) cputype (16777223) does not match previous archive members cputype (7) (all members must match) steps: - name: Select Xcode run: sudo xcode-select -switch /Applications/Xcode_14.2.app From 1eb2e57c90f1266c0aa5da57aea9fb46a21be03b Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Fri, 3 Oct 2025 22:53:34 +0200 Subject: [PATCH 7/7] [no ci] meta --- version.txt | 2 +- versionsdb.txt | 2 +- versionsdbremote.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/version.txt b/version.txt index 4b7d50c..7a586f4 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.17.2 +v1.x-nightly \ No newline at end of file diff --git a/versionsdb.txt b/versionsdb.txt index 06a7087..e5517e4 100644 --- a/versionsdb.txt +++ b/versionsdb.txt @@ -1 +1 @@ -6528e24b5db9b5532cff2f0dca1b739a292b14d3 \ No newline at end of file +HEAD \ No newline at end of file diff --git a/versionsdbremote.txt b/versionsdbremote.txt index 44ab2d8..e5517e4 100644 --- a/versionsdbremote.txt +++ b/versionsdbremote.txt @@ -1 +1 @@ -v1.1.x +HEAD \ No newline at end of file