(Commit created by redmine exporter script from page "Repository_Access" version 49)

[xonotic/xonotic.wiki.git] / Repository_Access.textile

diff --git a/Repository_Access.textile b/Repository_Access.textile
index 5fc3b9e6e27551c411f0bac2b7e36b08e48e0522..e72580b8c03eaec1c72694130d12c8c55b41a59e 100644 (file)
--- a/Repository_Access.textile
+++ b/Repository_Access.textile
@@ -12,7 +12,7 @@ h2. Cloning the repository and compiling
 
 h3. Linux
 
-First, you install git using your favorite package manager. Then, do the following to download and compile (execute the first line only to download)::
+First, you install git using your favorite package manager. Then, do the following to download and compile (execute the first line only to download):
 
 <pre>
 git clone git://git.xonotic.org/xonotic/xonotic.git
@@ -22,39 +22,31 @@ cd xonotic
 
 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.
 
-After that, you have a working checkout of the repository.
-
-Ubuntu Dependencies:
+After that, you have a working checkout of the repository. The game can be compiled and run with the following commands:
 
 <pre>
-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-pulseaudio
+./all compile
+./all run
 </pre>
 
+The run line can be followed by one of glx,sdl,agl,dedicated to choose which executable to run. It can also be followed by standard DarkPlaces commandline arguments.
 
-h3. Windows
-
-To get a GIT clone using mysysgit and Tortoise GIT, do the following:
-* Go to the folder where you intend to clone, right click and choose Git Clone from the context menu. Clone the repository from git://git.xonotic.org/xonotic/xonotic.git and wait for everything to download.
-* Once the first step is ready, open a command prompt or git bash and browse to the root folder of your clone. Write "./all update" as described above to get the separate data repos. After that you have a working GIT clone.
-
-To compile, you will need mingw and msys (1.0.11 should be good enough, follow "this guide":http://www.mingw.org/wiki/msys).
-You should set the path to the "bin" directory of msysgit inside your PATH environment variable. There are plenties of information on how to do this depending on your Windows version, just google it.
+To update your git clone, you can repeat the commands above without the first "git clone" line. Don't forget to compile after you update.
 
-Then, *from the msys shell*, cd into the xonotic git clone and run
+Ubuntu Dependencies:
 
 <pre>
-CC=gcc ./all compile
+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-pulseaudio git-core unzip wget
 </pre>
 
-If that works, you can then run xonotic (still from msys) using
 
-<pre>
-./all run
-</pre>
+h3. Windows
+
+See [[Compiling in Windows]]
 
 h3. 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. You should also install the SDL framework according to their readme, available from http://www.libsdl.org/download-1.2.php
+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/
 
 When you have done this, you can follow the Linux instructions above.
 
@@ -71,10 +63,11 @@ h3. Linux/OS X
 Get a checkout (see above), and do:
 
 <pre>
-git config remote.origin.url ssh://xonotic@git.xonotic.org/xonotic.git
-./all update
+./all keygen
 </pre>
 
+and follow the instructions that are shown.
+
 After that, you can write to the repository using the usual git commands (commit, push).
 
 Alternatively, you can use the helper script "all".
@@ -110,6 +103,12 @@ Compiles the game given that you have the required libs installed
 
 Switch to that branch in all repositories where its available
 
+<pre>
+./all commit
+</pre>
+
+This command commits and pushes your local changes.
+
 <pre>
 ./all run xonotic
 </pre>