Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove common from CMakeLists.txt, README.txt, lua-api.txt and buildwin.sh

Browse Source
This commit is contained in:
PilzAdam 2013-05-18 16:13:32 +02:00
parent 714ecc5e27
commit b76ec317c9
4 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -133,11 +133,6 @@ endif()
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}") install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client" DESTINATION "${SHAREDIR}") install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client" DESTINATION "${SHAREDIR}")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minimal" DESTINATION "${SHAREDIR}/games") install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minimal" DESTINATION "${SHAREDIR}/games")
set(COMMON_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/common")
if(EXISTS ${COMMON_SOURCE} AND IS_DIRECTORY ${COMMON_SOURCE})
install(FILES ${COMMON_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/common/")
install(DIRECTORY ${COMMON_SOURCE}/mods DESTINATION "${SHAREDIR}/games/common")
endif()
set(MINETEST_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game") set(MINETEST_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game")
if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE}) if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE})
install(FILES ${MINETEST_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/minetest_game/") install(FILES ${MINETEST_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/minetest_game/")

14
README.txt
View File

@ -9,10 +9,9 @@ and contributors (see source file comments and the version control log)
In case you downloaded the source code: In case you downloaded the source code:
--------------------------------------- ---------------------------------------
If you downloaded the Minetest Engine source code in which this file is If you downloaded the Minetest Engine source code in which this file is
contained, you probably want to download these projects too: contained, you probably want to download the minetest_game project too:
https://github.com/minetest/common/
https://github.com/minetest/minetest_game/ https://github.com/minetest/minetest_game/
See the README.txt in them. See the README.txt in it.
Further documentation Further documentation
---------------------- ----------------------
@ -92,13 +91,6 @@ $ wget https://github.com/minetest/minetest/tarball/master -O master.tar.gz
$ tar xf master.tar.gz $ tar xf master.tar.gz
$ cd minetest-minetest-286edd4 (or similar) $ cd minetest-minetest-286edd4 (or similar)
Download common (needed for minetest_game and some others)
$ cd games/
$ wget https://github.com/minetest/common/tarball/master -O common.tar.gz
$ tar xf common.tar.gz
$ mv minetest-common-* common
$ cd ..
Download minetest_game (otherwise only the "Minimal development test" game is available) Download minetest_game (otherwise only the "Minimal development test" game is available)
$ cd games/ $ cd games/
$ wget https://github.com/minetest/minetest_game/tarball/master -O minetest_game.tar.gz $ wget https://github.com/minetest/minetest_game/tarball/master -O minetest_game.tar.gz
@ -124,7 +116,7 @@ $ ./minetest
Compiling on Windows: Compiling on Windows:
--------------------- ---------------------
- This section is outdated. In addition to what is described here: - This section is outdated. In addition to what is described here:
- In addition to minetest, you need to download common and minetest_game. - In addition to minetest, you need to download minetest_game.
- If you wish to have sound support, you need libogg, libvorbis and libopenal - If you wish to have sound support, you need libogg, libvorbis and libopenal
- You need: - You need:

4
doc/lua_api.txt
View File

@ -50,12 +50,8 @@ where gameid is unique to each game.
The game directory contains the file game.conf, which contains these fields: The game directory contains the file game.conf, which contains these fields:
name = <Human-readable full name of the game> name = <Human-readable full name of the game>
common_mods = <Comma-separated list of common mods>
eg. eg.
name = Minetest name = Minetest
common_mods = bucket, default, doors, fire, stairs
Common mods are loaded from the pseudo-game "common".
The game directory can contain the file minetest.conf, which will be used The game directory can contain the file minetest.conf, which will be used
to set default settings when running the particular game. to set default settings when running the particular game.

11
util/buildbot/buildwin32.sh
View File

@ -53,9 +53,6 @@ cd $builddir
wget http://github.com/minetest/minetest/zipball/master \ wget http://github.com/minetest/minetest/zipball/master \
-c -O $packagedir/minetest.zip --tries=3 || (echo "Please download http://github.com/minetest/minetest/zipball/master manually and save it as $packagedir/minetest.zip"; read -s) -c -O $packagedir/minetest.zip --tries=3 || (echo "Please download http://github.com/minetest/minetest/zipball/master manually and save it as $packagedir/minetest.zip"; read -s)
[ -e $packagedir/minetest.zip ] || (echo "minetest.zip not found"; exit 1) [ -e $packagedir/minetest.zip ] || (echo "minetest.zip not found"; exit 1)
wget http://github.com/minetest/common/zipball/master \
-c -O $packagedir/common.zip --tries=3 || (echo "Please download http://github.com/minetest/common/zipball/master manually and save it as $packagedir/common.zip"; read -s)
[ -e $packagedir/common.zip ] || (echo "common.zip not found"; exit 1)
wget http://github.com/minetest/minetest_game/zipball/master \ wget http://github.com/minetest/minetest_game/zipball/master \
-c -O $packagedir/minetest_game.zip --tries=3 || (echo "Please download http://github.com/minetest/minetest_game/zipball/master manually and save it as $packagedir/minetest_game.zip"; read -s) -c -O $packagedir/minetest_game.zip --tries=3 || (echo "Please download http://github.com/minetest/minetest_game/zipball/master manually and save it as $packagedir/minetest_game.zip"; read -s)
[ -e $packagedir/minetest_game.zip ] || (echo "minetest_game.zip not found"; exit 1) [ -e $packagedir/minetest_game.zip ] || (echo "minetest_game.zip not found"; exit 1)
@ -69,7 +66,6 @@ wget http://github.com/minetest/minetest_game/zipball/master \
minetestdirname=`unzip -l $packagedir/minetest.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'` minetestdirname=`unzip -l $packagedir/minetest.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'`
minetestdir=$builddir/$minetestdirname || exit 1 minetestdir=$builddir/$minetestdirname || exit 1
git_hash=`echo $minetestdirname | sed -e 's/minetest-minetest-//'` git_hash=`echo $minetestdirname | sed -e 's/minetest-minetest-//'`
commondirname=`unzip -l $packagedir/common.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'`
minetest_gamedirname=`unzip -l $packagedir/minetest_game.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'` minetest_gamedirname=`unzip -l $packagedir/minetest_game.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'`
# Extract stuff # Extract stuff
@ -90,13 +86,6 @@ unzip -o $packagedir/minetest.zip || exit 1
rm -rf $builddir/minetest rm -rf $builddir/minetest
ln -s $minetestdir $builddir/minetest ln -s $minetestdir $builddir/minetest
# Extract common
cd $minetestdir/games || exit 1
rm -rf common || exit 1
unzip -o $packagedir/common.zip || exit 1
commondir=$minetestdir/games/$commondirname || exit 1
mv $commondir $minetestdir/games/common || exit 1
# Extract minetest_game # Extract minetest_game
cd $minetestdir/games || exit 1 cd $minetestdir/games || exit 1
rm -rf minetest_game || exit 1 rm -rf minetest_game || exit 1