master #1

Merged
BRNSystems merged 55 commits from Mirrorlandia_minetest/minetest:master into master 2023-11-24 22:11:18 +01:00
12 changed files with 11 additions and 75 deletions
Showing only changes of commit 570fc90bf6 - Show all commits

@ -177,7 +177,6 @@ jobs:
run: | run: |
EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh winbuild EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh winbuild
env: env:
NO_MINETEST_GAME: 1
NO_PACKAGE: 1 NO_PACKAGE: 1
win64: win64:
@ -195,7 +194,6 @@ jobs:
run: | run: |
EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh winbuild EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh winbuild
env: env:
NO_MINETEST_GAME: 1
NO_PACKAGE: 1 NO_PACKAGE: 1
msvc: msvc:

@ -21,11 +21,6 @@ on:
- 'cmake/Modules/**' - 'cmake/Modules/**'
- '.github/workflows/macos.yml' - '.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: jobs:
build: build:
runs-on: macos-latest runs-on: macos-latest
@ -38,7 +33,6 @@ jobs:
- name: Build - name: Build
run: | 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) git clone https://github.com/minetest/irrlicht lib/irrlichtmt --depth 1 -b $(cat misc/irrlichtmt_tag.txt)
mkdir build mkdir build
cd build cd build

@ -9,7 +9,6 @@ stages:
- deploy - deploy
variables: variables:
MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
.build_template: .build_template:
@ -120,8 +119,6 @@ package:appimage-client:
- mkdir AppDir - mkdir AppDir
- cp -a artifact/minetest/usr/ AppDir/usr/ - cp -a artifact/minetest/usr/ AppDir/usr/
- cp -a clientmods AppDir/usr/share/minetest - 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 # Remove PrefersNonDefaultGPU property due to validation errors
- sed -i '/PrefersNonDefaultGPU/d' AppDir/usr/share/applications/net.minetest.minetest.desktop - sed -i '/PrefersNonDefaultGPU/d' AppDir/usr/share/applications/net.minetest.minetest.desktop
script: script:

@ -262,9 +262,6 @@ if(RUN_IN_PLACE)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/texture_packs_here.txt" DESTINATION "${SHAREDIR}/textures") install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/texture_packs_here.txt" DESTINATION "${SHAREDIR}/textures")
endif() 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") set(INSTALL_DEVTEST FALSE CACHE BOOL "Install Development Test")
if(INSTALL_DEVTEST) if(INSTALL_DEVTEST)
@ -336,16 +333,6 @@ cpack_add_component(Docs
DESCRIPTION "Documentation about Minetest and Minetest modding" 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) if(WIN32)
# Include all dynamically linked runtime libraries such as MSVCRxxx.dll # Include all dynamically linked runtime libraries such as MSVCRxxx.dll
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)

@ -1,7 +1,6 @@
ARG DOCKER_IMAGE=alpine:3.16 ARG DOCKER_IMAGE=alpine:3.16
FROM $DOCKER_IMAGE AS dev FROM $DOCKER_IMAGE AS dev
ENV MINETEST_GAME_VERSION master
ENV IRRLICHT_VERSION master ENV IRRLICHT_VERSION master
ENV SPATIALINDEX_VERSION 1.9.3 ENV SPATIALINDEX_VERSION 1.9.3
ENV LUAJIT_VERSION v2.1 ENV LUAJIT_VERSION v2.1
@ -52,18 +51,16 @@ COPY src /usr/src/minetest/src
COPY textures /usr/src/minetest/textures COPY textures /usr/src/minetest/textures
WORKDIR /usr/src/minetest WORKDIR /usr/src/minetest
RUN git clone --depth=1 -b ${MINETEST_GAME_VERSION} https://github.com/minetest/minetest_game.git ./games/minetest_game && \ RUN cmake -B build \
rm -fr ./games/minetest_game/.git && \ -DCMAKE_INSTALL_PREFIX=/usr/local \
cmake -B build \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr/local \ -DBUILD_SERVER=TRUE \
-DCMAKE_BUILD_TYPE=Release \ -DENABLE_PROMETHEUS=TRUE \
-DBUILD_SERVER=TRUE \ -DBUILD_UNITTESTS=FALSE \
-DENABLE_PROMETHEUS=TRUE \ -DBUILD_CLIENT=FALSE \
-DBUILD_UNITTESTS=FALSE \ -GNinja && \
-DBUILD_CLIENT=FALSE \ cmake --build build && \
-GNinja && \ cmake --install build
cmake --build build && \
cmake --install build
ARG DOCKER_IMAGE=alpine:3.16 ARG DOCKER_IMAGE=alpine:3.16
FROM $DOCKER_IMAGE AS runtime FROM $DOCKER_IMAGE AS runtime

@ -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 <celeron55@gmail.com> Copyright (C) 2010-2022 Perttu Ahola <celeron55@gmail.com>
and contributors (see source file comments and the version control log) 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 Table of Contents
------------------ ------------------

@ -54,7 +54,6 @@ android {
task prepareAssets() { task prepareAssets() {
def assetsFolder = "build/assets" def assetsFolder = "build/assets"
def projRoot = rootDir.parent def projRoot = rootDir.parent
def gameToCopy = "minetest_game"
// See issue #4638 // See issue #4638
def unsupportedLanguages = new File("${projRoot}/src/unsupported_language_list.txt").text.readLines() def unsupportedLanguages = new File("${projRoot}/src/unsupported_language_list.txt").text.readLines()
@ -81,9 +80,6 @@ task prepareAssets() {
copy { copy {
from "${projRoot}/fonts" include "*.ttf" into "${assetsFolder}/fonts" from "${projRoot}/fonts" include "*.ttf" into "${assetsFolder}/fonts"
} }
copy {
from "${projRoot}/games/${gameToCopy}" into "${assetsFolder}/games/${gameToCopy}"
}
copy { copy {
from "${projRoot}/textures" into "${assetsFolder}/textures" from "${projRoot}/textures" into "${assetsFolder}/textures"
} }

@ -38,7 +38,6 @@ public class Utils {
public static boolean isInstallValid(@NonNull Context context) { public static boolean isInstallValid(@NonNull Context context) {
File userDataDirectory = getUserDataDirectory(context); File userDataDirectory = getUserDataDirectory(context);
return userDataDirectory.isDirectory() && return userDataDirectory.isDirectory() &&
new File(userDataDirectory, "games").isDirectory() &&
new File(userDataDirectory, "builtin").isDirectory() && new File(userDataDirectory, "builtin").isDirectory() &&
new File(userDataDirectory, "client").isDirectory() && new File(userDataDirectory, "client").isDirectory() &&
new File(userDataDirectory, "textures").isDirectory(); new File(userDataDirectory, "textures").isDirectory();

@ -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 git clone --depth 1 https://github.com/minetest/minetest.git
cd minetest 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: 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 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 tar xf master.tar.gz
cd minetest-master 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: Download IrrlichtMt, without using Git:
cd lib/ cd lib/

@ -20,12 +20,6 @@ git clone --depth 1 https://github.com/minetest/minetest.git
cd minetest 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: Download Minetest's fork of Irrlicht:
``` ```

@ -3,7 +3,7 @@ minetest.register_on_joinplayer(function(player)
if not player or not player:is_player() then if not player or not player:is_player() then
return return
end 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 end
minetest.after(2.0, cb, player) minetest.after(2.0, cb, player)
end) end)

@ -1,9 +1,6 @@
CORE_GIT=https://github.com/minetest/minetest CORE_GIT=https://github.com/minetest/minetest
CORE_BRANCH=master CORE_BRANCH=master
CORE_NAME=minetest CORE_NAME=minetest
GAME_GIT=https://github.com/minetest/minetest_game
GAME_BRANCH=master
GAME_NAME=minetest_game
ogg_version=1.3.5 ogg_version=1.3.5
openal_version=1.23.0 openal_version=1.23.0
@ -45,11 +42,6 @@ get_sources () {
sourcedir=$PWD/$CORE_NAME sourcedir=$PWD/$CORE_NAME
[ -d $CORE_NAME ] && { pushd $CORE_NAME; git pull --ff-only; popd; } || \ [ -d $CORE_NAME ] && { pushd $CORE_NAME; git pull --ff-only; popd; } || \
git clone -b $CORE_BRANCH $CORE_GIT $CORE_NAME 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 # sets $runtime_dlls