Update Mac INSTALL notes

- Fix registered copyright symbol in .t2t files
This commit is contained in:
Larry Shaffer 2013-05-21 15:16:39 -06:00
parent 595e12cde5
commit a7923a1f51
5 changed files with 31 additions and 30 deletions

22
INSTALL
View File

@ -1,10 +1,10 @@
QGIS QGIS
Building QGIS from source - step by step Building QGIS from source - step by step
Monday May 20, 2013 Tuesday May 21, 2013
Last Updated: Monday May 20, 2013 Last Updated: Tuesday May 21, 2013
Last Change : Monday May 20, 2013 Last Change : Tuesday May 21, 2013
1. Introduction 1. Introduction
@ -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 The optional products are not necessary. In the process the Windows SDKs for
Visual Studio 2008 will also be downloaded and installed. 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 http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe
@ -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. 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. command line tools from XCode -> Preferences -> Downloads and choose command line tools.
http://clang.llvm.org/ http://clang.llvm.org/
@ -1545,7 +1545,7 @@ building QGIS.
The plugin allows QScintilla2 widgets to be used within QtDesigner. The plugin allows QScintilla2 widgets to be used within QtDesigner.
cd <QScintilla2 source directory> cd <QScintilla2 source directory>
cd designer-Qt4 cd designer-Qt4Qt5
qmake -spec macx-g++ designer.pro qmake -spec macx-g++ designer.pro
make make
sudo make install sudo make install
@ -1565,7 +1565,7 @@ cd to the source folder. Then for your chosen Python:
python.org Python python.org Python
python configure.py -n /usr/local/Qt-4.8/qsci python configure.py -n /usr/local/Qt4.8/qsci
yes yes
Leopard system Python Leopard system Python
@ -1573,7 +1573,7 @@ Leopard system Python
PyQt wants to install in the system path -- this is not a good idea. PyQt wants to install in the system path -- this is not a good idea.
More configuration is needed to install outside the system path: 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 Snow Leopard system Python
@ -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): If you are using 32-bit Qt (Qt Carbon):
python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \ 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: 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 \ 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 Lion and Mt. Lion system Python
Similar to Snow Leopard, you should install outside the system Python path. Similar to Snow Leopard, you should install outside the system Python path.
But you don't need the arch option: 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... continue...

View File

@ -77,13 +77,13 @@ label{ background-color: #FFFFCC;
<DIV CLASS="header" ID="header"> <DIV CLASS="header" ID="header">
<H1>QGIS</H1> <H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2> <H2>Building QGIS from source - step by step</H2>
<H3>Wednesday April 24, 2013</H3> <H3>Tuesday May 21, 2013</H3>
</DIV> </DIV>
<DIV CLASS="body" ID="body"> <DIV CLASS="body" ID="body">
<P> <P>
Last Change : Saturday December 08, 2012 Last Updated: Tuesday May 21, 2013
Last Updated: Wednesday April 24, 2013 Last Change : Tuesday May 21, 2013
</P> </P>
<DIV CLASS="toc"> <DIV CLASS="toc">
@ -883,7 +883,7 @@ The optional products are not necessary. In the process the Windows SDKs for
Visual Studio 2008 will also be downloaded and installed. Visual Studio 2008 will also be downloaded and installed.
</P> </P>
<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> </P>
<BLOCKQUOTE> <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> <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>
@ -1750,7 +1750,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. Xcode 4.3+ also introduces the clang frontend to the LLVM compiler as default.
</P> </P>
<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. command line tools from XCode -&gt; Preferences -&gt; Downloads and choose command line tools.
</P> </P>
<P> <P>
@ -2175,7 +2175,7 @@ The plugin allows QScintilla2 widgets to be used within QtDesigner.
<div class="code"><PRE> <div class="code"><PRE>
cd &lt;QScintilla2 source directory&gt; cd &lt;QScintilla2 source directory&gt;
cd designer-Qt4 cd designer-Qt4Qt5
qmake -spec macx-g++ designer.pro qmake -spec macx-g++ designer.pro
make make
sudo make install sudo make install
@ -2202,7 +2202,7 @@ cd to the source folder. Then for your chosen Python:
</P> </P>
<div class="code"><PRE> <div class="code"><PRE>
python configure.py -n /usr/local/Qt-4.8/qsci python configure.py -n /usr/local/Qt4.8/qsci
yes yes
</PRE></div> </PRE></div>
@ -2215,7 +2215,7 @@ More configuration is needed to install outside the system path:
</P> </P>
<div class="code"><PRE> <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> </PRE></div>
<P> <P>
@ -2234,7 +2234,7 @@ If you are using 32-bit Qt (Qt Carbon):
<div class="code"><PRE> <div class="code"><PRE>
python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \ 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> </PRE></div>
<P> <P>
@ -2243,7 +2243,7 @@ For 64-bit Qt (Qt Cocoa), use this configure line:
<div class="code"><PRE> <div class="code"><PRE>
python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \ 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> </PRE></div>
<P> <P>
@ -2255,7 +2255,7 @@ But you don't need the arch option:
</P> </P>
<div class="code"><PRE> <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> </PRE></div>
<P> <P>

View File

@ -8,6 +8,7 @@ Building QGIS from source - step by step
%! preproc : TUT_URL https://qgis.org %! preproc : TUT_URL https://qgis.org
%! PostProc(html): '(?i)(<pre>)' '<div class="code">\1' %! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
%! PostProc(html): '(?i)(</pre>)' '\1</div>' %! PostProc(html): '(?i)(</pre>)' '\1</div>'
%! PostProc(html): \(R\) &reg;
% Next line will replace tabs with 2 spaces in txt generated outputs % Next line will replace tabs with 2 spaces in txt generated outputs
%! PostProc(txt): '(?i)(\t)' ' ' %! PostProc(txt): '(?i)(\t)' ' '
%! encoding: iso-8859-1 %! encoding: iso-8859-1

View File

@ -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 The optional products are not necessary. In the process the Windows SDKs for
Visual Studio 2008 will also be downloaded and installed. 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 http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe

View File

@ -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. 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. command line tools from XCode -> Preferences -> Downloads and choose command line tools.
http://clang.llvm.org/ http://clang.llvm.org/
@ -407,7 +407,7 @@ The plugin allows QScintilla2 widgets to be used within QtDesigner.
``` ```
cd <QScintilla2 source directory> cd <QScintilla2 source directory>
cd designer-Qt4 cd designer-Qt4Qt5
qmake -spec macx-g++ designer.pro qmake -spec macx-g++ designer.pro
make make
sudo make install sudo make install
@ -427,7 +427,7 @@ cd to the source folder. Then for your chosen Python:
__python.org Python__ __python.org Python__
``` ```
python configure.py -n /usr/local/Qt-4.8/qsci python configure.py -n /usr/local/Qt4.8/qsci
yes yes
``` ```
@ -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: 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__ __Snow Leopard system Python__
@ -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 \ 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: 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 \ 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__ __Lion and Mt. Lion system Python__
@ -468,7 +468,7 @@ Similar to Snow Leopard, you should install outside the system Python path.
But you don't need the arch option: 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...__ __continue...__