ABOUT: Cosmetic changes to versions as well as mention of people on R…

…EADME
QW-Group · Apr 16, 2020 · 4a65118 · 4a65118
1 parent 2b42399
commit 4a65118
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -5,8 +5,6 @@
 
 **[MVDSV][mvdsv]** (MultiView Demo SerVer) has been the most popular **QuakeWorld** server in the world for more than a decade because of its ability to record every player's point of view in a server side demo and provide many different game modes to enjoy **QuakeWorld** with.
 
-_(This README.md file is still a work in progress. bear with us while we polish it!)_
-
 ## Getting Started
 
 The following instructions will help you get a **[MVDSV][mvdsv]** server up and running on your local machine from prebuilt binaries. Details on how to compile your own **[MVDSV][mvdsv]** binary will also be included to match specific architectures or for development purposes.
@@ -40,14 +38,14 @@ There are extra conditionals to install desired packages based on the TARGET.
 
 In general:
 
-- use Ubuntu 14.04 (but should work under 16.04 as well) as virtual machine, check out source code there
+- use Ubuntu 18.04 as virtual machine, check out details about it on code on [Travis CI website][travis-build-env]
 - install required packages for compilation
 - set up virtualenv and install python packages (required for meson and ninja builders)
 - run meson build for given directory (optionally with cross compilation settings)
-- run ninja to generate .so file
-- you should have ``mvdsv`` file in ``build_*`` directory, put it in your quake server/ directory.
+- run ninja to generate the binary file
+- you should have ``mvdsv`` file in ``build`` directory, put it in your quake server/ directory.
 
-Example for Linux amd64 under Ubuntu 14.04 (should be similar under 16.04)
+#### Example for Linux amd64
 
 Install required packages:
 
@@ -77,13 +75,13 @@ Export env var to define what target to compile, run the build commands.
 
 ```bash
 $ export TARGET=linux-amd64
-$ rm -rf build_${TARGET}
+$ rm -rf build
 
 $ meson build_${TARGET} --cross-file tools/cross-compilation/${TARGET}.txt
 The Meson build system
 Version: 0.41.2
 Source dir: /mvdsv/src
-Build dir: /mvdsv/src/build_linux-linux-amd64
+Build dir: /mvdsv/src/build
 Build type: cross build
 Project name: mvdsv
 Native c compiler: cc (gcc 5.4.0)
@@ -101,22 +99,22 @@ Library m found: YES
 Library dl found: YES
 Build targets in project: 1
 
-$ ninja -C build_${TARGET}
+$ ninja -C build
 
-ninja: Entering directory `build_linux-amd64'
+ninja: Entering directory `build'
 [46/46] Linking target mvdsv.
 
 ```
 
 Check the output binary file:
 
 ```bash
-$ file build_${TARGET}/mvdsv
-build_linux-amd64/mvdsv: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.32, BuildID[sha1]=dedd6661cff55d457b15d2641c02baaf7be9a8b1, not stripped
+$ file build/mvdsv
+build/mvdsv: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.32, BuildID[sha1]=dedd6661cff55d457b15d2641c02baaf7be9a8b1, not stripped
 
 ```
 
-In ``build_*/`` there will be ``mvdsv`` binary, change permissions to executable and copy it to quake directory to start quake server.
+In ``build/`` there will be ``mvdsv`` binary, change permissions to executable and copy it to quake directory to start quake server.
 
 Known issues:
 
@@ -172,12 +170,13 @@ This project is licensed under the GPL-2.0 License - see the [LICENSE.md](LICENS
 
 ## Acknowledgments
 
-* Hat tip to anyone who's code was used
-* Inspiration
-* etc
+* Thanks to **Jon "bps" Cednert** for the **[MVDSV][mvdsv]** logo.
+* Thanks to the fine folks on [Quakeworld Discord][discord-qw] for their support and ideas.
 
-[ktx]: https://github.com/deurk/ktx
 [mvdsv]: https://github.com/deurk/mvdsv
 [mvdsv-tags]: https://github.com/deurk/mvdsv/tags
+[mvdsv_builds]: https://builds.quakeworld.nu/mvdsv
+[ktx]: https://github.com/deurk/ktx
 [nquake-linux]: https://github.com/nQuake/server-linux
-[mvdsv_builds]: https://builds.quakeworld.nu/mvdsv
+[travis-build-env]: https://docs.travis-ci.com/user/reference/bionic/
+[discord-qw]: http://discord.quake.world/
diff --git a/src/build.c b/src/build.c
@@ -27,10 +27,6 @@
 
 #include "qwsvdef.h"
 
-#ifndef GIT_COMMIT
-#define GIT_COMMIT "unknown"
-#endif
-
 /*
 =======================
 VersionString
@@ -64,6 +60,6 @@ Version_f
 */
 void Version_f (void)
 {
-	Con_Printf ("%s\n%s\nHomepage: %s\n", VersionStringFull(), BUILD_DATE, PROJECT_URL);
+	Con_Printf ("%s\n%s\nHome page: %s\n", VersionStringFull(), BUILD_DATE, HOMEPAGE_URL);
 }
 
diff --git a/src/sv_main.c b/src/sv_main.c
@@ -3487,7 +3487,9 @@ void SV_InitLocal (void)
 	Info_SetValueForStarKey (svs.info, "*z_ext", va("%i", SERVER_EXTENSIONS), MAX_SERVERINFO_STRING);
 
 	Info_SetValueForStarKey (svs.info, "mvdsvver", VERSION_NUMBER, MAX_SERVERINFO_STRING);
-	Info_SetValueForStarKey (svs.info, "mvsvbuild", GIT_COMMIT, MAX_SERVERINFO_STRING);
+	Info_SetValueForStarKey (svs.info, "mvdsvbuild", GIT_COMMIT, MAX_SERVERINFO_STRING);
+	Info_SetValueForStarKey (svs.info, "mvdsvdate", BUILD_DATE, MAX_SERVERINFO_STRING);
+	Info_SetValueForStarKey (svs.info, "mvdsvurl", HOMEPAGE_URL, MAX_SERVERINFO_STRING);
 
 	// init fraglog stuff
 	svs.logsequence = 1;

diff --git a/src/version.h b/src/version.h
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 #if defined(_WIN32)
-#define QW_PLATFORM			"Win32"
+#define QW_PLATFORM			"Windows"
 #define QW_PLATFORM_SHORT	"(w)"
 
 #elif defined(__FreeBSD__)
@@ -52,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define QW_PLATFORM_SHORT	"(s)"
 
 #elif defined(__APPLE__)
-#define QW_PLATFORM			"MacOSX" // Darwin was changed to MacOSX
+#define QW_PLATFORM			"MacOS"
 #define QW_PLATFORM_SHORT	"(m)"
 
 #else
@@ -65,10 +65,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define VERSION_NUMBER      "0.33-beta"
 #define VERSION_NUM         0.32
 #define SERVER_NAME         "MVDSV"
-
-#define PROJECT_NAME        SERVER_NAME
-#define PROJECT_URL         "https://github.com/deurk/mvdsv"
-#define BUILD_DATE          "Build date: " __DATE__ ", " __TIME__
+#define HOMEPAGE_URL        "https://github.com/deurk/mvdsv"
+#define BUILD_DATE          __DATE__ ", " __TIME__
 #define GIT_COMMIT          "unknown"