Skip to content

Commit

Permalink
Update Mac INSTALL notes
Browse files Browse the repository at this point in the history
- Fix registered copyright symbol in .t2t files
  • Loading branch information
dakcarto committed May 21, 2013
1 parent 595e12c commit a7923a1
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 30 deletions.
22 changes: 11 additions & 11 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Monday May 20, 2013
Tuesday May 21, 2013


Last Updated: Monday May 20, 2013
Last Change : Monday May 20, 2013
Last Updated: Tuesday May 21, 2013
Last Change : Tuesday May 21, 2013


1. Introduction
Expand Down Expand Up @@ -557,7 +557,7 @@ The free (as in free beer) Express Edition installer is available under:
The optional products are not necessary. In the process the Windows SDKs for
Visual Studio 2008 will also be downloaded and installed.

You also need the Microsoft Windows Server 2003 R2 Platform SDK (for setupapi):
You also need the Microsoft Windows Server(R) 2003 R2 Platform SDK (for setupapi):

http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe

Expand Down Expand Up @@ -1228,7 +1228,7 @@ of Xcode, regardless of using a separate DMG installer for just the tools.

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

Note: In XCODE 4.5 installed from the app store, you need to install the
Note: In XCODE 4.5 installed from the app store, you need to install the
command line tools from XCode -> Preferences -> Downloads and choose command line tools.

http://clang.llvm.org/
Expand Down Expand Up @@ -1545,7 +1545,7 @@ building QGIS.
The plugin allows QScintilla2 widgets to be used within QtDesigner.

cd <QScintilla2 source directory>
cd designer-Qt4
cd designer-Qt4Qt5
qmake -spec macx-g++ designer.pro
make
sudo make install
Expand All @@ -1565,15 +1565,15 @@ cd to the source folder. Then for your chosen Python:

python.org Python

python configure.py -n /usr/local/Qt-4.8/qsci
python configure.py -n /usr/local/Qt4.8/qsci
yes

Leopard system Python

PyQt wants to install in the system path -- this is not a good idea.
More configuration is needed to install outside the system path:

python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -n /usr/local/Qt-4.8/qsci
python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4

Snow Leopard system Python

Expand All @@ -1586,19 +1586,19 @@ Substitute '2.7' for python version and 10.7 for SDK version below for Lion.
If you are using 32-bit Qt (Qt Carbon):

python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \
-n /usr/local/Qt-4.8/qsci --use-arch i386
-n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 --use-arch i386

For 64-bit Qt (Qt Cocoa), use this configure line:

python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \
-n /usr/local/Qt-4.8/qsci --use-arch x86_64
-n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 --use-arch x86_64

Lion and Mt. Lion system Python

Similar to Snow Leopard, you should install outside the system Python path.
But you don't need the arch option:

python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin -n /usr/local/Qt-4.8/qsci
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

continue...

Expand Down
22 changes: 11 additions & 11 deletions doc/INSTALL.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Wednesday April 24, 2013</H3>
<H3>Tuesday May 21, 2013</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Change : Saturday December 08, 2012
Last Updated: Wednesday April 24, 2013
Last Updated: Tuesday May 21, 2013
Last Change : Tuesday May 21, 2013
</P>
<DIV CLASS="toc">

Expand Down Expand Up @@ -883,7 +883,7 @@ <H3>4.1.1. Visual C++ Express Edition</H3>
Visual Studio 2008 will also be downloaded and installed.
</P>
<P>
You also need the Microsoft Windows Server® 2003 R2 Platform SDK (for setupapi):
You also need the Microsoft Windows Server&reg; 2003 R2 Platform SDK (for setupapi):
</P>
<BLOCKQUOTE>
<A HREF="http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe">http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe</A>
Expand Down Expand Up @@ -1750,7 +1750,7 @@ <H2>5.1. Install Developer Tools</H2>
Xcode 4.3+ also introduces the clang frontend to the LLVM compiler as default.
</P>
<P>
<B>Note:</B> In XCODE 4.5 installed from the app store, you need to install the
<B>Note:</B> In XCODE 4.5 installed from the app store, you need to install the
command line tools from XCode -&gt; Preferences -&gt; Downloads and choose command line tools.
</P>
<P>
Expand Down Expand Up @@ -2175,7 +2175,7 @@ <H4>5.4.6.1. Optional setup: QScintilla2 QtDesigner plugin</H4>

<div class="code"><PRE>
cd &lt;QScintilla2 source directory&gt;
cd designer-Qt4
cd designer-Qt4Qt5
qmake -spec macx-g++ designer.pro
make
sudo make install
Expand All @@ -2202,7 +2202,7 @@ <H3>5.4.7. Additional dependencies: PyQt</H3>
</P>

<div class="code"><PRE>
python configure.py -n /usr/local/Qt-4.8/qsci
python configure.py -n /usr/local/Qt4.8/qsci
yes
</PRE></div>

Expand All @@ -2215,7 +2215,7 @@ <H3>5.4.7. Additional dependencies: PyQt</H3>
</P>

<div class="code"><PRE>
python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -n /usr/local/Qt-4.8/qsci
python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4
</PRE></div>

<P>
Expand All @@ -2234,7 +2234,7 @@ <H3>5.4.7. Additional dependencies: PyQt</H3>

<div class="code"><PRE>
python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \
-n /usr/local/Qt-4.8/qsci --use-arch i386
-n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 --use-arch i386
</PRE></div>

<P>
Expand All @@ -2243,7 +2243,7 @@ <H3>5.4.7. Additional dependencies: PyQt</H3>

<div class="code"><PRE>
python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \
-n /usr/local/Qt-4.8/qsci --use-arch x86_64
-n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 --use-arch x86_64
</PRE></div>

<P>
Expand All @@ -2255,7 +2255,7 @@ <H3>5.4.7. Additional dependencies: PyQt</H3>
</P>

<div class="code"><PRE>
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin -n /usr/local/Qt-4.8/qsci
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
</PRE></div>

<P>
Expand Down
1 change: 1 addition & 0 deletions doc/INSTALL.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Building QGIS from source - step by step
%! preproc : TUT_URL https://qgis.org
%! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
%! PostProc(html): '(?i)(</pre>)' '\1</div>'
%! PostProc(html): \(R\) &reg;
% Next line will replace tabs with 2 spaces in txt generated outputs
%! PostProc(txt): '(?i)(\t)' ' '
%! encoding: iso-8859-1
Expand Down
2 changes: 1 addition & 1 deletion doc/msvc.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The free (as in free beer) Express Edition installer is available under:
The optional products are not necessary. In the process the Windows SDKs for
Visual Studio 2008 will also be downloaded and installed.

You also need the Microsoft Windows Server 2003 R2 Platform SDK (for setupapi):
You also need the Microsoft Windows Server(R) 2003 R2 Platform SDK (for setupapi):

http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe

Expand Down
14 changes: 7 additions & 7 deletions doc/osx.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ of Xcode, regardless of using a separate DMG installer for just the tools.

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

**Note:** In XCODE 4.5 installed from the app store, you need to install the
**Note:** In XCODE 4.5 installed from the app store, you need to install the
command line tools from XCode -> Preferences -> Downloads and choose command line tools.

http://clang.llvm.org/
Expand Down Expand Up @@ -407,7 +407,7 @@ The plugin allows QScintilla2 widgets to be used within QtDesigner.

```
cd <QScintilla2 source directory>
cd designer-Qt4
cd designer-Qt4Qt5
qmake -spec macx-g++ designer.pro
make
sudo make install
Expand All @@ -427,7 +427,7 @@ cd to the source folder. Then for your chosen Python:
__python.org Python__

```
python configure.py -n /usr/local/Qt-4.8/qsci
python configure.py -n /usr/local/Qt4.8/qsci
yes
```

Expand All @@ -437,7 +437,7 @@ PyQt wants to install in the system path -- this is not a good idea.
More configuration is needed to install outside the system path:

```
python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -n /usr/local/Qt-4.8/qsci
python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4
```

__Snow Leopard system Python__
Expand All @@ -452,14 +452,14 @@ If you are using 32-bit Qt (Qt Carbon):

```
python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \
-n /usr/local/Qt-4.8/qsci --use-arch i386
-n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 --use-arch i386
```

For 64-bit Qt (Qt Cocoa), use this configure line:

```
python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \
-n /usr/local/Qt-4.8/qsci --use-arch x86_64
-n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 --use-arch x86_64
```

__Lion and Mt. Lion system Python__
Expand All @@ -468,7 +468,7 @@ Similar to Snow Leopard, you should install outside the system Python path.
But you don't need the arch option:

```
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin -n /usr/local/Qt-4.8/qsci
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
```

__continue...__
Expand Down

0 comments on commit a7923a1

Please sign in to comment.