Skip to content

Commit

Permalink
INSTALL: add note about git core.filemode on windows (superceeds PR#8…
Browse files Browse the repository at this point in the history
…578)

(oci-devel now dependency of qgis-dev-deps in OSGeo4W)
  • Loading branch information
jef-n committed Nov 30, 2018
1 parent fbcfe0e commit d9a70d0
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 21 deletions.
20 changes: 12 additions & 8 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Tuesday November 15, 2018
Friday November 30, 2018


Last Updated: Tuesday November 15, 2018
Last Change : Tuesday November 15, 2018
Last Updated: Friday November 30, 2018
Last Change : Friday November 30, 2018


1. Introduction
Expand Down Expand Up @@ -496,21 +496,25 @@ git to the source directory QGIS:

git clone git://github.com/qgis/QGIS.git

Using configonly.cmd to create the MSVC solution file:
We will be using the file ms-windows/osgeo4w/configonly.cmd to create an MSVC solution file.
And, to avoid Git in Windows reporting changes to files not actually modified:

git config core.filemode false

Using configonly.bat to create the MSVC solution file:
We will be using the file ms-windows/osgeo4w/configonly.bat to create an MSVC solution file.
There are a few options for a solution file, following are the options: ninja, native MSVC.
The advantage of using native MSVC solution is that you can find the root of build problems much easily.
configonly.cmd is meant to create a configured build directory with a MSVC solution file:
configonly.bat is meant to create a configured build directory with a MSVC solution file:

```
configonly.cmd
configonly.bat
```

Compiling QGIS with MSVC:
We will need to run MSVC with all the environment variables set, thus we will run it as follows:
Run the batch file OSGeo4W-dev.bat you created before. On the command prompt run: devenv
From MSVC, open the solution file
d:\OSGeo4W64\QGIS\ms-windows\osgeo4w\build-qgis-test-x86_64\qgis2.99.0.sln
d:\OSGeo4W64\QGIS\ms-windows\osgeo4w\build-qgis-test-x86_64\qgis.sln
Try to build the solution go grab a cup of tea, it may take a (while).
If it fails, run it again and again until there are [hopefully] no errors.

Expand Down
24 changes: 16 additions & 8 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>Tuesday November 13, 2018</H3>
<H3>Friday November 30, 2018</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Tuesday November 13, 2018
Last Change : Tuesday November 13, 2018
Last Updated: Friday November 30, 2018
Last Change : Friday November 30, 2018
</P>
<DIV CLASS="toc">

Expand Down Expand Up @@ -798,23 +798,31 @@ <H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
</PRE></div>

<P>
Using configonly.cmd to create the MSVC solution file:
We will be using the file ms-windows/osgeo4w/configonly.cmd to create an MSVC solution file.
And, to avoid Git in Windows reporting changes to files not actually modified:
</P>

<div class="code"><PRE>
git config core.filemode false
</PRE></div>

<P>
Using configonly.bat to create the MSVC solution file:
We will be using the file ms-windows/osgeo4w/configonly.bat to create an MSVC solution file.
There are a few options for a solution file, following are the options: ninja, native MSVC.
The advantage of using native MSVC solution is that you can find the root of build problems much easily.
configonly.cmd is meant to create a configured build directory with a MSVC solution file:
configonly.bat is meant to create a configured build directory with a MSVC solution file:
</P>
<P>
```
configonly.cmd
configonly.bat
```
</P>
<P>
Compiling QGIS with MSVC:
We will need to run MSVC with all the environment variables set, thus we will run it as follows:
Run the batch file OSGeo4W-dev.bat you created before. On the command prompt run: <CODE>devenv</CODE>
From MSVC, open the solution file
<CODE>d:\OSGeo4W64\QGIS\ms-windows\osgeo4w\build-qgis-test-x86_64\qgis2.99.0.sln</CODE>
<CODE>d:\OSGeo4W64\QGIS\ms-windows\osgeo4w\build-qgis-test-x86_64\qgis.sln</CODE>
Try to build the solution <A HREF="while">go grab a cup of tea, it may take a</A>.
If it fails, run it again and again until there are [hopefully] no errors.
</P>
Expand Down
17 changes: 12 additions & 5 deletions doc/msvc.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,28 @@ git to the source directory ``QGIS``:
git clone git://github.com/qgis/QGIS.git
```

Using configonly.cmd to create the MSVC solution file:
We will be using the file ms-windows/osgeo4w/configonly.cmd to create an MSVC solution file.
And, to avoid Git in Windows reporting changes to files not actually modified:

```
git config core.filemode false
```


Using configonly.bat to create the MSVC solution file:
We will be using the file ms-windows/osgeo4w/configonly.bat to create an MSVC solution file.
There are a few options for a solution file, following are the options: ninja, native MSVC.
The advantage of using native MSVC solution is that you can find the root of build problems much easily.
configonly.cmd is meant to create a configured build directory with a MSVC solution file:
configonly.bat is meant to create a configured build directory with a MSVC solution file:

```
configonly.cmd
configonly.bat
```

Compiling QGIS with MSVC:
We will need to run MSVC with all the environment variables set, thus we will run it as follows:
Run the batch file OSGeo4W-dev.bat you created before. On the command prompt run: ``devenv``
From MSVC, open the solution file
``d:\OSGeo4W64\QGIS\ms-windows\osgeo4w\build-qgis-test-x86_64\qgis2.99.0.sln``
``d:\OSGeo4W64\QGIS\ms-windows\osgeo4w\build-qgis-test-x86_64\qgis.sln``
Try to build the solution [go grab a cup of tea, it may take a while].
If it fails, run it again and again until there are [hopefully] no errors.

Expand Down

0 comments on commit d9a70d0

Please sign in to comment.