Skip to content

Commit

Permalink
Update of version number entries
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.osgeo.org/grass/grass/trunk@71706 15284696-431f-4ddb-bdfa-cd5b030d7da7
  • Loading branch information
neteler committed Nov 12, 2017
1 parent b065ffe commit 947fcd1
Show file tree
Hide file tree
Showing 33 changed files with 136 additions and 134 deletions.
8 changes: 4 additions & 4 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ GRASS source code is currently distributed in 2 forms:
(*.tar.gz package) of that SVN repository. The SVN snapshot name
contains the date when the snapshot was created (checked out from
the SVN repository), e.g. grass-7.2.svn_src_snapshot_2016_06_11.tar.gz
from https://grass.osgeo.org/grass73/source/snapshot/
from https://grass.osgeo.org/grass75/source/snapshot/
Further instructions at https://trac.osgeo.org/grass/wiki/DownloadSource


Expand Down Expand Up @@ -151,16 +151,16 @@ See also CODE OPTIMIZATION below.

After compilation, the resulting code is stored in the directory
./dist.$ARCH
and the scripts (grass73, ...) in
and the scripts (grass75, ...) in
./bin.$ARCH

To run GRASS, simply start
./bin.$ARCH/grass73
./bin.$ARCH/grass75

or run

make install
grass73
grass75


(E) INSTALLATION ON MACOSX
Expand Down
2 changes: 1 addition & 1 deletion display/d.mon/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[1] https://trac.osgeo.org/grass/browser/grass/trunk/display/d.mon/render_cmd.py
[2] https://trac.osgeo.org/grass/browser/grass/trunk/lib/display/r_raster.c#L107
[3] https://grass.osgeo.org/grass72/manuals/displaydrivers.html
[3] https://grass.osgeo.org/grass75/manuals/displaydrivers.html
*/

Expand Down
4 changes: 2 additions & 2 deletions doc/grass_database.html
Original file line number Diff line number Diff line change
Expand Up @@ -221,15 +221,15 @@ <h3>Starting GRASS GIS using command line</h3>
in a given Mapset with only command line interface:

<div class="code"><pre>
grass73 -text ~/grassdata/mylocation/mymapset
grass75 -text ~/grassdata/mylocation/mymapset
</pre></div>

And the following will create the given Location with projection given
by the EPSG code and it will start the default interface
(GUI or command line):

<div class="code"><pre>
grass73 -c EPSG:5514:3 ~/grassdata/mylocation
grass75 -c EPSG:5514:3 ~/grassdata/mylocation
</pre></div>

See <a href="grass7.html"><em>grass</em></a> command manual for more details.
Expand Down
48 changes: 24 additions & 24 deletions doc/howto_release.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ Contents

#example:
7
2
1RC1
4
0RC1
2017
rm -f include/VERSION~

Expand Down Expand Up @@ -98,7 +98,7 @@ Contents
echo $RELEASETAG

URL=https://svn.osgeo.org/grass
svn copy $URL/grass/branches/releasebranch_7_2 \
svn copy $URL/grass/branches/releasebranch_7_4 \
$URL/grass/tags/$RELEASETAG \
-m "Tagging release grass_${MAJOR}_${MINOR}_${RELEASE}"

Expand All @@ -123,8 +123,8 @@ Contents

#example
7
2
1svn
4
0svn
2017

rm -f include/VERSION~
Expand Down Expand Up @@ -157,16 +157,16 @@ Contents

o update web site to new version: CMS
- News section
- http://grass.osgeo.org/download/software/
- http://grass.osgeo.org/download/software/sources/
- http://grass.osgeo.org/download/software/linux/
- http://grass.osgeo.org/home/history/releases/
- http://grass.osgeo.org/development/svn/svn-tags/ (add tag): echo $RELEASETAG
- https://grass.osgeo.org/download/software/
- https://grass.osgeo.org/download/software/sources/
- https://grass.osgeo.org/download/software/linux/
- https://grass.osgeo.org/home/history/releases/
- https://grass.osgeo.org/development/svn/svn-tags/ (add tag): echo $RELEASETAG

write announcement
- store in trac:
http://trac.osgeo.org/grass/wiki/Release/7.XX.YY-News
https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures72 <- major releases only
https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures74 <- major changes only
- update version in https://grasswiki.osgeo.org/wiki/GRASS-Wiki
- store in Web as announces/announce_grass$MAJOR$MINOR$RELEASE.html <- how? with protected PHP upload page?

Expand All @@ -189,9 +189,9 @@ Contents

o Trac updates:
- Add new release to https://trac.osgeo.org/grass/admin/ticket/versions
- Set "complete" flag in https://trac.osgeo.org/grass/milestone/7.2.x --> Edit Milestone
- Set "complete" flag in https://trac.osgeo.org/grass/milestone/7.4.x --> Edit Milestone
- Batch modify tickets, set to next milestone (update this query accordingly: two entries to change)
https://trac.osgeo.org/grass/query?status=assigned&status=new&status=reopened&milestone=7.2.0&milestone=7.2.1&group=status&col=id&col=summary&col=owner&col=type&col=priority&col=component&col=version&order=priority
https://trac.osgeo.org/grass/query?status=assigned&status=new&status=reopened&milestone=7.4.0&milestone=7.4.1&group=status&col=id&col=summary&col=owner&col=type&col=priority&col=component&col=version&order=priority
- Set max items to 1000, then select all shown tickets via Status: assigned/new/reopened sections
- Scroll down to "Batch modify": under the "Comment" section, add Field "Milestone" and set to next version
- then use "Change ticket" button, done.
Expand All @@ -205,16 +205,16 @@ Contents
Update grass_packager_release.bat, eg.

set MAJOR=7
set MINOR=2
set MINOR=4
set PATCH=0RC1

Update addons (grass_addons.sh) rules, eg.

compile $SVN_PATH/grass7 $GISBASE_PATH/grass720RC1 $ADDON_PATH/grass720RC1/addons
compile $SVN_PATH/grass7 $GISBASE_PATH/grass750RC1 $ADDON_PATH/grass750RC1/addons

Modify grass_copy_wwwroot.sh accordingly, eg.

copy_addon 720RC1 7.2.0RC1
copy_addon 740RC1 7.4.0RC1

o Launchpad notes:

Expand Down Expand Up @@ -278,7 +278,7 @@ Contents
-> Share your news with the EO community
https://www.heise.de/download/product/grass-gis-7105 (update, MN)

See also: http://grass.osgeo.org/wiki/Contact_Databases
See also: https://grass.osgeo.org/wiki/Contact_Databases
... anywhere else? Please add here.

###########################################
Expand All @@ -287,23 +287,23 @@ Contents
1. see SVN book:
http://svnbook.red-bean.com/en/1.1/ch04s07.html

GRASS 7.2 release branch:
BRANCH=releasebranch_7_2
GRASS 7.4 release branch:
BRANCH=releasebranch_7_4
URL=https://svn.osgeo.org/grass
svn copy $URL/grass/trunk \
$URL/grass/branches/$BRANCH \
-m "Development branch for GRASS 7.2.x"
-m "Release branch for GRASS 7.4.x"


Switching current local copy to above development branch:
(http://svnbook.red-bean.com/en/1.1/ch04s05.html)
cd /path/to/your/local/copy/trunk
svn switch https://svn.osgeo.org/grass/grass/branches/releasebranch_7_2 .
svn switch https://svn.osgeo.org/grass/grass/branches/releasebranch_7_4 .

----------
Example: GRASS GIS 7.2 release branch creation
Example: GRASS GIS 7.4 release branch creation

svn copy https://svn.osgeo.org/grass/grass/trunk/ \
https://svn.osgeo.org/grass/grass/branches/releasebranch_7_2 \
-m "Creating the GRASS GIS 7.2 release branch (branch started in 05/2016, r68500)"
https://svn.osgeo.org/grass/grass/branches/releasebranch_7_4 \
-m "Release branch for GRASS GIS 7.4.x"

2 changes: 1 addition & 1 deletion general/g.findfile/g.findfile.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3>SHELL</h3>

<h3>PYTHON</h3>

See <em><a href="http://grass.osgeo.org/grass73/manuals/libpython/">Python
See <em><a href="http://grass.osgeo.org/grass75/manuals/libpython/">Python
Scripting Library</a></em> for more info.
<p>
Note: The Python tab in the <em>wxGUI</em> can be used for entering the
Expand Down
2 changes: 1 addition & 1 deletion general/g.message/g.message.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h2>NOTES</h2>

<h3>Usage in Python scripts</h3>

<a href="http://grass.osgeo.org/grass73/manuals/libpython/">GRASS
<a href="http://grass.osgeo.org/grass75/manuals/libpython/">GRASS
Python Scripting Library</a> defines special wrappers
for <em>g.message</em>.

Expand Down
36 changes: 19 additions & 17 deletions general/g.version/g.version.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h2>NOTES</h2>

<p>
Information about GRASS GIS
core <a href="http://grass.osgeo.org/programming7/gislib.html">GIS
core <a href="https://grass.osgeo.org/programming7/gislib.html">GIS
Library</a> can be printed by <b>-r</b> flag.

<p>
Expand All @@ -23,7 +23,7 @@ <h2>NOTES</h2>

<p>
See also function <tt>version()</tt>
from <a href="http://grasswiki.osgeo.org/wiki/GRASS_Python_Scripting_Library">Python
from <a href="https://grasswiki.osgeo.org/wiki/GRASS_Python_Scripting_Library">Python
Scripting Library</a>.

<div class="code"><pre>
Expand All @@ -38,41 +38,43 @@ <h3>Basic info</h3>
<div class="code"><pre>
g.version

GRASS 7.2.svn (2017)
GRASS 7.5.svn (2017)
</pre></div>

<h3>GIS Library info</h3>

<div class="code"><pre>
GRASS 7.2.0svn (2016)
libgis Revision: 68908
libgis Date: 2016-07-09 20:12:57 +0200 (Sat, 09 Jul 2016)
g.version -r

GRASS 7.5.svn (2017)
libgis Revision: 70829
libgis Date: 2017-04-04 09:43:02 +0200 (Tue, 04 Apr 2017)
</pre></div>

<h3>Full info in shell script style</h3>
<div class="code"><pre>
g.version -rge

version=7.2.0svn
date=2016
revision=r70151M
build_date=2016-12-28
version=7.5.svn
date=2017
revision=r71702M
build_date=2017-11-12
build_platform=x86_64-pc-linux-gnu
build_off_t_size=8
libgis_revision=68908
libgis_date="2016-07-09 20:12:57 +0200 (Sat, 09 Jul 2016) "
proj4=4.9.2
gdal=2.1.2
geos=3.5.0
sqlite=3.13.0
libgis_revision=70829
libgis_date="2017-04-04 09:43:02 +0200 (Tue, 04 Apr 2017) "
proj4=4.9.3
gdal=2.1.3
geos=3.6.1
sqlite=3.20.1
</pre></div>

<h2>Citing GRASS GIS</h2>

The GRASS Development Team has invested significant time and effort
in creating GRASS GIS, please cite it when using it for data analysis.

The GRASS GIS <a href="http://grass.osgeo.org/download/software/">Web site</a>
The GRASS GIS <a href="https://grass.osgeo.org/download/software/">Web site</a>
offers citations in different styles.
<!-- TODO: g.version should offer this right away -->

Expand Down
4 changes: 2 additions & 2 deletions grasslib.dox
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ href="http://grass.osgeo.org">http://grass.osgeo.org</a>
- gis: \ref gislib
- raster: \ref rasterlib
- vector: \ref vectorlib
- Temporal GIS API: See http://grass.osgeo.org/grass73/manuals/libpython/temporal_framework.html
- Temporal GIS API: See http://grass.osgeo.org/grass75/manuals/libpython/temporal_framework.html

\section libs Further libraries

Expand Down Expand Up @@ -112,7 +112,7 @@ href="http://grass.osgeo.org">http://grass.osgeo.org</a>

\subsection pythonlibs Python API

- python: See GRASS GIS Python library (http://grass.osgeo.org/grass73/manuals/libpython/)
- python: See GRASS GIS Python library (http://grass.osgeo.org/grass75/manuals/libpython/)

\subsection projlibs Projection Libraries

Expand Down
4 changes: 2 additions & 2 deletions gui/icons/grass.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ GenericName[tr]=Coğrafi bilgi sistemi
GenericName[uk]=Геоінформаційна система
GenericName[uz]=Geografik axborot tizimi
Icon=grass
TryExec=/usr/bin/grass73
Exec=grass73
TryExec=/usr/bin/grass75
Exec=grass75
Terminal=true
Keywords=gis;spatial;geospatial;database;remote sensing;hydrology;vector;raster;visualization;maps;wms;wfs;ogc;osgeo;
Categories=Education;Science;Geoscience;Geography;
2 changes: 1 addition & 1 deletion gui/wxpython/README
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $Date$
If you want to launch wxPython GUI automatically, start GRASS with
`-gui` parameter

$ grass73 -gui
$ grass75 -gui


3 - STARTUP FROM GRASS TERMINAL
Expand Down
2 changes: 1 addition & 1 deletion gui/wxpython/docs/wxGUI.html
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ <h3>Starting the graphical user interface</h3>
specifying the <tt>-gui</tt> (or <tt>-wxpython</tt>) switch:

<div class="code"><pre>
grass73 -gui
grass75 -gui
</pre></div>


Expand Down
2 changes: 1 addition & 1 deletion gui/wxpython/xml/menudata.README
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MENU
- the entries in menudata.xml and module_tree_menudata.xml are autogenerated
via tools/build_modules_xml.py (see ../Makefile)
- Find more info at
https://grass.osgeo.org/grass73/manuals/wxGUI.toolboxes.html
https://grass.osgeo.org/grass75/manuals/wxGUI.toolboxes.html
(../docs/wxgui_sphinx/src/)
- additionally
https://trac.osgeo.org/grass/wiki/wxGUIDevelopment/Toolboxes
2 changes: 1 addition & 1 deletion imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Script to test i.topo.corr with a synthetic map
#
# Use North Carolina location to test:
# grass73 ~/grassdata/nc_spm_08_grass7/user1
# grass75 ~/grassdata/nc_spm_08_grass7/user1

if test "$GISBASE" = ""; then
echo "You must be in GRASS to run this program."
Expand Down
2 changes: 1 addition & 1 deletion lib/gis/parser_wps.c
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ static void wps_print_process_description_begin(int store, int status, const cha
if(abstract)
{
fprintf(stdout,"\t\t<ows:Abstract>");
fprintf(stdout, "http://grass.osgeo.org/grass73/manuals/%s.html", identifier);
fprintf(stdout, "http://grass.osgeo.org/grass75/manuals/%s.html", identifier);
fprintf(stdout, "</ows:Abstract>\n");
}

Expand Down
4 changes: 2 additions & 2 deletions lib/gpde/gpdelib.dox
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ void #N_write_array_2d_to_rast (N_array_2d * array, char *name);

<P>
<b>Example implementation:</b><br>
The GRASS module <a href="http://grass.osgeo.org/grass72/manuals/r.gwflow.html">r.gwflow</a>
The GRASS module <a href="http://grass.osgeo.org/grass75/manuals/r.gwflow.html">r.gwflow</a>
implements numerical calculation program for transient,
confined and unconfined groundwater flow in two dimensions.

Expand Down Expand Up @@ -294,7 +294,7 @@ void #N_write_array_3d_to_rast3d (N_array_3d * array, char *name, int mask);

<P>
<b>Example implementation:</b><br>
The GRASS module <a href="http://grass.itc.it/grass73/manuals/r3.gwflow.html">r3.gwflow</a>
The GRASS module <a href="http://grass.itc.it/grass75/manuals/r3.gwflow.html">r3.gwflow</a>
implements numerical calculation program for transient, confined
groundwater flow in three dimensions.

Expand Down
Loading

0 comments on commit 947fcd1

Please sign in to comment.