Skip to content

Commit a7923a1

Browse files
dakcartodakcarto
committedMay 21, 2013
Update Mac INSTALL notes
- Fix registered copyright symbol in .t2t files
·
ltr-3_40archive/master_2
1 parent 595e12c commit a7923a1

File tree

5 files changed

+31
-30
lines changed

5 files changed

+31
-30
lines changed
 

‎INSTALL

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Monday May 20, 2013
3+
Tuesday May 21, 2013
44

55

6-
Last Updated: Monday May 20, 2013
7-
Last Change : Monday May 20, 2013
6+
Last Updated: Tuesday May 21, 2013
7+
Last Change : Tuesday May 21, 2013
88

99

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

560-
You also need the Microsoft Windows Server� 2003 R2 Platform SDK (for setupapi):
560+
You also need the Microsoft Windows Server(R) 2003 R2 Platform SDK (for setupapi):
561561

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

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

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

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

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

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

15661566
python.org Python
15671567

1568-
python configure.py -n /usr/local/Qt-4.8/qsci
1568+
python configure.py -n /usr/local/Qt4.8/qsci
15691569
yes
15701570

15711571
Leopard system Python
15721572

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

1576-
python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -n /usr/local/Qt-4.8/qsci
1576+
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
15771577

15781578
Snow Leopard system Python
15791579

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

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

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

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

15961596
Lion and Mt. Lion system Python
15971597

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

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

16031603
continue...
16041604

‎doc/INSTALL.html

Lines changed: 11 additions & 11 deletions
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>Wednesday April 24, 2013</H3>
80+
<H3>Tuesday May 21, 2013</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Change : Saturday December 08, 2012
86-
Last Updated: Wednesday April 24, 2013
85+
Last Updated: Tuesday May 21, 2013
86+
Last Change : Tuesday May 21, 2013
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -883,7 +883,7 @@ <H3>4.1.1. Visual C++ Express Edition</H3>
883883
Visual Studio 2008 will also be downloaded and installed.
884884
</P>
885885
<P>
886-
You also need the Microsoft Windows Server® 2003 R2 Platform SDK (for setupapi):
886+
You also need the Microsoft Windows Server&reg; 2003 R2 Platform SDK (for setupapi):
887887
</P>
888888
<BLOCKQUOTE>
889889
<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 @@ <H2>5.1. Install Developer Tools</H2>
17501750
Xcode 4.3+ also introduces the clang frontend to the LLVM compiler as default.
17511751
</P>
17521752
<P>
1753-
<B>Note:</B> In XCODE 4.5 installed from the app store, you need to install the
1753+
<B>Note:</B> In XCODE 4.5 installed from the app store, you need to install the
17541754
command line tools from XCode -&gt; Preferences -&gt; Downloads and choose command line tools.
17551755
</P>
17561756
<P>
@@ -2175,7 +2175,7 @@ <H4>5.4.6.1. Optional setup: QScintilla2 QtDesigner plugin</H4>
21752175

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

22042204
<div class="code"><PRE>
2205-
python configure.py -n /usr/local/Qt-4.8/qsci
2205+
python configure.py -n /usr/local/Qt4.8/qsci
22062206
yes
22072207
</PRE></div>
22082208

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

22172217
<div class="code"><PRE>
2218-
python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -n /usr/local/Qt-4.8/qsci
2218+
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
22192219
</PRE></div>
22202220

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

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

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

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

22492249
<P>
@@ -2255,7 +2255,7 @@ <H3>5.4.7. Additional dependencies: PyQt</H3>
22552255
</P>
22562256

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

22612261
<P>

‎doc/INSTALL.t2t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Building QGIS from source - step by step
88
%! preproc : TUT_URL https://qgis.org
99
%! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
1010
%! PostProc(html): '(?i)(</pre>)' '\1</div>'
11+
%! PostProc(html): \(R\) &reg;
1112
% Next line will replace tabs with 2 spaces in txt generated outputs
1213
%! PostProc(txt): '(?i)(\t)' ' '
1314
%! encoding: iso-8859-1

‎doc/msvc.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The free (as in free beer) Express Edition installer is available under:
1717
The optional products are not necessary. In the process the Windows SDKs for
1818
Visual Studio 2008 will also be downloaded and installed.
1919

20-
You also need the Microsoft Windows Server� 2003 R2 Platform SDK (for setupapi):
20+
You also need the Microsoft Windows Server(R) 2003 R2 Platform SDK (for setupapi):
2121

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

‎doc/osx.t2t

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ of Xcode, regardless of using a separate DMG installer for just the tools.
7878

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

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

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

408408
```
409409
cd <QScintilla2 source directory>
410-
cd designer-Qt4
410+
cd designer-Qt4Qt5
411411
qmake -spec macx-g++ designer.pro
412412
make
413413
sudo make install
@@ -427,7 +427,7 @@ cd to the source folder. Then for your chosen Python:
427427
__python.org Python__
428428

429429
```
430-
python configure.py -n /usr/local/Qt-4.8/qsci
430+
python configure.py -n /usr/local/Qt4.8/qsci
431431
yes
432432
```
433433

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

439439
```
440-
python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -n /usr/local/Qt-4.8/qsci
440+
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
441441
```
442442

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

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

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

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

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

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

474474
__continue...__

0 commit comments

Comments
 (0)
Please sign in to comment.