Browse Source

Improve configurability and comments.

master
poikilos 5 years ago
parent
commit
a3ab609c69
  1. 58
      build-minetest-here.sh
  2. 2
      install-mts.sh
  3. 3
      minetestenv-in-place.rc

58
build-minetest-here.sh

@ -9,21 +9,63 @@ customExit(){
# echo # echo
#fi #fi
# cd $mybuild || customExit "$0: cd build failed in '`pwd`'." # cd $mybuild || customExit "$0: cd build failed in '`pwd`'."
if [ -z "$KEEP_MAKE" ]; then
KEEP_MAKE=0
fi
if [ -f bin/minetest ]; then if [ -f bin/minetest ]; then
make clean || customExit "$0: make clean failed in '`pwd`'." if [ "$KEEP_MAKE" != "1" ]; then
echo "* running 'make clean' in `pwd`..."
make clean || customExit "$0: make clean failed in '`pwd`'."
else
echo "* keeping existing intermediate build files in `pwd` (KEEP_MAKE=$KEEP_MAKE)..."
fi
fi fi
# echo "BREAKPOINT 20s..."
# sleep 20
if [ -z "$RUN_IN_PLACE" ]; then if [ -z "$RUN_IN_PLACE" ]; then
RUN_IN_PLACE=0 RUN_IN_PLACE=0
fi fi
cmake . -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DENABLE_LEVELDB=1 -DENABLE_REDIS=1 -DRUN_IN_PLACE=$RUN_IN_PLACE && make -j$(grep -c processor /proc/cpuinfo) || customExit "$0: Build failed in '`pwd`'."
echo
if [ "@$RUN_IN_PLACE" = "@1" ]; then
echo "WARNING: do not do make install with -DRUN_IN_PLACE=$RUN_IN_PLACE!"
fi
if [ "@$RUN_IN_PLACE" = "@true" ]; then if [ "@$RUN_IN_PLACE" = "@true" ]; then
echo "WARNING: do not do make install with -DRUN_IN_PLACE=$RUN_IN_PLACE!" RUN_IN_PLACE=1
elif [ "@$RUN_IN_PLACE" = "@on" ]; then
RUN_IN_PLACE=1
elif [ "@$RUN_IN_PLACE" = "@yes" ]; then
RUN_IN_PLACE=1
elif [ "@$RUN_IN_PLACE" = "@1" ]; then
RUN_IN_PLACE=1
elif [ "@$RUN_IN_PLACE" = "@off" ]; then
RUN_IN_PLACE=0
elif [ "@$RUN_IN_PLACE" = "@false" ]; then
RUN_IN_PLACE=0
elif [ "@$RUN_IN_PLACE" = "@no" ]; then
RUN_IN_PLACE=0
elif [ "@$RUN_IN_PLACE" = "@0" ]; then
RUN_IN_PLACE=0
else
echo "ERROR: There is an unknown value for RUN_IN_PLACE: '$RUN_IN_PLACE'"
exit 1
fi
echo "RUN_IN_PLACE=$RUN_IN_PLACE"
if [ "$RUN_IN_PLACE" = "0" ]; then
echo "3..."
sleep 1
echo "2..."
sleep 1
echo "1..."
sleep 1
fi
if [ ! -z "$BUILD_CLIENT" ]; then
client_line="-DBUILD_CLIENT=$BUILD_CLIENT"
fi fi
if [ "@$RUN_IN_PLACE" = "@on" ]; then if [ ! -z "$BUILD_SERVER" ]; then
server_line="-DBUILD_SERVER=$BUILD_SERVER"
fi
cmake . $server_line $client_line -DOpenGL_GL_PREFERENCE=GLVND -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DENABLE_LEVELDB=1 -DENABLE_REDIS=1 -DRUN_IN_PLACE=$RUN_IN_PLACE && make -j$(grep -c processor /proc/cpuinfo) || customExit "$0: Build failed in '`pwd`'."
echo
if [ "@$RUN_IN_PLACE" = "@1" ]; then
echo "WARNING: do not do make install with -DRUN_IN_PLACE=$RUN_IN_PLACE!" echo "WARNING: do not do make install with -DRUN_IN_PLACE=$RUN_IN_PLACE!"
fi fi
echo echo

2
install-mts.sh

@ -227,7 +227,7 @@ END
if [ ! -f "$PATCH_BUILD" ]; then if [ ! -f "$PATCH_BUILD" ]; then
customExit "$PATCH_BUILD must exist when using the --MT_SRC=<path> (custom local copy of minetest source) option" customExit "$PATCH_BUILD must exist when using the --MT_SRC=<path> (custom local copy of minetest source) option"
fi fi
echo "* starting PATCH_BUILD ($PATCH_BUILD build $server_option $extra_options $custom_src_option" echo "* running PATCH_BUILD ($PATCH_BUILD build $server_option $extra_options $custom_src_option (writing output to `pwd`/program.log). This may take a while..."
$PATCH_BUILD build $server_option $client_option $extra_options $custom_src_option >& program.log $PATCH_BUILD build $server_option $client_option $extra_options $custom_src_option >& program.log
elif [ -f "mtcompile-program.pl" ]; then elif [ -f "mtcompile-program.pl" ]; then
# perl mtcompile-program.pl build >& program.log # perl mtcompile-program.pl build >& program.log

3
minetestenv-in-place.rc

@ -51,8 +51,9 @@ ERROR:
$1 $1
Waiting 3s before exit...
END END
sleep 10 sleep 3
exit $errorCode exit $errorCode
} }

Loading…
Cancel
Save