From 084838f99ab067d6649eee0293c786866fd053e6 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 6 Apr 2021 22:07:32 +0200 Subject: [PATCH] adapt to release 3.7.0 --- docs/mkdocs.yml | 2 +- vagrant/Install-on-Centos-7.sh | 16 ++++------------ vagrant/Install-on-Centos-8.sh | 15 ++++----------- vagrant/Install-on-Ubuntu-18.sh | 15 ++++----------- vagrant/Install-on-Ubuntu-20.sh | 15 ++++----------- 5 files changed, 17 insertions(+), 46 deletions(-) diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index b055e9f0..d75ea900 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Nominatim Documentation +site_name: Nominatim 3.7.0 theme: readthedocs docs_dir: ${CMAKE_CURRENT_BINARY_DIR} site_url: https://nominatim.org diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh index 32cd3a30..a6d8d80b 100755 --- a/vagrant/Install-on-Centos-7.sh +++ b/vagrant/Install-on-Centos-7.sh @@ -113,30 +113,22 @@ sudo chown vagrant /srv/nominatim #DOCS: # Building and Configuration # -------------------------- # -# Get the source code from Github and change into the source directory +# Get the source for the release and unpack it # if [ "x$1" == "xyes" ]; then #DOCS: :::sh - cd $USERHOME - git clone --recursive git://github.com/openstreetmap/Nominatim.git - cd Nominatim + wget https://nominatim.org/release/Nominatim-3.7.0.tar.bz2 + tar xf Nominatim-3.7.0.tar.bz2 else #DOCS: cd $USERHOME/Nominatim #DOCS: fi #DOCS: -# When installing the latest source from github, you also need to -# download the country grid: - -if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: :::sh - wget --no-verbose -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz -fi #DOCS: - # The code must be built in a separate directory. Create this directory, # then configure and build Nominatim in there: #DOCS: :::sh mkdir $USERHOME/build cd $USERHOME/build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-3.7.0 make sudo make install diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh index 1e028b65..bc244882 100755 --- a/vagrant/Install-on-Centos-8.sh +++ b/vagrant/Install-on-Centos-8.sh @@ -107,30 +107,23 @@ sudo chown vagrant /srv/nominatim #DOCS: # Building and Configuration # -------------------------- # -# Get the source code from Github and change into the source directory +# Get the source code for the release and unpack it # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive git://github.com/openstreetmap/Nominatim.git - cd Nominatim + wget https://nominatim.org/release/Nominatim-3.7.0.tar.bz2 + tar xf Nominatim-3.7.0.tar.bz2 else #DOCS: cd $USERHOME/Nominatim #DOCS: fi #DOCS: -# When installing the latest source from github, you also need to -# download the country grid: - -if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: :::sh - wget --no-verbose -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz -fi #DOCS: - # The code must be built in a separate directory. Create this directory, # then configure and build Nominatim in there: #DOCS: :::sh mkdir $USERHOME/build cd $USERHOME/build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-3.7.0 make sudo make install diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh index 36e28ca1..d8c141f4 100755 --- a/vagrant/Install-on-Ubuntu-18.sh +++ b/vagrant/Install-on-Ubuntu-18.sh @@ -98,29 +98,22 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: # Building and Configuration # -------------------------- # -# Get the source code from Github and change into the source directory +# Get the source code for the release and unpack it # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive git://github.com/openstreetmap/Nominatim.git - cd Nominatim + wget https://nominatim.org/release/Nominatim-3.7.0.tar.bz2 + tar xf Nominatim-3.7.0.tar.bz2 else #DOCS: cd $USERHOME/Nominatim #DOCS: fi #DOCS: -# When installing the latest source from github, you also need to -# download the country grid: - -if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: :::sh - wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz -fi #DOCS: - # The code must be built in a separate directory. Create this directory, # then configure and build Nominatim in there: mkdir $USERHOME/build cd $USERHOME/build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-3.7.0 make sudo make install diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index 1e15f850..f113550e 100755 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -96,29 +96,22 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: # Building and Configuration # -------------------------- # -# Get the source code from Github and change into the source directory +# Get the source code for the release and unpack it # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive git://github.com/openstreetmap/Nominatim.git - cd Nominatim + wget https://nominatim.org/release/Nominatim-3.7.0.tar.bz2 + tar xf Nominatim-3.7.0.tar.bz2 else #DOCS: cd $USERHOME/Nominatim #DOCS: fi #DOCS: -# When installing the latest source from github, you also need to -# download the country grid: - -if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: :::sh - wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz -fi #DOCS: - # The code must be built in a separate directory. Create this directory, # then configure and build Nominatim in there: mkdir $USERHOME/build cd $USERHOME/build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-3.7.0 make sudo make install