Skip to content

Commit b912256

Browse files
vmoravmora
committed
Merge remote-tracking branch 'upstream/master'
2 parents 61062d7 + 7ccd3d0 commit b912256

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+5622
-2540
lines changed

‎INSTALL

+37-19
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Tuesday May 21, 2013
3+
Monday July 08, 2013
44

55

6-
Last Updated: Tuesday May 21, 2013
7-
Last Change : Tuesday May 21, 2013
6+
Last Updated: Monday July 08, 2013
7+
Last Change : Wednesday May 22, 2013
88

99

1010
1. Introduction
@@ -1198,6 +1198,10 @@ which can be used in build shell scripts like:
11981198

11991199
make -j $(/usr/sbin/sysctl -n hw.ncpu)
12001200

1201+
Note: if you get an error in parallel compilation, try removing the -j # flag,
1202+
so it's just 'make', or using a smaller number. Sometimes make can hiccup on too
1203+
many threads.
1204+
12011205

12021206
5.1. Install Developer Tools
12031207
============================
@@ -1207,14 +1211,12 @@ Snow Leopard, the Developer Tools, later called Xcode, were included with the
12071211
system install disks, though it's best to download the latest version compatible
12081212
with your system to get important updates fixing various issues.
12091213
Starting with Lion, Xcode is available as a download and from the App Store.
1210-
BUT, there is really no need for the full Xcode on Lion, and in fact could be
1211-
tricky to use for compiling QGIS.
12121214

1213-
Downloading Xcode/Developer Tools requires a free developer account at
1215+
Downloading Xcode/Developer Tools for up through Snow Leopard requires a free developer account at
12141216
developer.apple.com. Up through Snow Leopard, get the latest Xcode that is
1215-
supported for your system. For Lion, all you need is the much smaller
1216-
Command Line Tools for Xcode (you don't get the IDE or system SDKs but they are not
1217-
necessary for QGIS). When installing Xcode up through Snow Leopard, make sure to
1217+
supported for your system. For Lion and above, you can get Xcode from either a
1218+
free developer account or for a minimal fee from the app store.
1219+
When installing Xcode up through Snow Leopard, make sure to
12181220
do a custom install and install the Unix Development or Command Line Tools option.
12191221

12201222
On Lion, if you have installed Xcode 4.0 - 4.2 and are upgrading to 4.3, it's
@@ -1223,8 +1225,7 @@ a good idea to uninstall the old version first with:
12231225
sudo /Developer/Library/uninstall-devtools
12241226

12251227
On Lion and Mt. Lion, using Xcode 4.4+, the developer command line tools can be
1226-
installed via the Xcode preferences. The tools now appear to require an install
1227-
of Xcode, regardless of using a separate DMG installer for just the tools.
1228+
installed via the Xcode preferences.
12281229

12291230
Xcode 4.3+ also introduces the clang frontend to the LLVM compiler as default.
12301231

@@ -1421,7 +1422,7 @@ http://download.osgeo.org/libspatialindex/
14211422
Double-click the source tarball to unpack, then, in Terminal.app, cd to the
14221423
source folder and:
14231424

1424-
./configure
1425+
./configure --disable-dependency-tracking CFLAGS=-Os
14251426
make
14261427
sudo make install
14271428

@@ -1446,6 +1447,9 @@ your own risk.
14461447
5.4.5. Additional dependencies: SIP
14471448
===================================
14481449

1450+
Mt Lion note: SIP 4.15.7 appears to not work on Mt Lion. Install 4.14.6.
1451+
(or a later working version when available)
1452+
14491453
Retrieve the python bindings toolkit SIP from
14501454

14511455
http://www.riverbankcomputing.com/software/sip/download
@@ -1488,10 +1492,17 @@ For 64-bit Qt (Qt Cocoa), use this configure line:
14881492
Lion+ system Python
14891493

14901494
Similar to Snow Leopard, you should install outside the system Python path.
1491-
There is no need for the SDK option or arch option:
1495+
The SDK option should match the system you are compiling on:
1496+
1497+
for Lion:
14921498

14931499
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
1494-
-e /usr/local/include -v /usr/local/share/sip
1500+
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.7.sdk
1501+
1502+
for Mt. Lion:
1503+
1504+
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
1505+
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.8.sdk
14951506

14961507
continue...
14971508

@@ -1596,7 +1607,7 @@ For 64-bit Qt (Qt Cocoa), use this configure line:
15961607
Lion and Mt. Lion system Python
15971608

15981609
Similar to Snow Leopard, you should install outside the system Python path.
1599-
But you don't need the arch option:
1610+
But you don't need the use-arch option:
16001611

16011612
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin -n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4
16021613

@@ -1622,7 +1633,11 @@ Snow Leopard: substitute '2.6' for Python version
16221633
cd Python
16231634
python2.7 configure.py -o /usr/local/lib -n /usr/local/include \
16241635
-d /Library/Python/2.7/site-packages/PyQt4 -v /usr/local/share/sip/PyQt4 \
1625-
--pyqt-sipdir=/usr/local/share/sip/PyQt4
1636+
--sip-incdir=/usr/local/include --pyqt-sipdir=/usr/local/share/sip/PyQt4
1637+
cat >>Qsci.pro <<EOF
1638+
QMAKE_LFLAGS_PLUGIN -= -dynamiclib
1639+
QMAKE_LFLAGS_PLUGIN += -bundle
1640+
EOF
16261641
qmake -spec macx-g++ Qsci.pro
16271642
make -j [#cpus]
16281643
sudo make install
@@ -1764,7 +1779,7 @@ In a new Terminal cd to the source folder and:
17641779
make install
17651780
sudo mkdir -p "/Library/Application Support/OpenSceneGraph/PlugIns"
17661781

1767-
Enter the staging path you chose for the CMAKE_INSTALL_PREFIX option above.
1782+
Open the staging folder you chose for the CMAKE_INSTALL_PREFIX option above.
17681783

17691784
Now move all .frameworks from the lib/ folder in the staging area to /Library/Frameworks. Move the files in the osgPlugins folder in the lib/ folder
17701785
to /Library/Application Support/OpenSceneGraph/PlugIns. The bin/ executables
@@ -1788,6 +1803,8 @@ http://github.com/gwaldron/osgearth/tags
17881803
Download a tarball for the latest stable release (sorting can be confusing here).
17891804
Double-click the source tarball to unpack it.
17901805

1806+
Note: for now stick with version 2.3. There are compile errors in 2.4 that need attention.
1807+
17911808
This one also needs an intermediate staging area. Choose a folder similar to OSG.
17921809

17931810
In a new Terminal cd to the source folder and:
@@ -1803,13 +1820,14 @@ In a new Terminal cd to the source folder and:
18031820
make install
18041821
sudo mkdir -p "/Library/Application Support/OpenSceneGraph/Headers"
18051822

1806-
Enter the staging path you chose for the CMAKE_INSTALL_PREFIX option above.
1807-
Also enter the OSG staging path /bin folder in the export above.
1823+
Open the staging folder you chose for the CMAKE_INSTALL_PREFIX option above.
1824+
Also open the OSG staging path /bin folder from the OSG build.
18081825

18091826
Move all the .frameworks from the lib/ folder to /Library/Frameworks.
18101827
Move the files in the osgPlugins folder in the lib/ folder to
18111828
/Library/Application Support/OpenSceneGraph/PlugIns. Move the osgEarthDrivers
18121829
folder in the include/ folder to /Library/Application Support/OpenSceneGraph/Headers.
1830+
(you may need to create this folder)
18131831
And as for OSG, you can leave the bin/ executables where they are.
18141832

18151833

‎doc/INSTALL.html

+47-20
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Tuesday May 21, 2013</H3>
80+
<H3>Monday July 08, 2013</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Tuesday May 21, 2013
86-
Last Change : Tuesday May 21, 2013
85+
Last Updated: Monday July 08, 2013
86+
Last Change : Wednesday May 22, 2013
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -1712,6 +1712,12 @@ <H1>5. Building on MacOS X</H1>
17121712
make -j $(/usr/sbin/sysctl -n hw.ncpu)
17131713
</PRE></div>
17141714

1715+
<P>
1716+
<U>Note:</U> if you get an error in parallel compilation, try removing the -j # flag,
1717+
so it's just 'make', or using a smaller number. Sometimes make can hiccup on too
1718+
many threads.
1719+
</P>
1720+
17151721
<A NAME="toc18"></A>
17161722
<H2>5.1. Install Developer Tools</H2>
17171723

@@ -1721,15 +1727,13 @@ <H2>5.1. Install Developer Tools</H2>
17211727
system install disks, though it's best to download the latest version compatible
17221728
with your system to get important updates fixing various issues.
17231729
Starting with Lion, Xcode is available as a download and from the App Store.
1724-
BUT, there is really no need for the full Xcode on Lion, and in fact could be
1725-
tricky to use for compiling QGIS.
17261730
</P>
17271731
<P>
1728-
Downloading Xcode/Developer Tools requires a free developer account at
1732+
Downloading Xcode/Developer Tools for up through Snow Leopard requires a free developer account at
17291733
developer.apple.com. Up through Snow Leopard, get the latest <U>Xcode</U> that is
1730-
supported for your system. For Lion, all you need is the much smaller
1731-
<U>Command Line Tools for Xcode</U> (you don't get the IDE or system SDKs but they are not
1732-
necessary for QGIS). When installing Xcode up through Snow Leopard, make sure to
1734+
supported for your system. For Lion and above, you can get Xcode from either a
1735+
free developer account or for a minimal fee from the app store.
1736+
When installing Xcode up through Snow Leopard, make sure to
17331737
do a custom install and install the Unix Development or Command Line Tools option.
17341738
</P>
17351739
<P>
@@ -1743,8 +1747,7 @@ <H2>5.1. Install Developer Tools</H2>
17431747

17441748
<P>
17451749
On Lion and Mt. Lion, using Xcode 4.4+, the developer command line tools can be
1746-
installed via the Xcode preferences. The tools now appear to require an install
1747-
of Xcode, regardless of using a separate DMG installer for just the tools.
1750+
installed via the Xcode preferences.
17481751
</P>
17491752
<P>
17501753
Xcode 4.3+ also introduces the clang frontend to the LLVM compiler as default.
@@ -2001,7 +2004,7 @@ <H3>5.4.3. Additional dependencies: Spatialindex</H3>
20012004
</P>
20022005

20032006
<div class="code"><PRE>
2004-
./configure
2007+
./configure --disable-dependency-tracking CFLAGS=-Os
20052008
make
20062009
sudo make install
20072010
</PRE></div>
@@ -2028,6 +2031,10 @@ <H3>5.4.4. Additional dependencies: Python</H3>
20282031

20292032
<H3>5.4.5. Additional dependencies: SIP</H3>
20302033

2034+
<P>
2035+
<U>Mt Lion note:</U> SIP 4.15.7 appears to not work on Mt Lion. Install 4.14.6.
2036+
(or a later working version when available)
2037+
</P>
20312038
<P>
20322039
Retrieve the python bindings toolkit SIP from
20332040
</P>
@@ -2094,12 +2101,24 @@ <H3>5.4.5. Additional dependencies: SIP</H3>
20942101
</P>
20952102
<P>
20962103
Similar to Snow Leopard, you should install outside the system Python path.
2097-
There is no need for the SDK option or arch option:
2104+
The SDK option should match the system you are compiling on:
2105+
</P>
2106+
<P>
2107+
for Lion:
20982108
</P>
20992109

21002110
<div class="code"><PRE>
21012111
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
2102-
-e /usr/local/include -v /usr/local/share/sip
2112+
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.7.sdk
2113+
</PRE></div>
2114+
2115+
<P>
2116+
for Mt. Lion:
2117+
</P>
2118+
2119+
<div class="code"><PRE>
2120+
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
2121+
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.8.sdk
21032122
</PRE></div>
21042123

21052124
<P>
@@ -2251,7 +2270,7 @@ <H3>5.4.7. Additional dependencies: PyQt</H3>
22512270
</P>
22522271
<P>
22532272
Similar to Snow Leopard, you should install outside the system Python path.
2254-
But you don't need the arch option:
2273+
But you don't need the use-arch option:
22552274
</P>
22562275

22572276
<div class="code"><PRE>
@@ -2288,7 +2307,11 @@ <H3>5.4.8. Additional dependencies: QScintilla2 Python Module</H3>
22882307
cd Python
22892308
python2.7 configure.py -o /usr/local/lib -n /usr/local/include \
22902309
-d /Library/Python/2.7/site-packages/PyQt4 -v /usr/local/share/sip/PyQt4 \
2291-
--pyqt-sipdir=/usr/local/share/sip/PyQt4
2310+
--sip-incdir=/usr/local/include --pyqt-sipdir=/usr/local/share/sip/PyQt4
2311+
cat &gt;&gt;Qsci.pro &lt;&lt;EOF
2312+
QMAKE_LFLAGS_PLUGIN -= -dynamiclib
2313+
QMAKE_LFLAGS_PLUGIN += -bundle
2314+
EOF
22922315
qmake -spec macx-g++ Qsci.pro
22932316
make -j [#cpus]
22942317
sudo make install
@@ -2482,7 +2505,7 @@ <H3>5.4.13. Optional dependencies: OSG &amp; osgEarth</H3>
24822505
</PRE></div>
24832506

24842507
<P>
2485-
Enter the staging path you chose for the CMAKE_INSTALL_PREFIX option above.
2508+
Open the staging folder you chose for the CMAKE_INSTALL_PREFIX option above.
24862509
</P>
24872510
<P>
24882511
Now move all .frameworks from the lib/ folder in the staging area to /Library/Frameworks. Move the files in the osgPlugins folder in the lib/ folder
@@ -2517,6 +2540,9 @@ <H3>5.4.13. Optional dependencies: OSG &amp; osgEarth</H3>
25172540
Double-click the source tarball to unpack it.
25182541
</P>
25192542
<P>
2543+
<U>Note:</U> for now stick with version 2.3. There are compile errors in 2.4 that need attention.
2544+
</P>
2545+
<P>
25202546
This one also needs an intermediate staging area. Choose a folder similar to OSG.
25212547
</P>
25222548
<P>
@@ -2537,14 +2563,15 @@ <H3>5.4.13. Optional dependencies: OSG &amp; osgEarth</H3>
25372563
</PRE></div>
25382564

25392565
<P>
2540-
Enter the staging path you chose for the CMAKE_INSTALL_PREFIX option above.
2541-
Also enter the OSG staging path /bin folder in the export above.
2566+
Open the staging folder you chose for the CMAKE_INSTALL_PREFIX option above.
2567+
Also open the OSG staging path /bin folder from the OSG build.
25422568
</P>
25432569
<P>
25442570
Move all the .frameworks from the lib/ folder to /Library/Frameworks.
25452571
Move the files in the osgPlugins folder in the lib/ folder to
25462572
/Library/Application Support/OpenSceneGraph/PlugIns. Move the osgEarthDrivers
25472573
folder in the include/ folder to /Library/Application Support/OpenSceneGraph/Headers.
2574+
(you may need to create this folder)
25482575
And as for OSG, you can leave the bin/ executables where they are.
25492576
</P>
25502577

@@ -3193,5 +3220,5 @@ <H1>9. Authors and Acknowledgments</H1>
31933220

31943221
</DIV>
31953222
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
3196-
<!-- cmdline: txt2tags -t html -o INSTALL.html INSTALL.t2t -->
3223+
<!-- cmdline: txt2tags -t html -o ../INSTALL.html INSTALL.t2t -->
31973224
</BODY></HTML>

0 commit comments

Comments
 (0)