Renamed ZetaGlest to Glest

This commit is contained in:
mathusummut
2019-01-31 02:40:31 +01:00
parent 94493ab109
commit d5775734d7
536 changed files with 2372 additions and 2411 deletions

10
mk/linux/.gitignore vendored
View File

@@ -1,8 +1,8 @@
/zetaglest
/zetaglest.6
/zetaglest_editor*
/zetaglest_g3dviewer*
/zetaglest_tests
/glest
/glest.6
/glest_editor*
/glest_g3dviewer*
/glest_tests
!/*.desktop

View File

@@ -3,7 +3,7 @@
# Use this script to install build dependencies on a number of Linux platforms
# ----------------------------------------------------------------------------
# Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Rewritten by Tom Reynolds <tomreyn@megaglest.org>
# Rewritten by Tom Reynolds <tomreyn@glest.org>
# Copyright (c) 2012-2017 Mark Vejvoda, Tom Reynolds under GNU GPL v3.0
LANG=C
@@ -59,7 +59,7 @@ fi
common_info() {
echo
if [ "$1" != "no_install" ]; then
echo 'Please report a bug at https://github.com/ZetaGlest/zetaglest-source providing the following information:'
echo 'Please report a bug at https://github.com/Glest/glest-source providing the following information:'
fi
echo '--- snip ---'
echo 'Git revision: '"$gitcommit"
@@ -71,8 +71,8 @@ common_info() {
echo '--- snip ---'
echo
if [ "$1" = "+wiki" ]; then
echo 'For now, you may want to take a look at the build hints on the ZetaGlest readme at:'
echo ' https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md'
echo 'For now, you may want to take a look at the build hints on the Glest readme at:'
echo ' https://github.com/Glest/glest-source/blob/develop/BUILD.md'
echo 'If you can come up with something which works for you, please report back to us, too. Thanks!'
exit 1
fi

View File

@@ -1,5 +1,5 @@
#!/bin/bash
# Use this script to build ZetaGlest using cmake
# Use this script to build Glest using cmake
# ----------------------------------------------------------------------------
# Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2011-2013 Mark Vejvoda under GNU GPL v3.0+
@@ -9,7 +9,7 @@
# Configuration section
#
echo "Building ZetaGlest..."
echo "Building Glest..."
echo
# Default to English language output so we can understand your bug reports
@@ -120,7 +120,7 @@ cd ${SCRIPTDIR}
# The default configuration works fine for regular developers and is also used
# by our installers.
# For more cmake/build options refer to
# https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md
# https://github.com/Glest/glest-source/blob/develop/BUILD.md
EXTRA_CMAKE_OPTIONS=
# Build threads
@@ -328,6 +328,6 @@ else
echo ''
echo 'BUILD COMPLETE.'
echo ''
echo 'The ZetaGlest executable can be found using the following path:'
echo ' zetaglest/mk/linux/build/zetaglest'
echo 'The Glest executable can be found using the following path:'
echo ' glest/mk/linux/build/glest'
fi

4
mk/linux/build-zg.sh → mk/linux/build.sh Executable file → Normal file
View File

@@ -1,5 +1,5 @@
#!/bin/bash
# Use this script to build ZetaGlest using cmake
# Use this script to build Glest using cmake
# ----------------------------------------------------------------------------
# Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2011-2013 Mark Vejvoda under GNU GPL v3.0+
@@ -9,5 +9,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
cd $DIR
./build-deps.sh
echo
./build-zg-nodeps.sh
./build-nodeps.sh
cd $currentDir

View File

@@ -6,7 +6,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
cd $DIR
mkdir build
cd build
git clone https://github.com/ZetaGlest/zetaglest-data.git data --branch 1.0
git clone https://github.com/Glest/glest-data.git data --branch 1.0
cd ..
if [ `id -u`'x' == '0x' ] || [ "$1" == "--manually" ]; then

View File

@@ -2,7 +2,7 @@
#
# Functions shared by several scripts
#
# Copyright (c) 2013-2018 ZetaGlest Team under GNU GPL v3.0+
# Copyright (c) 2013-2018 Glest Team under GNU GPL v3.0+
function detect_system {
# Determine distro title, release, codename

View File

@@ -1,6 +1,6 @@
#!/bin/bash
echo
echo "Initializing ZetaGlest setup..."
echo "Initializing Glest setup..."
currentDir=$PWD
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
cd $DIR
@@ -8,5 +8,5 @@ cd $DIR
echo
./pull.sh
echo
./build-zg.sh
./build.sh
cd $currentDir

View File

@@ -22,7 +22,7 @@
# the next user who connects (or had already connected) takes control.
#
# ----------------------------------------------------------------------------
# 2013 Written by Tom Reynolds <tomreyn[at]zetaglest.org>
# 2013 Written by Tom Reynolds <tomreyn[at]glest.org>
# 2015 Rewritten by filux <heross(@@)o2.pl>
# Copyright (c) 2013-2017 under GNU GPL v3.0+
# ----------------------------------------------------------------------------
@@ -40,11 +40,11 @@ B_SCRIPT_DIR="$GAMEDIR"
# -------
# useful for mods
BASIC_SCRIPT="start_zetaglest"
FAKE_EXC_BINARY_MAC="ZetaGlest"
EXC_BINARY="zetaglest"
EXC_BINARY_DISTRO="zetaglest"
SHORT_GAME_NAME="zetaglest"
BASIC_SCRIPT="start_glest"
FAKE_EXC_BINARY_MAC="Glest"
EXC_BINARY="glest"
EXC_BINARY_DISTRO="glest"
SHORT_GAME_NAME="glest"
# -------
PORTSTART=62001
NUM_OM_SERVERS=2

View File

@@ -9,20 +9,20 @@ LANG=C
SCRIPTLOCATION="$(readlink -f "$0")"
GAMEDIR="$(dirname "$SCRIPTLOCATION")"
ARCHITECTURE="$(uname -m | tr '[A-Z]' '[a-z]')"
BugReportEngine="https://github.com/ZetaGlest/zetaglest-source/issues"
BugReportBoth="https://github.com/ZetaGlest"
BugReportEngine="https://github.com/Glest/glest-source/issues"
BugReportBoth="https://github.com/Glest"
# -------
# useful for mods
BugReportBoth2="$BugReportBoth"
BugReportData="https://github.com/ZetaGlest/zetaglest-data/issues"
BugReportData="https://github.com/Glest/glest-data/issues"
EXC_BINARY="zetaglest"
if [ -f "${GAMEDIR}/zetaglest_shim" ]; then EXC_BINARY="zetaglest_shim"
EXC_BINARY="glest"
if [ -f "${GAMEDIR}/glest_shim" ]; then EXC_BINARY="glest_shim"
SHORT_GAME_NAME="zetaglest"
SHORT_GAME_NAME="glest"
# if long game name contain spaces then write it inside quotes
# e.g. "\"long name with spaces\""
LONG_GAME_NAME="ZetaGlest"
LONG_GAME_NAME="Glest"
# -------
LIBDIR="lib"; ExitStatus=0; LibsWarnings=""; IgnoredLibs=""; FirstLnError=""

View File

@@ -8,8 +8,8 @@ SCRIPTLOCATION="$(readlink -f "$0")"
GAMEDIR="$(dirname "$SCRIPTLOCATION")"
# -------
# useful for mods
EXC_BINARY="zetaglest_g3dviewer"
BASIC_SCRIPT="start_zetaglest"
EXC_BINARY="glest_g3dviewer"
BASIC_SCRIPT="start_glest"
# -------
LIBDIR="lib"
WARNINGS="$("$GAMEDIR/$BASIC_SCRIPT" --tool-g3dviewer "$EXC_BINARY" 2>&1)"

View File

@@ -8,8 +8,8 @@ SCRIPTLOCATION="$(readlink -f "$0")"
GAMEDIR="$(dirname "$SCRIPTLOCATION")"
# -------
# useful for mods
EXC_BINARY="zetaglest_editor"
BASIC_SCRIPT="start_zetaglest"
EXC_BINARY="glest_editor"
BASIC_SCRIPT="start_glest"
# -------
LIBDIR="lib"
WARNINGS="$("$GAMEDIR/$BASIC_SCRIPT" --tool-editor "$EXC_BINARY" 2>&1)"