Skip to content

Commit b9bf17e

Browse files
kyngchaoskyngchaos
committedApr 8, 2012
OS X install cleanup, fill in more dependencies;
adjust header styles for better readability
·
ltr-3_40Before-merge-new_vector_api
1 parent 4b8ab18 commit b9bf17e

File tree

4 files changed

+211
-35
lines changed

4 files changed

+211
-35
lines changed
 

‎INSTALL

Lines changed: 63 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Quantum GIS (QGIS)
22
Building QGIS from source - step by step
3-
Saturday April 07, 2012
3+
Sunday April 08, 2012
44

55

6-
Last Updated: Saturday April 07, 2012
6+
Last Updated: Sunday April 08, 2012
77
Last Change : Saturday April 07, 2012
88

99

@@ -31,6 +31,7 @@ Last Change : Saturday April 07, 2012
3131
5.5. QGIS source
3232
5.6. Configure the build
3333
5.7. Building
34+
5.8. Post-Install
3435
6. Authors and Acknowledgments
3536

3637

@@ -1495,8 +1496,37 @@ tarball to unpack it, then cd to the source folder and:
14951496
sudo make install
14961497

14971498

1498-
5.4.8. Additional Dependencies: OSG & osgEarth
1499-
==============================================
1499+
5.4.8. Additional Dependencies: gpsbabel
1500+
========================================
1501+
1502+
For integrated GPS Tools functions, a gpsbabel executable is required. You can
1503+
find this at:
1504+
1505+
http://www.gpsbabel.org/
1506+
1507+
Download the GPSBabel OS X package, and copy GPSBabelFE.app from the disk image to
1508+
/Applications.
1509+
1510+
1511+
5.4.9. Optional Dependencies: libfcgi
1512+
=====================================
1513+
1514+
If you want to use the QGIS Mapserver, you need libfcgi. This is included on
1515+
systems up through Snow Leopard, but was dropped at Lion. So, on Lion you need
1516+
to get the source from:
1517+
1518+
http://www.fastcgi.com/dist/
1519+
1520+
Grab the latest fcgi SNAP package there. Double-click the source
1521+
tarball to unpack it, then cd to the source folder and:
1522+
1523+
./configure --disable-dependency-tracking CFLAGS=-Os
1524+
make
1525+
sudo make install
1526+
1527+
1528+
5.4.10. Optional Dependencies: OSG & osgEarth
1529+
=============================================
15001530

15011531
If you want the Globe plugin in QGIS (default OFF), OSG and osgEarth are needed.
15021532

@@ -1623,7 +1653,7 @@ In a Terminal cd to the qgis source folder previously downloaded, then:
16231653

16241654
This will automatically find and use the previously installed frameworks, and
16251655
the GRASS application if installed. Remember to change the Qwt version if a
1626-
different version was compiled.
1656+
different version was installed.
16271657

16281658
Snow Leopard note: To handle 32-bit Qt (Carbon), create a 32bit python wrapper
16291659
script and add arch flags to the configuration:
@@ -1635,7 +1665,7 @@ script and add arch flags to the configuration:
16351665

16361666
sudo chmod +x /usr/local/bin/python32
16371667

1638-
cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D \
1668+
cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
16391669
-D CMAKE_BUILD_TYPE=MinSizeRel -D ENABLE_TESTS=FALSE \
16401670
-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
16411671
-D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
@@ -1644,7 +1674,7 @@ script and add arch flags to the configuration:
16441674
-D CMAKE_OSX_ARCHITECTURES=i386 -D PYTHON_EXECUTABLE=/usr/local/bin/python32 \
16451675
..
16461676

1647-
The QGIS Mapserver feature requires fastcgi support. This is included in
1677+
Mapserver note:: The QGIS Mapserver feature requires fastcgi support. This is included in
16481678
Leopard and Snow Leopard, but was dropped at Lion. To build the Mapserver
16491679
component on Leopard and Snow, add the followling line before the last line in
16501680
the above configuration:
@@ -1654,7 +1684,7 @@ the above configuration:
16541684
On Lion you are on your own to figure out how to install libfcgi and add fcgi
16551685
support to the system Apache. Not recommended for the average user.
16561686

1657-
If you want the Globe plugin (and you compiled and installed OSG/osgEarth),
1687+
Globe plugin note: If you want the Globe plugin (and you compiled and installed OSG/osgEarth),
16581688
add the following lines before the last line in the above configuration:
16591689

16601690
-D WITH_GLOBE=true \
@@ -1688,6 +1718,31 @@ or, for an /Applications build:
16881718
sudo make install
16891719

16901720

1721+
5.8. Post-Install
1722+
=================
1723+
1724+
A couple things to take care of.
1725+
1726+
gpsbabel
1727+
1728+
For QGIS to easily find gpsbabel, you need to copy the gpsbabel executable
1729+
to the QGIS application. Assuming you installed QGIS in your home folder:
1730+
1731+
cp -fp /Applications/GPSBabelFE.app/Contents/MacOS/gpsbabel ~/QGIS.app/Contents/MacOS/bin/
1732+
1733+
If you installed in /Applications, adjust the path accordingly and prefix the
1734+
whole command with 'sudo '.
1735+
1736+
QGIS Mapserver
1737+
1738+
See the QGIS Mapserver wiki page at:
1739+
1740+
http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial
1741+
1742+
for instructions on setting up Apache fastcgi and testing Mapserver, including
1743+
installing the mod-fastcgi that is missing on Lion.
1744+
1745+
16911746
6. Authors and Acknowledgments
16921747
==============================
16931748

‎doc/INSTALL.html

Lines changed: 84 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@
2929
padding: 0.75em 0 0;
3030
margin: 0;
3131
line-height: 1.1em;
32+
border-bottom: 5px solid #DCEB5C;
3233
}
3334
h2{ background-color: #F6F6F6;
3435
color: #8FB171;
35-
font-size: medium;
36+
font-size: large;
3637
font-weight: normal;
3738
font-family: luxi serif, georgia, times new roman, times, serif;
3839
background: none;
@@ -44,23 +45,19 @@
4445
color: #729FCF;
4546
font-family: luxi serif, georgia, times new roman, times, serif;
4647
font-weight: bold;
47-
font-size: large;
48-
text-align: right;
49-
border-bottom: 5px solid #DCEB5C;
48+
font-size: medium;
5049
}
5150
h4{ background-color: #F6F6F6;
5251
color: #729FCF;
5352
font-family: luxi serif, georgia, times new roman, times, serif;
54-
font-weight: bold;
53+
font-weight: normal;
5554
font-size: medium;
56-
text-align: right;
5755
}
5856
h5{ background-color: #F6F6F6;
5957
color: #729FCF;
6058
font-family: luxi serif, georgia, times new roman, times, serif;
6159
font-weight: bold;
6260
font-size: small;
63-
text-align: right;
6461
}
6562
a{ color: #729FCF;
6663
font-family: arial,sans-serif;
@@ -80,12 +77,12 @@
8077
<DIV CLASS="header" ID="header">
8178
<H1>Quantum GIS (QGIS)</H1>
8279
<H2>Building QGIS from source - step by step</H2>
83-
<H3>Saturday April 07, 2012</H3>
80+
<H3>Sunday April 08, 2012</H3>
8481
</DIV>
8582

8683
<DIV CLASS="body" ID="body">
8784
<P>
88-
Last Updated: Saturday April 07, 2012
85+
Last Updated: Sunday April 08, 2012
8986
Last Change : Saturday April 07, 2012
9087
</P>
9188
<DIV CLASS="toc">
@@ -120,8 +117,9 @@ <H3>Saturday April 07, 2012</H3>
120117
<LI><A HREF="#toc22">5.5. QGIS source</A>
121118
<LI><A HREF="#toc23">5.6. Configure the build</A>
122119
<LI><A HREF="#toc24">5.7. Building</A>
120+
<LI><A HREF="#toc25">5.8. Post-Install</A>
123121
</UL>
124-
<LI><A HREF="#toc25">Authors and Acknowledgments</A>
122+
<LI><A HREF="#toc26">Authors and Acknowledgments</A>
125123
</OL>
126124

127125
</DIV>
@@ -2122,7 +2120,42 @@ <H3>5.4.7. Additional Dependencies: Bison</H3>
21222120
sudo make install
21232121
</PRE></div>
21242122

2125-
<H3>5.4.8. Additional Dependencies: OSG &amp; osgEarth</H3>
2123+
<H3>5.4.8. Additional Dependencies: gpsbabel</H3>
2124+
2125+
<P>
2126+
For integrated GPS Tools functions, a gpsbabel executable is required. You can
2127+
find this at:
2128+
</P>
2129+
<P>
2130+
<A HREF="http://www.gpsbabel.org/">http://www.gpsbabel.org/</A>
2131+
</P>
2132+
<P>
2133+
Download the GPSBabel OS X package, and copy GPSBabelFE.app from the disk image to
2134+
/Applications.
2135+
</P>
2136+
2137+
<H3>5.4.9. Optional Dependencies: libfcgi</H3>
2138+
2139+
<P>
2140+
If you want to use the QGIS Mapserver, you need libfcgi. This is included on
2141+
systems up through Snow Leopard, but was dropped at Lion. So, on Lion you need
2142+
to get the source from:
2143+
</P>
2144+
<P>
2145+
<A HREF="http://www.fastcgi.com/dist/">http://www.fastcgi.com/dist/</A>
2146+
</P>
2147+
<P>
2148+
Grab the latest fcgi SNAP package there. Double-click the source
2149+
tarball to unpack it, then cd to the source folder and:
2150+
</P>
2151+
2152+
<div class="code"><PRE>
2153+
./configure --disable-dependency-tracking CFLAGS=-Os
2154+
make
2155+
sudo make install
2156+
</PRE></div>
2157+
2158+
<H3>5.4.10. Optional Dependencies: OSG &amp; osgEarth</H3>
21262159

21272160
<P>
21282161
If you want the Globe plugin in QGIS (default OFF), OSG and osgEarth are needed.
@@ -2289,7 +2322,7 @@ <H2>5.6. Configure the build</H2>
22892322
<P>
22902323
This will automatically find and use the previously installed frameworks, and
22912324
the GRASS application if installed. Remember to change the Qwt version if a
2292-
different version was compiled.
2325+
different version was installed.
22932326
</P>
22942327
<P>
22952328
<U>Snow Leopard note:</U> To handle 32-bit Qt (Carbon), create a 32bit python wrapper
@@ -2304,7 +2337,7 @@ <H2>5.6. Configure the build</H2>
23042337

23052338
sudo chmod +x /usr/local/bin/python32
23062339

2307-
cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D \
2340+
cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
23082341
-D CMAKE_BUILD_TYPE=MinSizeRel -D ENABLE_TESTS=FALSE \
23092342
-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
23102343
-D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
@@ -2315,7 +2348,7 @@ <H2>5.6. Configure the build</H2>
23152348
</PRE></div>
23162349

23172350
<P>
2318-
The QGIS <B>Mapserver</B> feature requires fastcgi support. This is included in
2351+
<U>Mapserver note::</U> The QGIS Mapserver feature requires fastcgi support. This is included in
23192352
Leopard and Snow Leopard, but was dropped at Lion. To build the Mapserver
23202353
component on Leopard and Snow, add the followling line before the last line in
23212354
the above configuration:
@@ -2330,7 +2363,7 @@ <H2>5.6. Configure the build</H2>
23302363
support to the system Apache. Not recommended for the average user.
23312364
</P>
23322365
<P>
2333-
If you want the <B>Globe</B> plugin (and you compiled and installed OSG/osgEarth),
2366+
<U>Globe plugin note:</U> If you want the Globe plugin (and you compiled and installed OSG/osgEarth),
23342367
add the following lines before the last line in the above configuration:
23352368
</P>
23362369

@@ -2383,6 +2416,42 @@ <H2>5.7. Building</H2>
23832416
</PRE></div>
23842417

23852418
<A NAME="toc25"></A>
2419+
<H2>5.8. Post-Install</H2>
2420+
2421+
<P>
2422+
A couple things to take care of.
2423+
</P>
2424+
<P>
2425+
<B>gpsbabel</B>
2426+
</P>
2427+
<P>
2428+
For QGIS to <I>easily</I> find gpsbabel, you need to copy the gpsbabel executable
2429+
to the QGIS application. Assuming you installed QGIS in your home folder:
2430+
</P>
2431+
2432+
<div class="code"><PRE>
2433+
cp -fp /Applications/GPSBabelFE.app/Contents/MacOS/gpsbabel ~/QGIS.app/Contents/MacOS/bin/
2434+
</PRE></div>
2435+
2436+
<P>
2437+
If you installed in /Applications, adjust the path accordingly and prefix the
2438+
whole command with 'sudo '.
2439+
</P>
2440+
<P>
2441+
<B>QGIS Mapserver</B>
2442+
</P>
2443+
<P>
2444+
See the QGIS Mapserver wiki page at:
2445+
</P>
2446+
<P>
2447+
<A HREF="http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial">http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial</A>
2448+
</P>
2449+
<P>
2450+
for instructions on setting up Apache fastcgi and testing Mapserver, including
2451+
installing the mod-fastcgi that is missing on Lion.
2452+
</P>
2453+
2454+
<A NAME="toc26"></A>
23862455
<H1>6. Authors and Acknowledgments</H1>
23872456

23882457
<P>

‎doc/osx.t2t

Lines changed: 60 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,37 @@ make
371371
sudo make install
372372
```
373373

374-
=== Additional Dependencies: OSG & osgEarth ===
374+
375+
=== Additional Dependencies: gpsbabel ===
376+
377+
For integrated GPS Tools functions, a gpsbabel executable is required. You can
378+
find this at:
379+
380+
http://www.gpsbabel.org/
381+
382+
Download the GPSBabel OS X package, and copy GPSBabelFE.app from the disk image to
383+
/Applications.
384+
385+
386+
=== Optional Dependencies: libfcgi ===
387+
388+
If you want to use the QGIS Mapserver, you need libfcgi. This is included on
389+
systems up through Snow Leopard, but was dropped at Lion. So, on Lion you need
390+
to get the source from:
391+
392+
http://www.fastcgi.com/dist/
393+
394+
Grab the latest fcgi SNAP package there. Double-click the source
395+
tarball to unpack it, then cd to the source folder and:
396+
397+
```
398+
./configure --disable-dependency-tracking CFLAGS=-Os
399+
make
400+
sudo make install
401+
```
402+
403+
404+
=== Optional Dependencies: OSG & osgEarth ===
375405

376406
If you want the Globe plugin in QGIS (default OFF), OSG and osgEarth are needed.
377407

@@ -505,7 +535,7 @@ cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
505535

506536
This will automatically find and use the previously installed frameworks, and
507537
the GRASS application if installed. Remember to change the Qwt version if a
508-
different version was compiled.
538+
different version was installed.
509539

510540
__Snow Leopard note:__ To handle 32-bit Qt (Carbon), create a 32bit python wrapper
511541
script and add arch flags to the configuration:
@@ -518,7 +548,7 @@ EOF
518548

519549
sudo chmod +x /usr/local/bin/python32
520550

521-
cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D \
551+
cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
522552
-D CMAKE_BUILD_TYPE=MinSizeRel -D ENABLE_TESTS=FALSE \
523553
-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
524554
-D QWT_LIBRARY=/usr/local/qwt-5.2.1-svn/lib/libqwt.dylib \
@@ -528,7 +558,7 @@ cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D \
528558
..
529559
```
530560

531-
The QGIS **Mapserver** feature requires fastcgi support. This is included in
561+
__Mapserver note::__ The QGIS Mapserver feature requires fastcgi support. This is included in
532562
Leopard and Snow Leopard, but was dropped at Lion. To build the Mapserver
533563
component on Leopard and Snow, add the followling line before the last line in
534564
the above configuration:
@@ -540,7 +570,7 @@ the above configuration:
540570
On Lion you are on your own to figure out how to install libfcgi and add fcgi
541571
support to the system Apache. Not recommended for the average user.
542572

543-
If you want the **Globe** plugin (and you compiled and installed OSG/osgEarth),
573+
__Globe plugin note:__ If you want the Globe plugin (and you compiled and installed OSG/osgEarth),
544574
add the following lines before the last line in the above configuration:
545575

546576
```
@@ -580,3 +610,28 @@ or, for an /Applications build:
580610
```
581611
sudo make install
582612
```
613+
614+
== Post-Install ==
615+
616+
A couple things to take care of.
617+
618+
**gpsbabel**
619+
620+
For QGIS to //easily// find gpsbabel, you need to copy the gpsbabel executable
621+
to the QGIS application. Assuming you installed QGIS in your home folder:
622+
623+
```
624+
cp -fp /Applications/GPSBabelFE.app/Contents/MacOS/gpsbabel ~/QGIS.app/Contents/MacOS/bin/
625+
```
626+
627+
If you installed in /Applications, adjust the path accordingly and prefix the
628+
whole command with 'sudo '.
629+
630+
**QGIS Mapserver**
631+
632+
See the QGIS Mapserver wiki page at:
633+
634+
http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial
635+
636+
for instructions on setting up Apache fastcgi and testing Mapserver, including
637+
installing the mod-fastcgi that is missing on Lion.

‎doc/style.css

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ h1{ background-color: #F6F6F6;
2020
padding: 0.75em 0 0;
2121
margin: 0;
2222
line-height: 1.1em;
23+
border-bottom: 5px solid #DCEB5C;
2324
}
2425
h2{ background-color: #F6F6F6;
2526
color: #8FB171;
26-
font-size: medium;
27+
font-size: large;
2728
font-weight: normal;
2829
font-family: luxi serif, georgia, times new roman, times, serif;
2930
background: none;
@@ -35,23 +36,19 @@ h3{ background-color: #F6F6F6;
3536
color: #729FCF;
3637
font-family: luxi serif, georgia, times new roman, times, serif;
3738
font-weight: bold;
38-
font-size: large;
39-
text-align: right;
40-
border-bottom: 5px solid #DCEB5C;
39+
font-size: medium;
4140
}
4241
h4{ background-color: #F6F6F6;
4342
color: #729FCF;
4443
font-family: luxi serif, georgia, times new roman, times, serif;
45-
font-weight: bold;
44+
font-weight: normal;
4645
font-size: medium;
47-
text-align: right;
4846
}
4947
h5{ background-color: #F6F6F6;
5048
color: #729FCF;
5149
font-family: luxi serif, georgia, times new roman, times, serif;
5250
font-weight: bold;
5351
font-size: small;
54-
text-align: right;
5552
}
5653
a{ color: #729FCF;
5754
font-family: arial,sans-serif;

0 commit comments

Comments
 (0)
Please sign in to comment.