sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
62,709 Commits 81 Branches 277 Tags
Commit Graph

322 Commits

Author SHA1 Message Date
Cody Martin
a2ef1ab1b0 Revert "Remove now-redundant gdal environment setup script from package-nightly.cmd" 
This reverts commit 4032d43884bf5355ac5574f0575e8f539ad86f59.
 2020-05-11 17:00:40 +02:00
Cody Martin
24f883a556 Revert "Add gdal+proj libraries to PATH in MSVC environment setup script" 
This reverts commit b8c803fc7e2b7fa958247d27777f6c4d53c4e136.
 2020-05-11 17:00:40 +02:00
Cody Martin
5ed4df8f47 Remove now-redundant gdal environment setup script from package-nightly.cmd 2020-05-11 17:00:40 +02:00
Cody Martin
4daabcbaa5 Add gdal+proj libraries to PATH in MSVC environment setup script 
More specifically: call gdal-dev-env.bat as part of msvc-env.bat.

Without doing this, the a build of the qgis.sln file in MSVC fails.
Specifically, the synccrsdb project fails with:

  #>  Running crssync
  #>C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppCommon.targets(171,5): error MSB6006: "cmd.exe" exited with code -1073741515.

Running crssync.exe from the command line also fails:

  C:\OSGeo4W64>QGIS>ms-windows\osgeo4w\build-qgis-test-x86_64\output\bin\RelWithDebInfo\crssync.exe
  The code execution cannot proceed because gdal302.dll was not found. Reinstalling the program may fix this problem.
  The code execution cannot proceed because proj_7_1.dll was not found. Reinstalling the program may fix this problem.
  The code execution cannot proceed because gdal302.dll was not found. Reinstalling the program may fix this problem.

With this change, the configonly.bat workflow produces a qgis.sln
file that builds to completion.

The package-nightly.cmd script already called this additional .bat
file to set up the PATH to gdal and proj libraries:

  call msvc-env.bat %ARCH%
  call gdal-dev-env.bat

So it makes sense to add this call into msvc-env.bat.
 2020-05-11 17:00:40 +02:00
Juergen E. Fischer
f1e9c8d7ee osgeo4w: use nightly gdal bindings 2020-05-08 07:27:57 +02:00
Juergen E. Fischer
6ccf90f077 package.cmd: fix syntax error 
(cherry picked from commit cd141490eccf4340b658eab7fab1e7fb80c06214)
 2020-05-06 11:11:14 +02:00
Juergen E. Fischer
8ee4d0572f packaging updates for qgis_process (followup bfadf47d16) 2020-04-24 16:30:45 +02:00
olivierdalang
746ec8c498 make build dir configurable in package-nightly.cmd 2020-04-22 09:55:24 +02:00
Juergen E. Fischer
794215df55 osgeo4w: include postgres raster provider (fixes #34823) 2020-03-03 10:17:12 +01:00
Juergen E. Fischer
edee4a3d10 spelling fixes (closes #32408) 2020-02-28 21:04:02 +01:00
Juergen E. Fischer
81a08fd3e8 azure pipelines: 
* fail on error
* align build name for pull requests more with travis builds
* include dash link on azure page
 2019-12-06 00:34:01 +01:00
Juergen E. Fischer
d33a5b56a9 azure-pipelines support 
(blood, sweat and tears w/squ-ashed away)
 2019-11-30 20:34:16 +01:00
Juergen E. Fischer
7fdac2fc6b custom widgets: fix designer crash (fixes #32860) 2019-11-15 00:39:16 +01:00
Juergen E. Fischer
c86ed789bf osgeo4w: detect grass78 2019-11-02 10:04:20 +01:00
Juergen E. Fischer
f78c95cd9e osgeo4w: add dlls to fetch pdbs from symstores 
[ci skip]
 2019-09-08 22:09:38 +02:00
Juergen E. Fischer
3354a8ccee osgeo4w: fix inclusion of grass-less batch in nightly 
[ci skip]
 2019-09-07 19:37:12 +02:00
Juergen E. Fischer
f33dd71adc fix a76f127ca9b 2019-09-06 20:45:05 +02:00
Juergen E. Fischer
a76f127ca9 osgeo4w: proj.lib back again (refs 4cbcae3a58, OGGeo/PROJ#1581) 2019-09-04 09:13:58 +02:00
Juergen E. Fischer
4cbcae3a58 osgeo4w: detect proj library name 2019-09-02 13:55:37 +02:00
Juergen E. Fischer
74abbaac9c osgeo4w: update nightly after proj-dev 6.2 update 2019-08-28 11:08:12 +02:00
Juergen E. Fischer
bf31ce1d8c debian packaging: 
- add dependency for qgis-server on python3-qgis
- set test timeouts to 60s

osgeo4w:
- set test timeouts to 60s
 2019-08-10 20:54:18 +02:00
Juergen E. Fischer
bc1aea62df osgeo4w: switch nightly to GDAL3 and PROJ6 nightlies 2019-08-09 21:32:19 +02:00
Juergen E. Fischer
2c5766e7f9 update packaging after 92ac7a2e93a2 2019-08-07 22:36:40 +02:00
Juergen E. Fischer
557d1afcf7 only install/copy srs.db that we're using (fix 56d03f783f041) 2019-07-17 18:09:02 +02:00
Nyall Dawson
56d03f783f Ship a seperate srs.db file for proj >= 6 builds 
It's too dangerous to reuse the existing one, as it breaks the
ability to run multiple versions of qgis (i.e. proj < 6 and proj >= 6)
on the same machine

Fixes #30569
 2019-07-16 06:18:32 +10:00
Juergen E. Fischer
0bc48b7b6a packaging update after static providers 2019-06-27 23:34:07 +02:00
Juergen E. Fischer
3c57d28cfa osgeo4w: change start directory of shortcuts to 'my documents' 2019-06-20 16:52:20 +02:00
Richard Duivenvoorde
92c412be93 Change the httpd template to use Apache 2.4 style 2019-05-10 15:52:38 +02:00
Juergen E. Fischer
b9a53d4204 osgeo4w: fix starting of qt5 designer 2019-03-29 21:45:04 +01:00
Juergen E. Fischer
8e70c08b18 osgeo4w: fix grass shortcuts in qgis-dev (fixes #21680) 2019-03-27 10:44:20 +01:00
Juergen E. Fischer
a19fc89e5f osgeo4w: updates for grass 7.6.1 2019-03-23 02:08:30 +01:00
Juergen E. Fischer
29d4496452 osgeo4w: build with spatialindex 1.9 2019-02-10 16:48:14 +01:00
Juergen E. Fischer
4048d37a46 osgeo4w: also look for GRASS 7.6 2019-01-22 17:40:14 +01:00
Juergen E. Fischer
3599842575 windows: allow https downloads in nsis installer (fixes #18360) 2018-12-31 20:20:30 +01:00
Juergen E. Fischer
c2f16cfc68 osgeo4w: fix grass plugin installation 
(cherry picked from commit ec5a3b42b87e304690e241bca38d56870851fd10)
 2018-11-26 23:16:14 +01:00
Juergen E. Fischer
6033c7439c osgeo4w: still upload build log when tests are skipped 2018-11-26 23:16:04 +01:00
Nyall Dawson
59686e73d7 Package missing ESRI token auth method 2018-11-22 18:53:33 +10:00
Juergen E. Fischer
3a4a3af1d6 osgeo4w: 
* only use GRASS major version in executable names
* autodetect GRASS folder
 2018-11-10 21:35:09 +01:00
Juergen E. Fischer
4464089487 auto-detect name of sip module used by PyQt5 2018-10-24 13:38:03 +02:00
Juergen E. Fischer
275a203b68 debian/osgeo4w/docker: use public instead of non-existing private PyQt5.sip module 2018-10-24 08:11:13 +10:00
Juergen E. Fischer
82dccf71a5 osgeo4w: detect python version in package.cmd 2018-10-14 13:42:07 +02:00
Juergen E. Fischer
6ac262f432 configonly.bat: retrieve version from CMakeLists.txt 2018-10-09 02:30:10 +02:00
Juergen E. Fischer
f27c7cad94 packaging: include oauth2 method and opencl programs 2018-09-22 19:29:22 +02:00
Juergen E. Fischer
74b2e19434 osgeo4w: fix lrelease lookup 2018-09-19 19:22:08 +02:00
Juergen E. Fischer
1192f949ec * osgeo4w: build pdbs for releases 
* disable copying of reports without feedback
 2018-08-18 11:24:21 +02:00
Andrea Giudiceandrea
ae8e0636f0 osgeo4w: remove registering of wrong classes 2018-08-18 02:29:28 +02:00
Juergen E. Fischer
d66d1eec1b osgeo4w: also register qgz extension (fixes #19333) 2018-07-04 13:43:42 +02:00
Juergen E. Fischer
7847421de4 add missed file (followup 4790747ae) 2018-06-26 10:59:02 +02:00
Juergen E. Fischer
c27b445130 fix tar (followup 4790747a) 2018-06-21 08:51:41 +02:00
Juergen E. Fischer
4790747aea Tune osgeo4w scripts (followup cab6a4b6) 2018-06-20 10:01:34 +02:00