From 570fc90bf6c7a842b2d8b9874fef5d843ee5fc76 Mon Sep 17 00:00:00 2001 From: ROllerozxa Date: Tue, 7 Nov 2023 22:18:26 +0100 Subject: [PATCH] Debundle Minetest Game (#13818) --- .github/workflows/build.yml | 2 -- .github/workflows/macos.yml | 6 ----- .gitlab-ci.yml | 3 --- CMakeLists.txt | 13 ----------- Dockerfile | 23 ++++++++----------- README.md | 6 ----- android/app/build.gradle | 4 ---- .../java/net/minetest/minetest/Utils.java | 1 - doc/compiling/linux.md | 12 ---------- doc/compiling/macos.md | 6 ----- games/devtest/mods/initial_message/init.lua | 2 +- util/buildbot/common.sh | 8 ------- 12 files changed, 11 insertions(+), 75 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 74ea839ae..4eefca64e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -177,7 +177,6 @@ jobs: run: | EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh winbuild env: - NO_MINETEST_GAME: 1 NO_PACKAGE: 1 win64: @@ -195,7 +194,6 @@ jobs: run: | EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh winbuild env: - NO_MINETEST_GAME: 1 NO_PACKAGE: 1 msvc: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index bd66e6ca9..d93057364 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -21,11 +21,6 @@ on: - 'cmake/Modules/**' - '.github/workflows/macos.yml' -env: - MINETEST_GAME_REPO: https://github.com/minetest/minetest_game.git - MINETEST_GAME_BRANCH: master - MINETEST_GAME_NAME: minetest_game - jobs: build: runs-on: macos-latest @@ -38,7 +33,6 @@ jobs: - name: Build run: | - git clone -b $MINETEST_GAME_BRANCH $MINETEST_GAME_REPO games/$MINETEST_GAME_NAME git clone https://github.com/minetest/irrlicht lib/irrlichtmt --depth 1 -b $(cat misc/irrlichtmt_tag.txt) mkdir build cd build diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f7917f59..10568e2e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,6 @@ stages: - deploy variables: - MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git" CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH .build_template: @@ -120,8 +119,6 @@ package:appimage-client: - mkdir AppDir - cp -a artifact/minetest/usr/ AppDir/usr/ - cp -a clientmods AppDir/usr/share/minetest - - git clone $MINETEST_GAME_REPO AppDir/usr/share/minetest/games/minetest_game - - rm -rf AppDir/usr/share/minetest/games/minetest_game/.git # Remove PrefersNonDefaultGPU property due to validation errors - sed -i '/PrefersNonDefaultGPU/d' AppDir/usr/share/applications/net.minetest.minetest.desktop script: diff --git a/CMakeLists.txt b/CMakeLists.txt index 503247bd8..cca6e5a15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,9 +262,6 @@ if(RUN_IN_PLACE) install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/texture_packs_here.txt" DESTINATION "${SHAREDIR}/textures") endif() -install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game" DESTINATION "${SHAREDIR}/games/" - COMPONENT "SUBGAME_MINETEST_GAME" OPTIONAL PATTERN ".git*" EXCLUDE ) - set(INSTALL_DEVTEST FALSE CACHE BOOL "Install Development Test") if(INSTALL_DEVTEST) @@ -336,16 +333,6 @@ cpack_add_component(Docs DESCRIPTION "Documentation about Minetest and Minetest modding" ) -cpack_add_component(SUBGAME_MINETEST_GAME - DISPLAY_NAME "Minetest Game" - DESCRIPTION "The default game bundled in the Minetest engine. Mainly used as a modding base." - GROUP "Games" -) - -cpack_add_component_group(Subgames - DESCRIPTION "Games for the Minetest engine." -) - if(WIN32) # Include all dynamically linked runtime libraries such as MSVCRxxx.dll include(InstallRequiredSystemLibraries) diff --git a/Dockerfile b/Dockerfile index e01913165..4564d780f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ ARG DOCKER_IMAGE=alpine:3.16 FROM $DOCKER_IMAGE AS dev -ENV MINETEST_GAME_VERSION master ENV IRRLICHT_VERSION master ENV SPATIALINDEX_VERSION 1.9.3 ENV LUAJIT_VERSION v2.1 @@ -52,18 +51,16 @@ COPY src /usr/src/minetest/src COPY textures /usr/src/minetest/textures WORKDIR /usr/src/minetest -RUN git clone --depth=1 -b ${MINETEST_GAME_VERSION} https://github.com/minetest/minetest_game.git ./games/minetest_game && \ - rm -fr ./games/minetest_game/.git && \ - cmake -B build \ - -DCMAKE_INSTALL_PREFIX=/usr/local \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SERVER=TRUE \ - -DENABLE_PROMETHEUS=TRUE \ - -DBUILD_UNITTESTS=FALSE \ - -DBUILD_CLIENT=FALSE \ - -GNinja && \ - cmake --build build && \ - cmake --install build +RUN cmake -B build \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SERVER=TRUE \ + -DENABLE_PROMETHEUS=TRUE \ + -DBUILD_UNITTESTS=FALSE \ + -DBUILD_CLIENT=FALSE \ + -GNinja && \ + cmake --build build && \ + cmake --install build ARG DOCKER_IMAGE=alpine:3.16 FROM $DOCKER_IMAGE AS runtime diff --git a/README.md b/README.md index 261fa3a09..c3706982c 100644 --- a/README.md +++ b/README.md @@ -10,12 +10,6 @@ Minetest is a free open-source voxel game engine with easy modding and game crea Copyright (C) 2010-2022 Perttu Ahola and contributors (see source file comments and the version control log) -In case you downloaded the source code --------------------------------------- -If you downloaded the Minetest Engine source code in which this file is -contained, you probably want to download the [Minetest Game](https://github.com/minetest/minetest_game/) -project too. See its README.txt for more information. - Table of Contents ------------------ diff --git a/android/app/build.gradle b/android/app/build.gradle index d73fbb766..85c8e830c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -54,7 +54,6 @@ android { task prepareAssets() { def assetsFolder = "build/assets" def projRoot = rootDir.parent - def gameToCopy = "minetest_game" // See issue #4638 def unsupportedLanguages = new File("${projRoot}/src/unsupported_language_list.txt").text.readLines() @@ -81,9 +80,6 @@ task prepareAssets() { copy { from "${projRoot}/fonts" include "*.ttf" into "${assetsFolder}/fonts" } - copy { - from "${projRoot}/games/${gameToCopy}" into "${assetsFolder}/games/${gameToCopy}" - } copy { from "${projRoot}/textures" into "${assetsFolder}/textures" } diff --git a/android/app/src/main/java/net/minetest/minetest/Utils.java b/android/app/src/main/java/net/minetest/minetest/Utils.java index 7fbdf3b14..86ef5e5ed 100644 --- a/android/app/src/main/java/net/minetest/minetest/Utils.java +++ b/android/app/src/main/java/net/minetest/minetest/Utils.java @@ -38,7 +38,6 @@ public class Utils { public static boolean isInstallValid(@NonNull Context context) { File userDataDirectory = getUserDataDirectory(context); return userDataDirectory.isDirectory() && - new File(userDataDirectory, "games").isDirectory() && new File(userDataDirectory, "builtin").isDirectory() && new File(userDataDirectory, "client").isDirectory() && new File(userDataDirectory, "textures").isDirectory(); diff --git a/doc/compiling/linux.md b/doc/compiling/linux.md index d977cfe20..cc0313dea 100644 --- a/doc/compiling/linux.md +++ b/doc/compiling/linux.md @@ -69,10 +69,6 @@ Download source (this is the URL to the latest of source repository, which might git clone --depth 1 https://github.com/minetest/minetest.git cd minetest -Download Minetest Game (otherwise only the "Development Test" game is available) using Git: - - git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game - Download IrrlichtMt to `lib/irrlichtmt`, it will be used to satisfy the IrrlichtMt dependency that way: git clone --depth 1 https://github.com/minetest/irrlicht.git lib/irrlichtmt @@ -83,14 +79,6 @@ Download source, without using Git: tar xf master.tar.gz cd minetest-master -Download Minetest Game, without using Git: - - cd games/ - wget https://github.com/minetest/minetest_game/archive/master.tar.gz - tar xf master.tar.gz - mv minetest_game-master minetest_game - cd .. - Download IrrlichtMt, without using Git: cd lib/ diff --git a/doc/compiling/macos.md b/doc/compiling/macos.md index f6a58f78b..5061223ab 100644 --- a/doc/compiling/macos.md +++ b/doc/compiling/macos.md @@ -20,12 +20,6 @@ git clone --depth 1 https://github.com/minetest/minetest.git cd minetest ``` -Download Minetest Game (otherwise only the "Development Test" game is available) using Git: - -``` -git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game -``` - Download Minetest's fork of Irrlicht: ``` diff --git a/games/devtest/mods/initial_message/init.lua b/games/devtest/mods/initial_message/init.lua index 59e9f5f4b..2bff5741f 100644 --- a/games/devtest/mods/initial_message/init.lua +++ b/games/devtest/mods/initial_message/init.lua @@ -3,7 +3,7 @@ minetest.register_on_joinplayer(function(player) if not player or not player:is_player() then return end - minetest.chat_send_player(player:get_player_name(), "This is the \"Development Test\" [devtest], meant only for testing and development. Use Minetest Game for the real thing.") + minetest.chat_send_player(player:get_player_name(), "This is the \"Development Test\" [devtest], meant only for testing and development.") end minetest.after(2.0, cb, player) end) diff --git a/util/buildbot/common.sh b/util/buildbot/common.sh index b29a3fe1c..4d0cc08b0 100644 --- a/util/buildbot/common.sh +++ b/util/buildbot/common.sh @@ -1,9 +1,6 @@ CORE_GIT=https://github.com/minetest/minetest CORE_BRANCH=master CORE_NAME=minetest -GAME_GIT=https://github.com/minetest/minetest_game -GAME_BRANCH=master -GAME_NAME=minetest_game ogg_version=1.3.5 openal_version=1.23.0 @@ -45,11 +42,6 @@ get_sources () { sourcedir=$PWD/$CORE_NAME [ -d $CORE_NAME ] && { pushd $CORE_NAME; git pull --ff-only; popd; } || \ git clone -b $CORE_BRANCH $CORE_GIT $CORE_NAME - if [ -z "$NO_MINETEST_GAME" ]; then - cd $sourcedir - [ -d games/$GAME_NAME ] && { pushd games/$GAME_NAME; git pull --ff-only; popd; } || \ - git clone -b $GAME_BRANCH $GAME_GIT games/$GAME_NAME - fi } # sets $runtime_dlls