Skip to content

Commit 1ecfd9b

Browse files
committed
separate git section, main docs apply to downloaded release source (needs update for Linux and Windows)
1 parent d8c3c90 commit 1ecfd9b

File tree

3 files changed

+62
-39
lines changed

3 files changed

+62
-39
lines changed

doc/INSTALL.t2t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,6 @@ source directory.
8686

8787
%!include: osx.t2t
8888

89+
%!include: git.t2t
90+
8991
%!include: iauthors.t2t

doc/git.t2t

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
2+
= git =[git]
3+
4+
== Installation ==
5+
6+
Optional. If you want to try different branches and/or easily update the source when changes are made, install git and clone the source. For random just-want-to-see-what's-going-on-in-development builds, download a tarbal from github.
7+
8+
=== Install git for GNU/Linux ===
9+
10+
=== install git for Windows ===
11+
12+
=== Install git for OSX ===
13+
14+
The [git http://git-scm.com/] project has a downloadable build of git.
15+
Make sure to get the package matching your processor (x86_64 most likely, only the first Intel Macs need the i386 package).
16+
17+
Once downloaded open the disk image and run the installer.
18+
19+
__PPC/source note__
20+
21+
The git site does not offer PPC builds. If you need a PPC build, or you just want
22+
a little more control over the installation, you need to compile it yourself.
23+
24+
Download the source from http://git-scm.com/. Unzip it, and in a Terminal cd to the source folder, then:
25+
26+
```
27+
make prefix=/usr/local
28+
sudo make prefix=/usr/local install
29+
```
30+
31+
If you don't need any of the extras, Perl, Python or TclTk (GUI), you can disable them before running make with:
32+
33+
```
34+
export NO_PERL=
35+
export NO_TCLTK=
36+
export NO_PYTHON=
37+
```
38+
39+
== Get QGIS from git ==
40+
41+
You can download a development tarball (no git installation needed) from:
42+
43+
http://github.com/qgis/Quantum-GIS
44+
45+
This defaults to the current master, but you can select any other branch or tag as desired.
46+
47+
Or for more long-term testing of development sources: clone the sources with git (in an appropriate location on your computer):
48+
49+
```
50+
git clone git://github.com/qgis/Quantum-GIS.git
51+
```
52+
53+
This automatically activates the master. To switch to another branch:
54+
55+
```
56+
git checkout [branchname]
57+
```

doc/osx.t2t

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -334,47 +334,11 @@ make
334334
sudo make install
335335
```
336336

337-
== Install git for OSX ==
337+
== QGIS source ==
338338

339-
The [git http://git-scm.com/] project has a downloadable build of git.
340-
Make sure to get the package matching your processor (x86_64 most likely, only the first Intel Macs need the i386 package).
339+
Unzip the QGIS source tarball to a working folder of your choice (/usr/somewhere is not a good choice as it's hidden and requires root privileges). If you are reading this from the source, you've already done this.
341340

342-
Once downloaded open the disk image and run the installer.
343-
344-
__PPC/source note__
345-
346-
The git site does not offer PPC builds. If you need a PPC build, or you just want
347-
a little more control over the installation, you need to compile it yourself.
348-
349-
Download the source from http://git-scm.com/. Unzip it, and in a Terminal cd to the source folder, then:
350-
351-
```
352-
make prefix=/usr/local
353-
sudo make prefix=/usr/local install
354-
```
355-
356-
If you don't need any of the extras, Perl, Python or TclTk (GUI), you can disable them before running make with:
357-
358-
```
359-
export NO_PERL=
360-
export NO_TCLTK=
361-
export NO_PYTHON=
362-
```
363-
364-
== Check out QGIS from git ==
365-
366-
Now we are going to check out the sources for QGIS. First we will create a
367-
directory for working in (or some folder of your choice):
368-
369-
```
370-
mkdir -p ~/dev/cpp cd ~/dev/cpp
371-
```
372-
373-
Now we check out the sources:
374-
375-
```
376-
git clone git://github.com/qgis/Quantum-GIS.git
377-
```
341+
If you want to experiment with the latest development sources, see the [git #git] section below.
378342

379343
== Configure the build ==
380344

0 commit comments

Comments
 (0)