-Repository Access
-=================
+Repository Access and Compiling
+===============================
-Xonotic uses several Git repositories. There’s a helper script in the main repository to aid in checking out all relevant repositories and help you with building and running Xonotic.
-The repository also contains several branches next to the stable “master” branch. So if you’re interested in the progress of a certain feature, or want to help or create a new one, you can checkout the appropriate branch.
-For information on how to obtain write access, skip down to the “[Getting write access](Repository_Access#contributing-and-getting-write-access)” section.
+Xonotic uses [several Git repositories](Git). The `all` script in the main repo manages them, builds Xonotic and runs it. Each repo can also contain feature branches next to the stable `master` branch, check them out for WIP features.
-For more information about Git we have a [Git](Git) page on the wiki [here](Git).
+***
Setting up the development environment
--------------------------------------
-The first thing you must do in order to begin development is set up your system to be able to download and compile the Xonotic game data.
+You first need tools to download and compile the Xonotic game data. Make sure you have at least 2 GB memory to compile.
### Linux
-Linux already has an adequate base for development, all we really need to do here is install the dependencies for the download/compilation process and then we can move right along to cloning the data.
+Linux already is adequate for development, all we need are the **dependencies** for the download/compilation process and then we can clone the data.
-Ubuntu Dependencies (independent package x11-proto-devel dependencies fill the rest of the Debian package dependencies):
+**Ubuntu Dependencies** (independent package `x11-proto-devel` dependencies fill the rest of the Debian package dependencies):
- sudo apt-get install build-essential xserver-xorg-dev x11proto-xf86dri-dev x11proto-xf86dga-dev x11proto-xf86vidmode-dev libxxf86dga-dev libxcb-xf86dri0-dev libxpm-dev libxxf86vm-dev libsdl1.2-dev libsdl-image1.2-dev libclalsadrv-dev libasound2-dev libxext-dev libsdl1.2debian libjpeg-turbo8-dev git-core unzip wget
+ sudo apt-get install build-essential curl xserver-xorg-dev x11proto-xf86dri-dev x11proto-xf86dga-dev x11proto-xf86vidmode-dev libxxf86dga-dev libxcb-xf86dri0-dev libxpm-dev libxxf86vm-dev libsdl1.2-dev libsdl2-dev libsdl2-image-dev libclalsadrv-dev libasound2-dev libxext-dev libjpeg-turbo8-dev git-core unzip wget zlib1g-dev
-Note: If using i386 architecture, you can replace libdsl1.2debian by ibsdl1.2debian:i386 in the list above. On Debian, use libjpeg8-dev if libjpeg-turbo8-dev isn’t available in the package repositories. To be able to download maps from game servers when using Xonotic for online gaming, you will also need curl installed on your system.
+Note: If using **i386** architecture, you can replace `libsdl1.2debian` with `libsdl1.2debian:i386` in the list above. On Debian, use `libjpeg8-dev` if `libjpeg-turbo8-dev` isn’t available in the package repositories.
-For Fedora and other RPM based distro’s, compiling dependencies are as follows:
+For **Fedora** and other **RPM based** distros dependencies:
- x11-proto-devel, libalsa2-static-devel libjpeg62-devel libjpeg62-static-devel libSDL-devel
+ x11-proto-devel libalsa2-static-devel libjpeg62-devel libjpeg62-static-devel libSDL2-devel
+
+For **Archlinux** the dependencies can be installed via the following command:
+
+ sudo pacman -S alsa-lib curl libjpeg-turbo libmodplug libpng libvorbis libxpm libxxf86dga libxxf86vm sdl2 unzip wget
### Windows
-By default, Windows has no real environment to handle the necessary scripting and compiling tools for building Xonotic… So, what we have to do is install something called [msysgit](https://code.google.com/p/msysgit/downloads/list) to allow us to have a similar environment as on Linux. In this case, we want the download which is entirely self contained (including build-essentials and other corely required dependencies), which at the time of writing this is called “msysGit-fullinstall-1.8.0-preview20121022.exe.” Simply follow the instructions on screen at this point. NOTE: Unless you know what you’re doing, install with default settings/directories.
+By default, Windows has no real environment to handle the necessary scripting and compiling tools for building Xonotic. So, what we have to do is install something called [MSYS2](http://www.msys2.org) to allow us to have a similar environment as on Linux. Download 64 bit version of MSYS2 (msys2-x86_64-xxxxxx.exe) and follow installation instructions.
+
+Once you have completed the installation, launch the MSYS2 shell by running `mingw64.exe` (instead of the default msys2.exe) by default located at `C:\msys64` and install the needed **dependencies** with this command:
+
+ pacman --needed -S git curl zip unzip p7zip make automake autoconf libtool gcc gmp-devel mingw-w64-x86_64-{toolchain,gmp,SDL2,libjpeg-turbo,libpng,libogg}
+
+It is recommended that you make a shortcut to MSYS2 MINGW64 shell (simply right click mingw64.exe and hit “Create Shortcut”) for easier access on your desktop or in your start menu.
-Once you have completed the installation, you should be able to launch the msysgit shell by simply finding “msys.bat”- by default, it is located at: C:.bat, and you can use this shell to continue on with the guide and clone and compile the Xonotic repositories. It is recommended that you make a shortcut to msysgit (simply right click the shell and hit “Create Shortcut”) for easier access on your desktop or in your start menu.
+You can now use this shell to continue on with the guide and clone the Xonotic repositories.
### Mac OSX
-You must first install XCode which comes on your installation DVD or can be downloaded from the Apple website. This package provides tools like Git and GCC, which are needed for successful checkout and compilation of Xonotic. Some versions of XCode come with Git and others don’t - if you don’t have Git after installing XCode get it here: http://code.google.com/p/git-osx-installer/
+You must first install **XCode** which comes on your installation DVD or can be downloaded from the Apple website. This package provides tools like **Git and GCC**, which are needed for successful checkout and compilation of Xonotic. Some versions of XCode come with Git and others don’t - if you don’t have Git after installing XCode get it here: [XCode installer](http://sourceforge.net/projects/git-osx-installer/files/)
-After your development environment is all set up, you can continue on to cloning the git repository and compiling Xonotic.
+***
Cloning the repository and compiling
------------------------------------
-Making sure that your environment is set up properly, you can do the following to begin downloading and compilation (execute the first line only to download):
+To begin downloading:
- git clone git://git.xonotic.org/xonotic/xonotic.git
+ git clone git://git.xonotic.org/xonotic/xonotic.git # download main repo
cd xonotic
- ./all update -l best
+ ./all update -l best # download all other repos (data + game logic, maps, etc.)
-Take care do do these steps as normal user on Linux (not as a superuser), otherwise you’ll have to take care about the file permissions later on.
+The **git://** protocol uses port **9418**, which may be a problem if you’re behind a **strict firewall**. You may instead use the clone url http://git.xonotic.org/xonotic/xonotic.git (however, using the git protocol directly is preferred for performance reasons).
-The git:// protocol uses port 9418, which may be a problem if you’re behind a strict firewall. You may instead use the clone url <code>http://git.xonotic.org/xonotic/xonotic.git</code> (however, using the git protocol directly is preferred for performance reasons).
+For Windows users: once finished cloning move to the main repository (`cd xonotic`) and checkout the branch Mario/Win64 with the command:
-After that, you have a working checkout of the repository. The game can be compiled and run with the following commands:
+ git checkout -b Mario/win64 origin/Mario/win64
- ./all compile
+Now the game can be compiled and run with the following commands:
+
+ ./all compile -r
./all run
-The run line can be followed by one of “glx” (Linux native), “sdl” (input/sound managed by SDL), agl (OSX native), wgl (Windows native), or dedicated (for server hosting) to choose which executable to run or compile… Seen as follows:
+**Note:** if you encounter en error similar to darkplaces#111, try `./all clean && ./all compile -r -0`.
- ./all compile dedicated
- ./all run wgl
- ./all run sdl
+You can use just `./all compile` to create a slower build with debug symbols but usually you want `-r`.
-The run command can also be followed by standard DarkPlaces commandline arguments:
+The `./all run` or `./all compile` line can be followed by one of `glx` (Linux native), `sdl` (input/sound managed by SDL), `agl` (OSX native), `wgl` (Windows native), or `dedicated` (for server hosting) to choose which executable to run or compile. E.g. `./all compile -r dedicated`.
+
+The `run` command can also be followed by standard DarkPlaces commandline arguments:
./all run +vid_fullscreen 0
-To update your Git clone, you can repeat the commands above without the first “git clone” line- And don’t forget to compile after you update- Like this:
+To update your Git clone:
cd xonotic
- ./all update
- ./all compile
+ ./all checkout # switch to main branch on all repos (usually master)
+ ./all update # pull and prune
+ ./all compile -r # recompile what changed
+
+**Note:** The compiled binary will have a faint watermark with the git revision. To remove it completely put `set menu_watermark ""` into your `autoexec.cfg`.
+
+**Note:** If you intend to play on public servers, you should probably also enable the nexcompat repo to download additional textures that are used on some older unofficial maps. Use `touch data/xonotic-nexcompat.pk3dir.yes` and `./all update`. For mappers: these textures should NOT be used on new maps.
+
+***
+
+If you run into issues with the latest version you can easily revert to an older one. Since most bugs are caused by the game code rather that the engine, you just need to downgrade that repository. Inside the main xonotic repository, use `cd data/xonotic-data.pk3dir` and then `git checkout <some older commit>`. After that go back `cd -` and `./all compile` (with the optional `-r` flag).
+
+***
Contributing and getting write access
-------------------------------------
\* data/qcsrc/warpzonelib - dual licensed as “GPLv2 or later” or MIT license.
In case the code you pushed was not written by you, it is your responsibility to ensure proper licensing.
-To apply for write access, make an issue of type “Support” in the category “Repository” and attach your public SSH key to it. (Windows users: see the Windows section below for more on SSH keys)
+To apply for write access, add your SSH key to your GitLab account and ask for access in #xonotic on the FreeNode IRC network or [request access](https://docs.gitlab.com/ce/user/group/index.html#request-access-to-a-group) using the GitLab interface.
### Windows/Linux/OS X
./all keygen
-and follow the instructions that are shown.
+and follow the instructions that are shown. Be sure that you've done:
-After that, you can write to the repository using the usual git commands (commit, push).
+ ./all update -p
-Alternatively, you can use the helper script “all”.
+After that, you can write to the repositories using the usual git commands (commit, push, ...).
+
+Alternatively, you can use the helper script `all`.
It supports the following commands:
./all update
./all compile
-Compiles the game, assuming that you have the required libs installed.
+Compiles the game, assuming that you have the required libs installed. Don't forget `-r` if you wanna actually play the game with decent fps.
./all checkout BRANCH
-----------------------
About tracking remote branches:
-http://www.gitready.com/beginner/2009/03/09/remote-tracking-branches.html
+http://git-scm.com/book/en/v2/Git-Branching-Remote-Branches
This wiki’s [Git](Git) page.
A tutorial to Git for SVN users:
http://git-scm.org/course/svn.html
-
projects / xonotic / xonotic.wiki.git / blobdiff