Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Assorted fixes: Makefile, tests, gie enhancement, Travis-CI simplification #1088

Merged
merged 4 commits into from
Aug 13, 2018
Merged

Assorted fixes: Makefile, tests, gie enhancement, Travis-CI simplification #1088

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab005c6
nad/Makefile.am: add null.lla to EXTRA_DIST
rouault Aug 11, 2018
e7cb0ca
gie: add a require_grid keyword, and use if for DHDN_ETRS89.gie; aso …
rouault Aug 11, 2018
6f3df8c
travis/install.sh: make sure to run tests without grids, and remove a…
rouault Aug 11, 2018
0535414
Document require_grid option
rouault Aug 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nad/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ EXTRA_DIST = GL27 nad.lst proj_def.dat nad27 nad83 pj_out27.dist pj_out83.dist t
esri.extra other.extra \
CH IGNF testIGNF proj_outIGNF.dist \
ITRF2000 ITRF2008 ITRF2014 \
makefile.vc CMakeLists.txt tests/test_nodata.gtx
makefile.vc CMakeLists.txt tests/test_nodata.gtx null.lla
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reasoning behind including it here? The null grid is included in the grid distributions.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reasoning is that null.lla is in git, and if we don't had it in EXTRA_DIST it is not part of the generated tarball by make dist. And thus if someone use the tarball and does "make check" without downloading the grids, it won't get the null grid (since 'make' in nad create null from null.lla) and that causes a number of test failures. I think it is reasonable to have the tiny null grid generated by proj itself

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All right. I agree, it is reasonable to include it.


process-nad2bin:
@if [ -f $(NADPATH)/null.lla -a ! -f null ] || [ -f $(NADPATH)/conus.lla -a ! -f conus ] ; then \
Expand Down