Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • janitor-team/proposed/grass
  • debian-gis-team/grass
  • olly/grass
3 results
Show changes
Commits on Source (24)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1097 additions and 811 deletions
AUTHORS
View file @ 8e9a8712
......@@ -35,13 +35,13 @@ Email addresses below have been spam-proofed to protect the innocent;
add "@" and "." as needed.
A list of contributors with write access is available in
https://svn.osgeo.org/grass/grass/trunk/contributors.csv
https://github.com/OSGeo/grass/blob/master/contributors.csv
A list of contributors without write access is available in
https://svn.osgeo.org/grass/grass/trunk/contributors_extra.csv
https://github.com/OSGeo/grass/blob/master/contributors_extra.csv
A list of translators is available in
https://svn.osgeo.org/grass/grass/trunk/translators.csv
https://github.com/OSGeo/grass/blob/master/translators.csv
Summary view:
......
ChangeLog_7_8_0RC1.gz 0 → 100644
View file @ 8e9a8712
File added
Dockerfile
View file @ 8e9a8712
......@@ -24,8 +24,6 @@ RUN apt-get update \
libgsl0-dev \
libjpeg-dev \
liblapack-dev \
liblas-dev \
liblas-c-dev \
libncurses5-dev \
libnetcdf-dev \
libopenjp2-7 \
......@@ -56,6 +54,7 @@ RUN apt-get update \
python-numpy \
python-pil \
python-ply \
python-six \
sqlite3 \
subversion \
unixodbc-dev \
......@@ -99,7 +98,6 @@ RUN ./configure \
--with-freetype --with-freetype-includes="/usr/include/freetype2/" \
--with-fftw \
--with-netcdf \
--with-liblas --with-liblas-config=/usr/bin/liblas-config \
--with-pdal \
--with-proj --with-proj-share=/usr/share/proj \
--with-geos=/usr/bin/geos-config \
......
INSTALL
View file @ 8e9a8712
......@@ -11,13 +11,13 @@ PREREQUISITES
(D) INSTALLATION (first time)
(E) INSTALLATION ON MACOSX
(F) RUNNING GRASS
(G) UPDATE OF SOURCE CODE (SVN or SVN snapshot only)
(G) UPDATE OF SOURCE CODE
(H) COMPILING INDIVIDUAL MODULES - OWN MODULES
(I) CODE OPTIMIZATION
(J) DEBUGGING OPTIONS
(K) LARGE FILE SUPPORT (for raster maps)
(L) SUPPORT
(M) GRASS PROGRAMMER'S MANUAL
(M) GRASS GIS PROGRAMMER'S MANUAL
(N) CONTRIBUTING CODE AND PATCHES
(O) DRAFT TUTORIAL
......@@ -40,21 +40,21 @@ Installation order:
GRASS source code is currently distributed in 2 forms:
1) Officially released source code (e.g. grass-7.2.0.tar.gz or later)
1) Officially released source code (e.g. grass-7.8.0.tar.gz or later)
The Full source code version contains all the GRASS source code
required for compilation. It is distributed as one file (*.tar.gz
package) and the version is composed of 3 numbers, e.g. 7.2.0, 7.2.1
package) and the version is composed of 3 numbers, e.g. 7.8.0, 7.8.1
etc.
2) SVN or SVN Snapshots of source code (SVN or SVN snapshot)
2) Snapshots of source code (generated from GitHub)
This version of the source code can be acquired either from the SVN
repository (https://svn.osgeo.org/grass/) or as a snapshot
(*.tar.gz package) of that SVN repository. The SVN snapshot name
This version of the source code can be acquired either from the GitHub
repository (https://github.com/OSGeo/grass/) or as a auto-generated snapshot
(*.tar.gz package) of the GitHub repository. The 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/grass76/source/snapshot/
the GitHub repository), e.g. grass-7.8.git_src_snapshot_2019_07_11.tar.gz
from https://grass.osgeo.org/grass78/source/snapshot/
Further instructions at https://trac.osgeo.org/grass/wiki/DownloadSource
......@@ -151,16 +151,16 @@ See also CODE OPTIMIZATION below.
After compilation, the resulting code is stored in the directory
./dist.$ARCH
and the scripts (grass76, ...) in
and the scripts (grass78, ...) in
./bin.$ARCH
To run GRASS, simply start
./bin.$ARCH/grass76
./bin.$ARCH/grass78
or run
make install
grass76
grass78
(E) INSTALLATION ON MACOSX
......@@ -179,22 +179,24 @@ GRASS GIS startup menu to the extracted directory.
Enjoy.
(G) UPDATE OF SOURCE CODE (SVN or SVN snapshot only)
(G) UPDATE OF SOURCE CODE
Assuming that you want to update your current installation from
SVN, you have to perform a few steps. In general:
GitHub, you have to perform a few steps. In general:
- update from SVN
- update from GitHub
- configure, compile
In detail:
cd /where/your/grass7sourcecode/lives/
svn update
git fetch --all
git merge upstream/master
./configure ...
make
make install
For details, see https://trac.osgeo.org/grass/wiki/HowToGit
(H) COMPILING INDIVIDUAL MODULES - OWN MODULES
......@@ -316,4 +318,4 @@ https://grass.osgeo.org/documentation/first-time-users/
------------------
(C) 1999-2019 by The GRASS Development Team
Last changed: $Date: 2019-01-01 19:22:26 +0100 (Tue, 01 Jan 2019) $
Last changed: $Date$
Makefile
View file @ 8e9a8712
......@@ -54,7 +54,7 @@ FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL REQUIREMENTS.html contrib
FILES_DST = $(patsubst %,$(ARCH_DISTDIR)/%,$(FILES))
default:
@echo "GRASS GIS $(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR).$(GRASS_VERSION_RELEASE) $(GRASS_VERSION_SVN) compilation log" \
@echo "GRASS GIS $(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR).$(GRASS_VERSION_RELEASE) $(GRASS_VERSION_GIT) compilation log" \
> $(ERRORLOG)
@echo "--------------------------------------------------" >> $(ERRORLOG)
@echo "Started compilation: `date`" >> $(ERRORLOG)
......
README → README.md
View file @ 8e9a8712
GRASS GIS Development Subversion repository
[![Build Status](https://travis-ci.com/OSGeo/grass.svg?branch=master)](https://travis-ci.com/OSGeo/grass)
GRASS GIS Repository
====================
GRASS GIS ([https://grass.osgeo.org/](https://grass.osgeo.org/)) is a Geographic Information System
used for geospatial data management and analysis, image processing, graphics/map production,
spatial modeling, and visualization.
##########################################################
How to get write access here?
-----------------------------
Write access is only granted to developers who agree to abide by
RFC2 - Legal aspects of code contributions
http://trac.osgeo.org/grass/wiki/RFC/2_LegalAspectsOfCodeContributions
and the code submission guidelines
http://trac.osgeo.org/grass/wiki/Submitting
In general: you don't really need write access as you can simply open a
[pull request](https://github.com/OSGeo/grass/pulls) to contribute to GRASS GIS.
This needs to be communicated to a GRASS developer. S/he will
then possibly propose you to the GRASS Project Steering committee
after a period of evaluation. For details, see
http://trac.osgeo.org/grass/wiki/RFC
Want to become a core developer? See
[Procedure for gaining Git write access](https://trac.osgeo.org/grass/wiki/HowToContribute#WriteaccesstotheGRASScorerepository)
Once write access is granted, you, the new developer need to
obtain an "osgeo_id" at http://www.osgeo.org/osgeo_userid
If you already have an "osgeo_id" but forgot it, search for it at
Search at http://www.osgeo.org/cgi-bin/ldap_web_search.py
How to compile GRASS?
---------------------
##########################################################
How to compile GRASS:
See INSTALL file.
> See INSTALL file.
Yes, you should really read INSTALL.
##########################################################################
How to generate the 'Programmer's Manual':
How to generate the 'Programmer's Manual'?
------------------------------------------
This needs doxygen (http://www.doxygen.org) and optionally
Graphviz dot (http://www.research.att.com/sw/tools/graphviz/).
To build the GRASS programmer's documentation, run
make htmldocs
```
make htmldocs
```
or to generate documentation as single html file (recommended for simple reading)
make htmldocs-single
here. This takes quite some time. The result is in lib/html/index.html
```
make htmldocs-single
```
here. This takes quite some time. The result is in `lib/html/index.html`
which refers to further document repositories in
```
lib/vector/html/index.html
lib/db/html/index.html
lib/gis/html/index.html
```
The master file is: ./grasslib.dox where all sub-documents have to
The master file is: `./grasslib.dox` where all sub-documents have to
be linked into.
To generate the documents in PDF format, run
make pdfdocs
An online version is available at:
https://grass.osgeo.org/programming7/
```
make pdfdocs
```
An online version is available [here](https://grass.osgeo.org/programming7/)
## Docker
Build using the downloaded source code (in the directory with the
source code):
docker build -t grassgis76 .
```
docker build -t grassgis78 .
```
A test run (assuming you have existing GRASS GIS location; it can be downloaded from
https://grass.osgeo.org/sampledata/north_carolina/nc_basic_spm_grass7.zip)
[here](https://grass.osgeo.org/sampledata/north_carolina/nc_basic_spm_grass7.zip))
# case 1: launching in the grassdata directory in which the location is stored:
docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data --env HOME=/data/ grassgis76 \
grass --text nc_spm_08_grass7/user1 --exec g.region -p
```
# case 1: launching in the grassdata directory in which the location is stored:
docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data --env HOME=/data/ grassgis78 \
grass --text nc_spm_08_grass7/user1 --exec g.region -p
# case 2: launching anywhere
docker run -it --rm --user=$(id -u):$(id -g) --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis76 \
grass /data/nc_basic_spm/PERMANENT --exec g.region -p
# case 2: launching anywhere
docker run -it --rm --user=$(id -u):$(id -g) --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis78 \
grass /data/nc_basic_spm/PERMANENT --exec g.region -p
```
Note that the first `grassgis76` is the name of the image while the second
Note that the first `grassgis78` is the name of the image while the second
`grass` is the name of the executable.
To run the tests (again assuming local location):
```
docker run -it --rm --user=$(id -u):$(id -g) --volume /your/test/grassdata/:/data --env HOME=/data/ -w /code/grass \
grassgis76 grass /data/nc_basic_spm/PERMANENT --exec \
grassgis78 grass /data/nc_basic_spm/PERMANENT --exec \
python -m grass.gunittest.main \
--location nc_basic_spm --location-type nc
```
Note: If you compiled locally before building the Docker image, you may
encounter problems as the local configuration and locally compiled file
are copied to and used in the Docker image. To make sure you don't have
this issue, clean all the compiled files from the source code:
make distclean
```
make distclean
```
REQUIREMENTS.html
View file @ 8e9a8712
......@@ -62,7 +62,7 @@ map formats<br>
</ul>
<h3>Optional requirements:</h3>
<h3>Optional packages:</h3>
Note: also the respective development packages (commonly named xxx-dev or xxx-devel) need
to be installed.
......@@ -73,6 +73,14 @@ to be installed.
gcc: <a href="http://www.gnu.org/software/gcc/gcc.html">http://www.gnu.org/software/gcc/gcc.html</a>
</li>
<li><b>bzip2</b>, needed for raster compression with bzip2<br>
<a href="http://www.bzip.org">http://www.bzip.org</a>
</li>
<li><b>zstd</b> (Zstandard), needed for raster compression with zstd<br>
<a href="https://facebook.github.io/zstd">https://facebook.github.io/zstd</a>
</li>
<li><b>FFTW 2.x or 3.x</b> (library for computing the Discrete Fourier Transform), required
for i.fft and i.ifft and other modules<br>
<a href="http://www.fftw.org">http://www.fftw.org</a>
......@@ -165,6 +173,10 @@ newer versions are named "python-pillow"
<a href="http://matplotlib.org/">http://matplotlib.org/</a>
</li>
<li><b>Python six Library</b> ("python-six", needed for Python API)<br>
<a href="https://github.com/benjaminp/six">https://github.com/benjaminp/six</a>
</li>
<li><b>Python wxPython backend for python-matplotlib</b> ("python-matplotlib-wx", needed for e.g. g.gui.timeline)<br>
<a href="http://matplotlib.org/">http://matplotlib.org/</a>
</li>
......@@ -173,6 +185,10 @@ newer versions are named "python-pillow"
<a href="https://pypi.python.org/pypi/termcolor">https://pypi.python.org/pypi/termcolor</a>
</li>
<li><b>six</b> (needed for cross-version Python compatibility)<br>
<a href="https://pypi.python.org/pypi/six">https://pypi.python.org/pypi/six</a>
</li>
<li><b>FFMPEG or alternative</b> (for wxGUI Animation tool - g.gui.module),
specifically ffmpeg tool<br>
<a href="http://ffmpeg.org">http://ffmpeg.org</a>
......@@ -191,8 +207,8 @@ newer versions are named "python-pillow"
<a href="http://avce00.maptools.org">http://avce00.maptools.org</a>
</li>
<li><b>Subversion</b> (svn for g.extension)<br>
<a href="https://subversion.apache.org/">https://subversion.apache.org/</a><br>
<li><b>git</b> (git for g.extension)<br>
<a href="https://git-scm.com/">https://git-scm.com/</a><br>
</li>
</ul>
......@@ -221,6 +237,6 @@ MacOSX users may go here to download precompiled libraries etc.:
<br><a href="https://grass.osgeo.org/development/bug-tracking/">https://grass.osgeo.org/development/bug-tracking/</a>
<p>
<i>Last changed: $Date: 2019-03-07 00:21:50 +0100 (Thu, 07 Mar 2019) $</i>
<i>Last changed: $Date$</i>
</body>
</html>
Vagrantfile
View file @ 8e9a8712
# -*- mode: ruby -*-
# vi: set ft=ruby :
### Inspired by https://svn.osgeo.org/gdal/trunk/gdal/Vagrantfile
### Inspired by https://github.com/OSGeo/gdal/blob/master/Vagrantfile
require 'socket'
......@@ -71,6 +71,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
"python-numpy",
"python-ply",
"python-pil",
"python-six",
"libnetcdf-dev",
"netcdf-bin",
"libblas-dev",
......
config.guess 100755 → 100644
View file @ 8e9a8712
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
# Copyright 1992-2019 Free Software Foundation, Inc.
timestamp='2018-12-07'
timestamp='2019-07-24'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright 1992-2018 Free Software Foundation, Inc.
Copyright 1992-2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -262,6 +262,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
*:SolidBSD:*:*)
echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
exit ;;
*:OS108:*:*)
echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
exit ;;
macppc:MirBSD:*:*)
echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
......@@ -275,8 +278,8 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
echo "$UNAME_MACHINE"-unknown-redox
exit ;;
mips:OSF1:*.*)
echo mips-dec-osf1
exit ;;
echo mips-dec-osf1
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
......@@ -985,22 +988,50 @@ EOF
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
set_cc_for_build
IS_GLIBC=0
test x"${LIBC}" = xgnu && IS_GLIBC=1
sed 's/^ //' << EOF > "$dummy.c"
#undef CPU
#undef ${UNAME_MACHINE}
#undef ${UNAME_MACHINE}el
#undef mips
#undef mipsel
#undef mips64
#undef mips64el
#if ${IS_GLIBC} && defined(_ABI64)
LIBCABI=gnuabi64
#else
#if ${IS_GLIBC} && defined(_ABIN32)
LIBCABI=gnuabin32
#else
LIBCABI=${LIBC}
#endif
#endif
#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
CPU=mipsisa64r6
#else
#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
CPU=mipsisa32r6
#else
#if defined(__mips64)
CPU=mips64
#else
CPU=mips
#endif
#endif
#endif
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
CPU=${UNAME_MACHINE}el
MIPS_ENDIAN=el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
CPU=${UNAME_MACHINE}
MIPS_ENDIAN=
#else
CPU=
MIPS_ENDIAN=
#endif
#endif
EOF
eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`"
test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
;;
mips64el:Linux:*:*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
......@@ -1113,7 +1144,7 @@ EOF
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
......@@ -1297,38 +1328,39 @@ EOF
echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
set_cc_for_build
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
UNAME_PROCESSOR=`uname -p`
case $UNAME_PROCESSOR in
unknown) UNAME_PROCESSOR=powerpc ;;
esac
if command -v xcode-select > /dev/null 2> /dev/null && \
! xcode-select --print-path > /dev/null 2> /dev/null ; then
# Avoid executing cc if there is no toolchain installed as
# cc will be a stub that puts up a graphical alert
# prompting the user to install developer tools.
CC_FOR_BUILD=no_compiler_found
else
set_cc_for_build
fi
if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_PPC >/dev/null
then
UNAME_PROCESSOR=powerpc
fi
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_PPC >/dev/null
then
UNAME_PROCESSOR=powerpc
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
# that puts up a graphical alert prompting to install
# developer tools. Any system running Mac OS X 10.7 or
# later (Darwin 11 and later) is required to have a 64-bit
# processor. This is not true of the ARM version of Darwin
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
# uname -m returns i386 or x86_64
UNAME_PROCESSOR=$UNAME_MACHINE
fi
echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
exit ;;
......@@ -1433,6 +1465,143 @@ EOF
exit ;;
esac
# No uname command or uname output not recognized.
set_cc_for_build
cat > "$dummy.c" <<EOF
#ifdef _SEQUENT_
#include <sys/types.h>
#include <sys/utsname.h>
#endif
#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
#include <signal.h>
#if defined(_SIZE_T_) || defined(SIGLOST)
#include <sys/utsname.h>
#endif
#endif
#endif
main ()
{
#if defined (sony)
#if defined (MIPSEB)
/* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
I don't know.... */
printf ("mips-sony-bsd\n"); exit (0);
#else
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
"4"
#else
""
#endif
); exit (0);
#endif
#endif
#if defined (NeXT)
#if !defined (__ARCHITECTURE__)
#define __ARCHITECTURE__ "m68k"
#endif
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
if (version < 4)
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
else
printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
exit (0);
#endif
#if defined (MULTIMAX) || defined (n16)
#if defined (UMAXV)
printf ("ns32k-encore-sysv\n"); exit (0);
#else
#if defined (CMU)
printf ("ns32k-encore-mach\n"); exit (0);
#else
printf ("ns32k-encore-bsd\n"); exit (0);
#endif
#endif
#endif
#if defined (__386BSD__)
printf ("i386-pc-bsd\n"); exit (0);
#endif
#if defined (sequent)
#if defined (i386)
printf ("i386-sequent-dynix\n"); exit (0);
#endif
#if defined (ns32000)
printf ("ns32k-sequent-dynix\n"); exit (0);
#endif
#endif
#if defined (_SEQUENT_)
struct utsname un;
uname(&un);
if (strncmp(un.version, "V2", 2) == 0) {
printf ("i386-sequent-ptx2\n"); exit (0);
}
if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
printf ("i386-sequent-ptx1\n"); exit (0);
}
printf ("i386-sequent-ptx\n"); exit (0);
#endif
#if defined (vax)
#if !defined (ultrix)
#include <sys/param.h>
#if defined (BSD)
#if BSD == 43
printf ("vax-dec-bsd4.3\n"); exit (0);
#else
#if BSD == 199006
printf ("vax-dec-bsd4.3reno\n"); exit (0);
#else
printf ("vax-dec-bsd\n"); exit (0);
#endif
#endif
#else
printf ("vax-dec-bsd\n"); exit (0);
#endif
#else
#if defined(_SIZE_T_) || defined(SIGLOST)
struct utsname un;
uname (&un);
printf ("vax-dec-ultrix%s\n", un.release); exit (0);
#else
printf ("vax-dec-ultrix\n"); exit (0);
#endif
#endif
#endif
#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
#if defined(_SIZE_T_) || defined(SIGLOST)
struct utsname *un;
uname (&un);
printf ("mips-dec-ultrix%s\n", un.release); exit (0);
#else
printf ("mips-dec-ultrix\n"); exit (0);
#endif
#endif
#endif
#if defined (alliant) && defined (i860)
printf ("i860-alliant-bsd\n"); exit (0);
#endif
exit (1);
}
EOF
$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` &&
{ echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
echo "$0: unable to guess system type" >&2
case "$UNAME_MACHINE:$UNAME_SYSTEM" in
......
config.sub 100755 → 100644
View file @ 8e9a8712
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
# Copyright 1992-2019 Free Software Foundation, Inc.
timestamp='2018-12-16'
timestamp='2019-06-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2018 Free Software Foundation, Inc.
Copyright 1992-2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -111,6 +111,7 @@ case $# in
esac
# Split fields of configuration type
# shellcheck disable=SC2162
IFS="-" read field1 field2 field3 field4 <<EOF
$1
EOF
......@@ -336,17 +337,14 @@ case $1 in
basic_machine=m88k-harris
os=sysv3
;;
hp300)
hp300 | hp300hpux)
basic_machine=m68k-hp
os=hpux
;;
hp300bsd)
basic_machine=m68k-hp
os=bsd
;;
hp300hpux)
basic_machine=m68k-hp
os=hpux
;;
hppaosf)
basic_machine=hppa1.1-hp
os=osf
......@@ -359,10 +357,6 @@ case $1 in
basic_machine=i386-mach
os=mach
;;
vsta)
basic_machine=i386-pc
os=vsta
;;
isi68 | isi)
basic_machine=m68k-isi
os=sysv
......@@ -611,6 +605,10 @@ case $1 in
basic_machine=vax-dec
os=vms
;;
vsta)
basic_machine=i386-pc
os=vsta
;;
vxworks960)
basic_machine=i960-wrs
os=vxworks
......@@ -821,7 +819,9 @@ case $basic_machine in
cpu=m68k
vendor=next
case $os in
nextstep* )
openstep*)
;;
nextstep*)
;;
ns2*)
os=nextstep2
......@@ -918,6 +918,7 @@ case $basic_machine in
;;
*-*)
# shellcheck disable=SC2162
IFS="-" read cpu vendor <<EOF
$basic_machine
EOF
......@@ -1168,7 +1169,7 @@ case $cpu-$vendor in
| asmjs \
| ba \
| be32 | be64 \
| bfin | bs2000 \
| bfin | bpf | bs2000 \
| c[123]* | c30 | [cjt]90 | c4x \
| c8051 | clipper | craynv | csky | cydra \
| d10v | d30v | dlx | dsp16xx \
......@@ -1183,13 +1184,13 @@ case $cpu-$vendor in
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle \
| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k | v70 | w65 \
| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
| m88110 | m88k | maxq | mb | mcore | mep | metag \
| microblaze | microblazeel \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
| mips64 | mips64eb | mips64el \
| mips64octeon | mips64octeonel \
| mips64orion | mips64orionel \
| mips64r5900 | mips64r5900el \
......@@ -1216,11 +1217,12 @@ case $cpu-$vendor in
| nds32 | nds32le | nds32be \
| nfp \
| nios | nios2 | nios2eb | nios2el \
| none | np1 | ns16k | ns32k \
| none | np1 | ns16k | ns32k | nvptx \
| open8 \
| or1k* \
| or32 \
| orion \
| picochip \
| pdp10 | pdp11 | pj | pjl | pn | power \
| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
| pru \
......@@ -1228,7 +1230,8 @@ case $cpu-$vendor in
| riscv | riscv32 | riscv64 \
| rl78 | romp | rs6000 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
| sh | shl \
| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
| sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
| sparclite \
......@@ -1238,10 +1241,11 @@ case $cpu-$vendor in
| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
| tron \
| ubicom32 \
| v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
| vax \
| visium \
| wasm32 \
| w65 \
| wasm32 | wasm64 \
| we32k \
| x86 | x86_64 | xc16x | xgate | xps100 \
| xstormy16 | xtensa* \
......@@ -1343,7 +1347,7 @@ case $os in
| nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
| clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
| knetbsd* | mirbsd* | netbsd* \
| bitrig* | openbsd* | solidbsd* | libertybsd* \
| bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
| ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
| bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
| ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
......@@ -1361,7 +1365,8 @@ case $os in
| powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
| skyos* | haiku* | rdos* | toppers* | drops* | es* \
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
| midnightbsd* | amdhsa* | unleashed*)
| midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
| nsk* | powerunix)
# Remember, each alternative MUST END IN *, to match a version number.
;;
qnx*)
......@@ -1445,9 +1450,6 @@ case $os in
ns2)
os=nextstep2
;;
nsk*)
os=nsk
;;
# Preserve the version number of sinix5.
sinix5.*)
os=`echo $os | sed -e 's|sinix|sysv|'`
......
configure
View file @ 8e9a8712
This diff is collapsed.
configure.in
View file @ 8e9a8712
......@@ -126,14 +126,12 @@ changequote(,)
LIB_VER=`echo ${GRASS_VERSION_NUMBER} | sed 's/^\([0-9.]*\).*$/\1/'`
changequote([,])
GRASS_VERSION_SVN="exported"
AC_PATH_PROG(SVN_VERSION, svnversion, no)
if test "$SVN_VERSION" != "no" ; then
GRASS_VERSION_SVN=`$SVN_VERSION -c | cut -f2 -d:`
if test "$GRASS_VERSION_SVN" = "exported" -o "$GRASS_VERSION_SVN" = "Unversioned directory" ; then
GRASS_VERSION_SVN="exported"
else
GRASS_VERSION_SVN="r$GRASS_VERSION_SVN"
GRASS_VERSION_GIT="exported"
AC_PATH_PROG(GIT, git, no)
if test "$GIT" != "no" ; then
GRASS_VERSION_GIT=`$GIT rev-parse --short HEAD 2>/dev/null`
if test -z "$GRASS_VERSION_GIT"; then
GRASS_VERSION_GIT="exported"
fi
fi
......@@ -143,7 +141,7 @@ AC_SUBST(GRASS_VERSION_MINOR)
AC_SUBST(GRASS_VERSION_RELEASE)
AC_SUBST(GRASS_VERSION_NUMBER)
AC_SUBST(GRASS_VERSION_DATE)
AC_SUBST(GRASS_VERSION_SVN)
AC_SUBST(GRASS_VERSION_GIT)
AC_SUBST(NAME_VER)
AC_SUBST(LIB_VER)
......@@ -268,7 +266,7 @@ LOC_ARG_WITH(pthread, POSIX threads, no)
LOC_ARG_WITH(openmp, OpenMP, no)
LOC_ARG_WITH(opencl, OpenCL, no)
LOC_ARG_WITH(bzlib, BZIP2, no)
LOC_ARG_WITH(zstd, Zstandard, no)
LOC_ARG_WITH(zstd, Zstandard)
AC_ARG_WITH(gdal,
[ --with-gdal[=path/gdal-config]
......
contributors.csv
View file @ 8e9a8712
cvs_id,name,email,country,osgeo_id,rfc2_agreed
-,Ivan Shmakov,<ivan theory.asu.ru>,Russia,1gray,yes
-,Eric Patton,<epatton nrcan.gc.ca>,Canada,epatton,yes
-,Eric Patton,<eric.patton canada.ca>,Canada,epatton,yes
-,Laura Toma,<ltoma bowdoin.edu>,USA,ltoma,yes
-,Markus Metz,<markus.metz.giswork googlemail.com>,Germany,mmetz,yes
-,Maris Nartiss,<maris.gis gmail.com>,Latvia,marisn,yes
......@@ -17,6 +17,7 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed
-,Margherita Di Leo,<diregola gmail com>,Italy,madi,yes
-,Veronica Andreo,<veroandreo gmail.com>,Argentina,veroandreo,yes
-,Stefan Blumentrath,<stefan.blumentrath nina.no>,Norway,sbl,yes
-,Ondřej Pešek,<pesej.ondrek gmail.com>,Czech Republic,pesekon2,yes
alex,Alex Shevlakov,<sixote yahoo.com>,Russia,-,-
andreas,Andreas Lange,<andreas.c.lange gmx.de>,Germany,-,-
benjamin,Benjamin Ducke,<benducke fastmail.fm>,Germany,benducke,yes
......
db/db.columns/db.columns.html
View file @ 8e9a8712
......@@ -57,4 +57,4 @@ db.columns driver=sqlite table=archsites database='$GISDBASE/$LOCATION_NAME/$MAP
Radim Blazek, ITC-Irst, Trento, Italy
<p><i>Last changed: $Date: 2014-11-28 10:57:47 +0100 (Fri, 28 Nov 2014) $</i>
<p><i>Last changed: $Date$</i>
db/db.connect/db.connect.html
View file @ 8e9a8712
......@@ -131,4 +131,4 @@ Main author: Radim Blazek, ITC-Irst, Trento, Italy<br>
GRASS 7 improvements: Martin Landa, Markus Metz
<p>
<i>Last changed: $Date: 2016-09-11 09:28:22 +0200 (Sun, 11 Sep 2016) $</i>
<i>Last changed: $Date$</i>
db/db.copy/db.copy.html
View file @ 8e9a8712
......@@ -79,4 +79,4 @@ db.copy from_driver=sqlite from_database='$GISDBASE/$LOCATION_NAME/$MAPSET/sqlit
Radim Blazek, ITC-irst, Trento, Italy
<p><i>Last changed: $Date: 2014-11-28 10:57:47 +0100 (Fri, 28 Nov 2014) $</i>
<p><i>Last changed: $Date$</i>
db/db.createdb/db.createdb.html
View file @ 8e9a8712
......@@ -65,4 +65,4 @@ Radim Blazek, ITC-Irst, Trento, Italy<br>
SQLite and PostgreSQL support by Martin Landa, Czech Technical University in Prague, Czech Republic
<p>
<i>Last changed: $Date: 2014-12-07 23:22:14 +0100 (Sun, 07 Dec 2014) $</i>
<i>Last changed: $Date$</i>
db/db.databases/db.databases.html
View file @ 8e9a8712
......@@ -55,4 +55,4 @@ Radim Blazek, ITC-Irst, Trento, Italy<br>
Updated for GRASS 7 by Martin Landa, Czech Technical University in Prague, Czech Republic
<p>
<i>Last changed: $Date: 2014-12-07 23:22:14 +0100 (Sun, 07 Dec 2014) $</i>
<i>Last changed: $Date$</i>
db/db.describe/db.describe.html
View file @ 8e9a8712
......@@ -76,4 +76,4 @@ type:INTEGER
Radim Blazek, ITC-Irst, Trento, Italy
<p><i>Last changed: $Date: 2014-11-28 10:57:47 +0100 (Fri, 28 Nov 2014) $</i>
<p><i>Last changed: $Date$</i>
db/db.describe/testsuite/test_dbdescribe.py
View file @ 8e9a8712
#!/usr/bin/env python2
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
"""
Created on Tue Nov 14 09:43:55 2017
......