Skip to content

Commit

Permalink
Merge pull request #133 from ajmas/Issue-132
Browse files Browse the repository at this point in the history
Issue-132 Update procedure for clarity
  • Loading branch information
nvkelso committed Nov 27, 2016
2 parents aa15d45 + 60b0ccd commit d9605d8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ zips/packages/Natural_Earth_quick_start.zip: \
cp README.md packages/Natural_Earth_quick_start/README.md
cp VERSION packages/Natural_Earth_quick_start/VERSION

rm $@
rm -f $@
zip -r $@ packages/Natural_Earth_quick_start/
cp $@ archive/Natural_Earth_quick_start_$(VERSION).zip

Expand Down Expand Up @@ -690,7 +690,7 @@ zips/10m_cultural/ne_10m_parks_and_protected_lands.zip: \
curl http://www.naturalearthdata.com/downloads/10m-cultural-vectors/parks-and-protected-lands/ > 10m_cultural/ne_10m_parks_and_protected_lands_point.README.html
zip -j -r $@ 10m_cultural/ne_10m_parks_and_protected_lands*.*
cp $@ archive/ne_10m_parks_and_protected_lands$(VERSION_PREFIXED).zip
rm geojson/ne_10m_parks_and_protected_lands_*.geojson
rm -f geojson/ne_10m_parks_and_protected_lands_*.geojson
ogr2ogr -overwrite -f GeoJSON -lco WINDOWS-1252 geojson/ne_10m_parks_and_protected_lands_area.geojson 10m_cultural/ne_10m_parks_and_protected_lands_area.shp
ogr2ogr -overwrite -f GeoJSON -lco WINDOWS-1252 geojson/ne_10m_parks_and_protected_lands_scale_rank.geojson 10m_cultural/ne_10m_parks_and_protected_lands_scale_rank.shp
ogr2ogr -overwrite -f GeoJSON -lco WINDOWS-1252 geojson/ne_10m_parks_and_protected_lands_line.geojson 10m_cultural/ne_10m_parks_and_protected_lands_line.shp
Expand Down Expand Up @@ -2082,4 +2082,4 @@ clean:
rm -rf zips/50m_physical/*
rm -rf zips/110m_cultural/*
rm -rf zips/110m_physical/*
#rm -rf zips/packages/*
#rm -rf zips/packages/*
11 changes: 10 additions & 1 deletion UPDATE_PROCEDURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

Scripts to build Natural Earth ZIP archives for individual themes, scalesets, and packagages.

**Requirements**: `Make` a generic Unix utility, to be installed.
**Requirements**:

- `Make` a generic Unix utility, to be installed.
- `GDAL` to be installed and the folder containing ogr2ogr to be added to the PATH environment variable

Assumed to be run on Mac or Ubuntu Linux.

#Usage
Expand Down Expand Up @@ -39,6 +42,12 @@ also be recorded, with better formatting, in a public blog post.
make zips/packages/Natural_Earth_quick_start/Natural_Earth_quick_start.zip
make clean

Note, that if this is a clean clone or checkout you should
start with the following, since 'clean' creates the required
empty directories:

make clean all

6. Push those changes live to the distribution network!

make live
Expand Down

0 comments on commit d9605d8

Please sign in to comment.