Ignore:
Location:
grass/branches/releasebranch_7_6
Files:
3 added
1 deleted
39 edited

Legend:

Unmodified
Added
Removed

  • grass/branches/releasebranch_7_6/.travis.yml

    r73959 r74146  
    77   include:
    88      - os: linux
    9         dist: trusty
     9        dist: xenial
    1010        compiler: gcc
    1111        sudo: required
    1212      - os: linux
    13         dist: trusty
     13        dist: xenial
    1414        compiler: clang
    1515        sudo: required

  • grass/branches/releasebranch_7_6/.travis/linux.install.sh

    r73959 r74146  
    2727    libreadline-dev \
    2828    libsqlite3-dev \
    29     libwxgtk2.8-dev \
     29    libwxgtk3.0-dev \
    3030    libxmu-dev \
    3131    python \
    32     python-wxgtk2.8 \
     32    python-wxgtk3.0 \
    3333    python-dev \
    3434    unixodbc-dev \
    … …  
    3939    liblapack-dev \
    4040    python-numpy
     41

  • grass/branches/releasebranch_7_6/configure

    r73959 r74146  
    14491449    INSTDIR='${prefix}'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
    14501450else
    1451     INSTDIR='${prefix}'"/grass-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}"
     1451    INSTDIR='${prefix}'"/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}"
    14521452fi
    14531453
    … …  
    1271612716fi
    1271712717
    12718 for ac_declaration in \
    12719    ''\
    12720    '#include <stdlib.h>' \
    12721    'extern "C" void std::exit (int) throw (); using std::exit;' \
    12722    'extern "C" void std::exit (int); using std::exit;' \
    12723    'extern "C" void exit (int) throw ();' \
    12724    'extern "C" void exit (int);' \
    12725    'void exit (int);'
    12726 do
    12727   cat > conftest.$ac_ext <<EOF
    12728 #line 12729 "configure"
    12729 #include "confdefs.h"
    12730 #include <stdlib.h>
    12731 $ac_declaration
    12732 int main() {
    12733 exit (42);
    12734 ; return 0; }
    12735 EOF
    12736 if { (eval echo configure:12737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    12737   :
    12738 else
    12739   echo "configure: failed program was:" >&5
    12740   cat conftest.$ac_ext >&5
    12741   rm -rf conftest*
    12742   continue
    12743 fi
    12744 rm -f conftest*
    12745   cat > conftest.$ac_ext <<EOF
    12746 #line 12747 "configure"
    12747 #include "confdefs.h"
    12748 $ac_declaration
    12749 int main() {
    12750 exit (42);
    12751 ; return 0; }
    12752 EOF
    12753 if { (eval echo configure:12754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    12754   rm -rf conftest*
    12755   break
    12756 else
    12757   echo "configure: failed program was:" >&5
    12758   cat conftest.$ac_ext >&5
    12759 fi
    12760 rm -f conftest*
    12761 done
    12762 if test -n "$ac_declaration"; then
    12763   echo '#ifdef __cplusplus' >>confdefs.h
    12764   echo $ac_declaration      >>confdefs.h
    12765   echo '#endif'             >>confdefs.h
    12766 fi
    12767 
    12768 
    1276912718else
    1277012719        CXX=
    … …  
    1278012729
    1278112730echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
    12782 echo "configure:12783: checking whether to use openDWG" >&5
     12731echo "configure:12732: checking whether to use openDWG" >&5
    1278312732echo "$ac_t"""$with_opendwg"" 1>&6
    1278412733case "$with_opendwg" in
    … …  
    1280012749
    1280112750echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
    12802 echo "configure:12803: checking for location of openDGW includes" >&5
     12751echo "configure:12752: checking for location of openDGW includes" >&5
    1280312752case "$with_opendwg_includes" in
    1280412753y | ye | yes | n | no)
    … …  
    1282612775ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    1282712776echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    12828 echo "configure:12829: checking for $ac_hdr" >&5
    12829 
    12830 cat > conftest.$ac_ext <<EOF
    12831 #line 12832 "configure"
     12777echo "configure:12778: checking for $ac_hdr" >&5
     12778
     12779cat > conftest.$ac_ext <<EOF
     12780#line 12781 "configure"
    1283212781#include "confdefs.h"
    1283312782#include <$ac_hdr>
    1283412783EOF
    1283512784ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    12836 { (eval echo configure:12837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     12785{ (eval echo configure:12786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    1283712786ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    1283812787if test -z "$ac_err"; then
    … …  
    1286812817
    1286912818echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
    12870 echo "configure:12871: checking for location of openDWG library" >&5
     12819echo "configure:12820: checking for location of openDWG library" >&5
    1287112820case "$with_opendwg_libs" in
    1287212821y | ye | yes | n | no)
    … …  
    1290912858
    1291012859echo $ac_n "checking whether to use POSIX threads""... $ac_c" 1>&6
    12911 echo "configure:12912: checking whether to use POSIX threads" >&5
     12860echo "configure:12861: checking whether to use POSIX threads" >&5
    1291212861echo "$ac_t"""$with_pthread"" 1>&6
    1291312862case "$with_pthread" in
    … …  
    1292912878
    1293012879echo $ac_n "checking for location of POSIX threads includes""... $ac_c" 1>&6
    12931 echo "configure:12932: checking for location of POSIX threads includes" >&5
     12880echo "configure:12881: checking for location of POSIX threads includes" >&5
    1293212881case "$with_pthread_includes" in
    1293312882y | ye | yes | n | no)
    … …  
    1295512904ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    1295612905echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    12957 echo "configure:12958: checking for $ac_hdr" >&5
    12958 
    12959 cat > conftest.$ac_ext <<EOF
    12960 #line 12961 "configure"
     12906echo "configure:12907: checking for $ac_hdr" >&5
     12907
     12908cat > conftest.$ac_ext <<EOF
     12909#line 12910 "configure"
    1296112910#include "confdefs.h"
    1296212911#include <$ac_hdr>
    1296312912EOF
    1296412913ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    12965 { (eval echo configure:12966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     12914{ (eval echo configure:12915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    1296612915ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    1296712916if test -z "$ac_err"; then
    … …  
    1299712946
    1299812947echo $ac_n "checking for location of POSIX threads library""... $ac_c" 1>&6
    12999 echo "configure:13000: checking for location of POSIX threads library" >&5
     12948echo "configure:12949: checking for location of POSIX threads library" >&5
    1300012949case "$with_pthread_libs" in
    1300112950y | ye | yes | n | no)
    … …  
    1302212971LDFLAGS=" $LDFLAGS"
    1302312972echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
    13024 echo "configure:13025: checking for pthread_create" >&5
    13025 
    13026 cat > conftest.$ac_ext <<EOF
    13027 #line 13028 "configure"
     12973echo "configure:12974: checking for pthread_create" >&5
     12974
     12975cat > conftest.$ac_ext <<EOF
     12976#line 12977 "configure"
    1302812977#include "confdefs.h"
    1302912978/* System header to define __stub macros and hopefully few prototypes,
    … …  
    1304812997; return 0; }
    1304912998EOF
    13050 if { (eval echo configure:13051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     12999if { (eval echo configure:13000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    1305113000  rm -rf conftest*
    1305213001  eval "ac_cv_func_pthread_create=yes"
    … …  
    1307513024
    1307613025echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
    13077 echo "configure:13078: checking for pthread_create in -lpthread" >&5
     13026echo "configure:13027: checking for pthread_create in -lpthread" >&5
    1307813027ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
    1307913028
    … …  
    1308113030LIBS="-lpthread  $LIBS"
    1308213031cat > conftest.$ac_ext <<EOF
    13083 #line 13084 "configure"
     13032#line 13033 "configure"
    1308413033#include "confdefs.h"
    1308513034/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    1309213041; return 0; }
    1309313042EOF
    13094 if { (eval echo configure:13095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     13043if { (eval echo configure:13044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    1309513044  rm -rf conftest*
    1309613045  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    1314213091
    1314313092echo $ac_n "checking whether to use OpenMP""... $ac_c" 1>&6
    13144 echo "configure:13145: checking whether to use OpenMP" >&5
     13093echo "configure:13094: checking whether to use OpenMP" >&5
    1314513094echo "$ac_t"""$with_openmp"" 1>&6
    1314613095case "$with_openmp" in
    … …  
    1316313112
    1316413113echo $ac_n "checking for location of OpenMP includes""... $ac_c" 1>&6
    13165 echo "configure:13166: checking for location of OpenMP includes" >&5
     13114echo "configure:13115: checking for location of OpenMP includes" >&5
    1316613115case "$with_openmp_includes" in
    1316713116y | ye | yes | n | no)
    … …  
    1318913138ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    1319013139echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    13191 echo "configure:13192: checking for $ac_hdr" >&5
    13192 
    13193 cat > conftest.$ac_ext <<EOF
    13194 #line 13195 "configure"
     13140echo "configure:13141: checking for $ac_hdr" >&5
     13141
     13142cat > conftest.$ac_ext <<EOF
     13143#line 13144 "configure"
    1319513144#include "confdefs.h"
    1319613145#include <$ac_hdr>
    1319713146EOF
    1319813147ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    13199 { (eval echo configure:13200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     13148{ (eval echo configure:13149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    1320013149ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    1320113150if test -z "$ac_err"; then
    … …  
    1323513184
    1323613185echo $ac_n "checking for location of OpenMP library""... $ac_c" 1>&6
    13237 echo "configure:13238: checking for location of OpenMP library" >&5
     13186echo "configure:13187: checking for location of OpenMP library" >&5
    1323813187case "$with_openmp_libs" in
    1323913188y | ye | yes | n | no)
    … …  
    1326013209LDFLAGS=" $LDFLAGS"
    1326113210echo $ac_n "checking for GOMP_parallel_start""... $ac_c" 1>&6
    13262 echo "configure:13263: checking for GOMP_parallel_start" >&5
    13263 
    13264 cat > conftest.$ac_ext <<EOF
    13265 #line 13266 "configure"
     13211echo "configure:13212: checking for GOMP_parallel_start" >&5
     13212
     13213cat > conftest.$ac_ext <<EOF
     13214#line 13215 "configure"
    1326613215#include "confdefs.h"
    1326713216/* System header to define __stub macros and hopefully few prototypes,
    … …  
    1328613235; return 0; }
    1328713236EOF
    13288 if { (eval echo configure:13289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     13237if { (eval echo configure:13238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    1328913238  rm -rf conftest*
    1329013239  eval "ac_cv_func_GOMP_parallel_start=yes"
    … …  
    1331313262
    1331413263echo $ac_n "checking for GOMP_parallel_start in -lgomp""... $ac_c" 1>&6
    13315 echo "configure:13316: checking for GOMP_parallel_start in -lgomp" >&5
     13264echo "configure:13265: checking for GOMP_parallel_start in -lgomp" >&5
    1331613265ac_lib_var=`echo gomp'_'GOMP_parallel_start | sed 'y%./+-%__p_%'`
    1331713266
    … …  
    1331913268LIBS="-lgomp  $LIBS"
    1332013269cat > conftest.$ac_ext <<EOF
    13321 #line 13322 "configure"
     13270#line 13271 "configure"
    1332213271#include "confdefs.h"
    1332313272/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    1333013279; return 0; }
    1333113280EOF
    13332 if { (eval echo configure:13333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     13281if { (eval echo configure:13282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    1333313282  rm -rf conftest*
    1333413283  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    1340313352
    1340413353echo $ac_n "checking whether to use OpenCL""... $ac_c" 1>&6
    13405 echo "configure:13406: checking whether to use OpenCL" >&5
     13354echo "configure:13355: checking whether to use OpenCL" >&5
    1340613355echo "$ac_t"""$with_opencl"" 1>&6
    1340713356case "$with_opencl" in
    … …  
    1342313372
    1342413373echo $ac_n "checking for location of OpenCL includes""... $ac_c" 1>&6
    13425 echo "configure:13426: checking for location of OpenCL includes" >&5
     13374echo "configure:13375: checking for location of OpenCL includes" >&5
    1342613375case "$with_opencl_includes" in
    1342713376y | ye | yes | n | no)
    … …  
    1345013399ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    1345113400echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    13452 echo "configure:13453: checking for $ac_hdr" >&5
    13453 
    13454 cat > conftest.$ac_ext <<EOF
    13455 #line 13456 "configure"
     13401echo "configure:13402: checking for $ac_hdr" >&5
     13402
     13403cat > conftest.$ac_ext <<EOF
     13404#line 13405 "configure"
    1345613405#include "confdefs.h"
    1345713406#include <$ac_hdr>
    1345813407EOF
    1345913408ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    13460 { (eval echo configure:13461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     13409{ (eval echo configure:13410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    1346113410ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    1346213411if test -z "$ac_err"; then
    … …  
    1349813447LDFLAGS=" $LDFLAGS"
    1349913448echo $ac_n "checking for clGetPlatformInfo""... $ac_c" 1>&6
    13500 echo "configure:13501: checking for clGetPlatformInfo" >&5
    13501 
    13502 cat > conftest.$ac_ext <<EOF
    13503 #line 13504 "configure"
     13449echo "configure:13450: checking for clGetPlatformInfo" >&5
     13450
     13451cat > conftest.$ac_ext <<EOF
     13452#line 13453 "configure"
    1350413453#include "confdefs.h"
    1350513454/* System header to define __stub macros and hopefully few prototypes,
    … …  
    1352413473; return 0; }
    1352513474EOF
    13526 if { (eval echo configure:13527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     13475if { (eval echo configure:13476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    1352713476  rm -rf conftest*
    1352813477  eval "ac_cv_func_clGetPlatformInfo=yes"
    … …  
    1356313512ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    1356413513echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    13565 echo "configure:13566: checking for $ac_hdr" >&5
    13566 
    13567 cat > conftest.$ac_ext <<EOF
    13568 #line 13569 "configure"
     13514echo "configure:13515: checking for $ac_hdr" >&5
     13515
     13516cat > conftest.$ac_ext <<EOF
     13517#line 13518 "configure"
    1356913518#include "confdefs.h"
    1357013519#include <$ac_hdr>
    1357113520EOF
    1357213521ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    13573 { (eval echo configure:13574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     13522{ (eval echo configure:13523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    1357413523ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    1357513524if test -z "$ac_err"; then
    … …  
    1360413553   
    1360513554echo $ac_n "checking for location of OpenCL library""... $ac_c" 1>&6
    13606 echo "configure:13607: checking for location of OpenCL library" >&5
     13555echo "configure:13556: checking for location of OpenCL library" >&5
    1360713556case "$with_opencl_libs" in
    1360813557y | ye | yes | n | no)
    … …  
    1362813577
    1362913578echo $ac_n "checking for clGetPlatformInfo in -lOpenCL""... $ac_c" 1>&6
    13630 echo "configure:13631: checking for clGetPlatformInfo in -lOpenCL" >&5
     13579echo "configure:13580: checking for clGetPlatformInfo in -lOpenCL" >&5
    1363113580ac_lib_var=`echo OpenCL'_'clGetPlatformInfo | sed 'y%./+-%__p_%'`
    1363213581
    … …  
    1363413583LIBS="-lOpenCL  $LIBS"
    1363513584cat > conftest.$ac_ext <<EOF
    13636 #line 13637 "configure"
     13585#line 13586 "configure"
    1363713586#include "confdefs.h"
    1363813587/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    1364513594; return 0; }
    1364613595EOF
    13647 if { (eval echo configure:13648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     13596if { (eval echo configure:13597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    1364813597  rm -rf conftest*
    1364913598  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    1370513654
    1370613655     echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6
    13707 echo "configure:13708: checking for special C compiler options needed for large files" >&5
     13656echo "configure:13657: checking for special C compiler options needed for large files" >&5
    1370813657
    1370913658ac_cv_sys_largefile_CC=no
    … …  
    1371313662          # so use the C compiler's -n32 option if that helps.
    1371413663          cat > conftest.$ac_ext <<EOF
    13715 #line 13716 "configure"
     13664#line 13665 "configure"
    1371613665#include "confdefs.h"
    1371713666#include <sys/types.h>
    … …  
    1372913678; return 0; }
    1373013679EOF
    13731 if { (eval echo configure:13732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     13680if { (eval echo configure:13681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    1373213681  :
    1373313682else
    … …  
    1373813687             CC="$CC -n32"
    1373913688             cat > conftest.$ac_ext <<EOF
    13740 #line 13741 "configure"
     13689#line 13690 "configure"
    1374113690#include "confdefs.h"
    1374213691#include <sys/types.h>
    … …  
    1375413703; return 0; }
    1375513704EOF
    13756 if { (eval echo configure:13757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     13705if { (eval echo configure:13706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    1375713706  rm -rf conftest*
    1375813707  ac_cv_sys_largefile_CC=' -n32'
    … …  
    1378113730
    1378213731     echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
    13783 echo "configure:13784: checking for _FILE_OFFSET_BITS value needed for large files" >&5
     13732echo "configure:13733: checking for _FILE_OFFSET_BITS value needed for large files" >&5
    1378413733
    1378513734ac_cv_sys_file_offset_bits=no
    1378613735      cat > conftest.$ac_ext <<EOF
    13787 #line 13788 "configure"
     13736#line 13737 "configure"
    1378813737#include "confdefs.h"
    1378913738#include <sys/types.h>
    … …  
    1380113750; return 0; }
    1380213751EOF
    13803 if { (eval echo configure:13804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     13752if { (eval echo configure:13753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    1380413753  :
    1380513754else
    … …  
    1380813757  rm -rf conftest*
    1380913758  cat > conftest.$ac_ext <<EOF
    13810 #line 13811 "configure"
     13759#line 13760 "configure"
    1381113760#include "confdefs.h"
    1381213761#define _FILE_OFFSET_BITS 64
    … …  
    1382613775; return 0; }
    1382713776EOF
    13828 if { (eval echo configure:13829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     13777if { (eval echo configure:13778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    1382913778  rm -rf conftest*
    1383013779  ac_cv_sys_file_offset_bits=64
    … …  
    1385213801   fi
    1385313802     echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
    13854 echo "configure:13855: checking for _LARGE_FILES value needed for large files" >&5
     13803echo "configure:13804: checking for _LARGE_FILES value needed for large files" >&5
    1385513804
    1385613805ac_cv_sys_large_files=no
    1385713806      cat > conftest.$ac_ext <<EOF
    13858 #line 13859 "configure"
     13807#line 13808 "configure"
    1385913808#include "confdefs.h"
    1386013809#include <sys/types.h>
    … …  
    1387213821; return 0; }
    1387313822EOF
    13874 if { (eval echo configure:13875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     13823if { (eval echo configure:13824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    1387513824  :
    1387613825else
    … …  
    1387913828  rm -rf conftest*
    1388013829  cat > conftest.$ac_ext <<EOF
    13881 #line 13882 "configure"
     13830#line 13831 "configure"
    1388213831#include "confdefs.h"
    1388313832#define _LARGE_FILES 1
    … …  
    1389713846; return 0; }
    1389813847EOF
    13899 if { (eval echo configure:13900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     13848if { (eval echo configure:13849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    1390013849  rm -rf conftest*
    1390113850  ac_cv_sys_large_files=1
    … …  
    1392313872   fi
    1392413873     echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
    13925 echo "configure:13926: checking for _LARGEFILE_SOURCE value needed for large files" >&5
     13874echo "configure:13875: checking for _LARGEFILE_SOURCE value needed for large files" >&5
    1392613875
    1392713876ac_cv_sys_largefile_source=no
    1392813877      cat > conftest.$ac_ext <<EOF
    13929 #line 13930 "configure"
     13878#line 13879 "configure"
    1393013879#include "confdefs.h"
    1393113880#include <stdio.h>
    … …  
    1393413883; return 0; }
    1393513884EOF
    13936 if { (eval echo configure:13937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     13885if { (eval echo configure:13886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    1393713886  :
    1393813887else
    … …  
    1394113890  rm -rf conftest*
    1394213891  cat > conftest.$ac_ext <<EOF
    13943 #line 13944 "configure"
     13892#line 13893 "configure"
    1394413893#include "confdefs.h"
    1394513894#define _LARGEFILE_SOURCE 1
    … …  
    1395013899; return 0; }
    1395113900EOF
    13952 if { (eval echo configure:13953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     13901if { (eval echo configure:13902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    1395313902  rm -rf conftest*
    1395413903  ac_cv_sys_largefile_source=1
    … …  
    1398213931CFLAGS="$LFS_CFLAGS ${ac_save_cflags}"
    1398313932echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
    13984 echo "configure:13985: checking for _LARGEFILE_SOURCE value needed for large files" >&5
     13933echo "configure:13934: checking for _LARGEFILE_SOURCE value needed for large files" >&5
    1398513934
    1398613935ac_cv_sys_largefile_source=no
    1398713936      cat > conftest.$ac_ext <<EOF
    13988 #line 13989 "configure"
     13937#line 13938 "configure"
    1398913938#include "confdefs.h"
    1399013939#include <stdio.h>
    … …  
    1399313942; return 0; }
    1399413943EOF
    13995 if { (eval echo configure:13996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     13944if { (eval echo configure:13945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    1399613945  :
    1399713946else
    … …  
    1400013949  rm -rf conftest*
    1400113950  cat > conftest.$ac_ext <<EOF
    14002 #line 14003 "configure"
     13951#line 13952 "configure"
    1400313952#include "confdefs.h"
    1400413953#define _LARGEFILE_SOURCE 1
    … …  
    1400913958; return 0; }
    1401013959EOF
    14011 if { (eval echo configure:14012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     13960if { (eval echo configure:13961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    1401213961  rm -rf conftest*
    1401313962  ac_cv_sys_largefile_source=1
    … …  
    1403913988
    1404013989   echo $ac_n "checking for fseeko""... $ac_c" 1>&6
    14041 echo "configure:14042: checking for fseeko" >&5
     13990echo "configure:13991: checking for fseeko" >&5
    1404213991
    1404313992ac_cv_func_fseeko=no
    1404413993      cat > conftest.$ac_ext <<EOF
    14045 #line 14046 "configure"
     13994#line 13995 "configure"
    1404613995#include "confdefs.h"
    1404713996#include <stdio.h>
    … …  
    1405013999; return 0; }
    1405114000EOF
    14052 if { (eval echo configure:14053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     14001if { (eval echo configure:14002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    1405314002  rm -rf conftest*
    1405414003  ac_cv_func_fseeko=yes
    … …  
    1406714016   fi
    1406814017echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
    14069 echo "configure:14070: checking if system supports Large Files at all" >&5
    14070 
    14071 cat > conftest.$ac_ext <<EOF
    14072 #line 14073 "configure"
     14018echo "configure:14019: checking if system supports Large Files at all" >&5
     14019
     14020cat > conftest.$ac_ext <<EOF
     14021#line 14022 "configure"
    1407314022#include "confdefs.h"
    1407414023#include <stdio.h>
    … …  
    1410214051; return 0; }
    1410314052EOF
    14104 if { (eval echo configure:14105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     14053if { (eval echo configure:14054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    1410514054  rm -rf conftest*
    1410614055  ac_cv_largefiles=yes

  • grass/branches/releasebranch_7_6/configure.in

    r73959 r74146  
    217217    INSTDIR='${prefix}'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
    218218else
    219     INSTDIR='${prefix}'"/grass-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}"
     219    INSTDIR='${prefix}'"/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}"
    220220fi
    221221

  • grass/branches/releasebranch_7_6/imagery/i.atcorr/i.atcorr.html

    r73959 r74146  
    10571057<em>
    10581058<a href="i.aster.toar.html">i.aster.toar</a>,
     1059<a href="i.colors.enhance.html">i.colors.enhance</a>,
    10591060<a href="i.landsat.toar.html">i.landsat.toar</a>,
    10601061<a href="r.info.html">r.info</a>,

  • grass/branches/releasebranch_7_6/imagery/i.evapo.pt/i.evapo.pt.html

    r73959 r74146  
    33<em>i.evapo.pt</em> Calculates the diurnal evapotranspiration after Prestley
    44and Taylor (1972). The Priestley-Taylor model (Priestley and Taylor, 1972)
    5 is a modification of Penman’s more theoretical equation.
     5is a modification of Penman's more theoretical equation.
    66
    77<h2>NOTES</h2>
    8 RNETD optional output from i.evapo.potrad is giving good results as input
     8RNETD optional output from <em>i.evapo.potrad</em> is giving good results as input
    99for net radiation in this module.
    1010
    … …  
    3636<h2>AUTHORS</h2>
    3737
    38 Yann Chemin, GRASS Development team, 2007-08
     38Yann Chemin, GRASS Development Team, 2007-08
    3939
    4040<p><i>Last changed: $Date$</i>

  • grass/branches/releasebranch_7_6/imagery/i.landsat.toar/i.landsat.toar.html

    r73959 r74146  
    111111
    112112NASA reports a structure of the L1G Metadata file
    113 (<a href="http://landsat.usgs.gov/documents/LDCM-DFCB-004.pdf‎">LDCM-DFCB-004.pdf</a>)
     113(<a href="http://landsat.usgs.gov/documents/LDCM-DFCB-004.pdf">LDCM-DFCB-004.pdf</a>)
    114114for Landsat Data Continuity Mission (i.e. Landsat-8).
    115115
    … …  
    244244    Environment, vol. 113</li>
    245245
    246   <li>Chander G.H. and B. Markham, 2003.: IEEE Transactions On Geoscience And
     246  <li>Chander G.H. and B. Markham, 2003: IEEE Transactions On Geoscience And
    247247    Remote Sensing, vol. 41, no. 11.</li>
    248248
    249   <li>Chavez P.S., jr. 1996. Image-based atmospheric corrections -
     249  <li>Chavez P.S., jr. 1996: Image-based atmospheric corrections -
    250250    Revisited and Improved. Photogrammetric Engineering and Remote
    251251    Sensing 62(9): 1025-1036.</li>
    … …  
    273273<em>
    274274  <a href="i.atcorr.html">i.atcorr</a>,
     275  <a href="i.colors.enhance.html">i.colors.enhance</a>,
    275276  <a href="r.mapcalc.html">r.mapcalc</a>,
    276277  <a href="r.in.gdal.html">r.in.gdal</a>
    277278</em>
    278279<p>
    279 <a href="https://lta.cr.usgs.gov/landsat_dictionary.html">Landsat Data Dictionary</a> by USGS
     280<a href="https://lta.cr.usgs.gov/DD/landsat_dictionary.html">Landsat Data Dictionary</a> by USGS
    280281
    281282<h2>AUTHOR</h2>

  • grass/branches/releasebranch_7_6/include/Make/Grass.make

    r73959 r74146  
    6868
    6969GRASS_VERSION_NUMBER  = $(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR).$(GRASS_VERSION_RELEASE)
    70 GRASS_VERSION_NAME    = $(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)$(GRASS_VERSION_RELEASE)
     70GRASS_LIB_VERSION_NUMBER  = $(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)
    7171
    7272GRASS_NAME      = grass$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
    … …  
    266266
    267267define lib_rules
    268 $(1)_LIBNAME = grass_$(2).$(GRASS_VERSION_NUMBER)
     268$(1)_LIBNAME = grass_$(2).$(GRASS_LIB_VERSION_NUMBER)
    269269ifneq ($(NEED_DEPS),)
    270270$(1)LIB = -l$$($(1)_LIBNAME) $$($(1)DEPS)

  • grass/branches/releasebranch_7_6/include/Make/Shlib.make

    r73959 r74146  
    1010        $(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(LIBES) $(EXTRA_LIBS) $(MATHLIB)
    1111ifndef MINGW
    12         (cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
     12        (cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_LIB_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
    1313endif
    1414

  • grass/branches/releasebranch_7_6/lib/gis/spawn.c

    r73959 r74146  
    687687
    688688        execvp(command, (char **)sp->args);
    689         G_warning(_("Unable to execute command"));
     689        G_warning(_("Unable to execute command '%s': %s"), command, strerror(errno));
    690690        _exit(127);
    691691    }

  • grass/branches/releasebranch_7_6/lib/init/grass.py

    r73959 r74146  
    341341    exit_after=_("exit after creation of location or mapset. Only with -c flag"),
    342342    force_removal=_("force removal of .gislock if exists (use with care!). Only with --text flag"),
    343     text=_("use text based interface (skip welcome screen)"),
     343    text=_("use text based interface (skip graphical welcome screen)"),
    344344    text_detail=_("and set as default"),
    345     gtext=_("use text based interface (show welcome screen)"),
     345    gtext=_("use text based interface (show graphical welcome screen)"),
    346346    gtext_detail=_("and set as default"),
    347347    gui=_("use $DEFAULT_GUI graphical user interface"),
    … …  
    350350    config_detail=_("options: arch,build,compiler,path,revision,svn_revision,version"),
    351351    params=_("Parameters"),
    352     gisdbase=_("initial GRASS GIS database directory"),
     352    gisdbase=_("initial GRASS database directory"),
    353353    gisdbase_detail=_("directory containing Locations"),
    354354    location=_("initial GRASS Location"),
    … …  
    727727
    728728    if not browser:
    729         warning(_("Searched for a web browser, but none found"))
    730         # even so we set konqueror to make lib/gis/parser.c happy:
    731         # TODO: perhaps something more probable would be better, e.g. xdg-open
    732         browser = "konqueror"
     729        # even so we set to 'xdg-open' as a generic fallback
     730        browser = "xdg-open"
    733731
    734732    os.environ['GRASS_HTML_BROWSER'] = browser

  • grass/branches/releasebranch_7_6/lib/init/variables.html

    r73959 r74146  
    112112    the compression method for new raster maps can be set with the
    113113    environment variable GRASS_COMPRESSOR. Supported methods are RLE,
    114     ZLIB, LZ4, BZIP2, and ZSTD. The default is ZLIB which can be
    115     changed with e.g. <tt>GRASS_COMPRESSOR=ZSTD</tt></dd>
     114    ZLIB, LZ4, BZIP2, and ZSTD. The default is ZSTD if available,
     115    otherwise ZLIB, which can be changed with e.g.
     116    <tt>GRASS_COMPRESSOR=ZSTD</tt></dd>, granted that GRASS has been
     117    compiled with the requested compressor. Compressors that are always
     118    available are RLE, ZLIB, and LZ4. The compressors BZIP2 and ZSTD
     119    must be enabled when configuring GRASS for compilation.
    116120
    117121  <dt>GRASS_DB_ENCODING</dt>

  • grass/branches/releasebranch_7_6/mswindows/GRASS-Installer.nsi.tmpl

    r73959 r74146  
    3030!define BINARY_REVISION "1"
    3131!define VERSION_NUMBER "@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@"
    32 !define GRASS_BASE "GRASS GIS @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@"
     32!define GRASS_BASE "GRASS GIS @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@"
    3333!if ${INSTALLER_TYPE} == "Release"
    3434        !define GRASS_COMMAND "grass@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@"

  • grass/branches/releasebranch_7_6/mswindows/GRASS-Packager.bat.tmpl

    r73959 r74146  
    2424set MSYS_BLD_DIR=C:\msys%1\mingw%1
    2525
    26 set GRASS_PREFIX=%OSGEO4W_BLD_DIR%\apps\grass\grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
     26set GRASS_PREFIX=%OSGEO4W_BLD_DIR%\apps\grass\grass@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@
    2727
    2828@echo.

  • grass/branches/releasebranch_7_6/mswindows/Makefile

    r73959 r74146  
    1818        -e 's#@GRASS_VERSION_MAJOR@#$(GRASS_VERSION_MAJOR)#' \
    1919        -e 's#@GRASS_VERSION_MINOR@#$(GRASS_VERSION_MINOR)#' \
    20         -e 's#@GRASS_VERSION_RELEASE@#$(GRASS_VERSION_RELEASE)#' \
    2120        $< > $@
    2221

  • grass/branches/releasebranch_7_6/mswindows/osgeo4w/env.bat.tmpl

    r73959 r74146  
    33REM
    44
    5 set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass-@VERSION@
     5set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass@POSTFIX@
    66
    77REM Uncomment if you want to use Bash instead of Cmd

  • grass/branches/releasebranch_7_6/mswindows/osgeo4w/grass.bat.tmpl

    r73959 r74146  
    66rem #########################################################################
    77
    8 SET OSGEO4W_ROOT=@OSGEO4W_ROOT@
    9 
    108rem
    119rem Set environmental variables
    1210rem
    13 call %OSGEO4W_ROOT%\bin\o4w_env.bat
    14 call %OSGEO4W_ROOT%\apps\grass\grass-@VERSION@\etc\env.bat
     11call "%~dp0\o4w_env.bat"
     12call "%OSGEO4W_ROOT%\apps\grass\grass@POSTFIX@\etc\env.bat"
     13@echo off
    1514
    1615rem

  • grass/branches/releasebranch_7_6/mswindows/osgeo4w/package.sh

    r73959 r74146  
    8686read PATCH <&3
    8787
    88 export VERSION=$MAJOR.$MINOR.$PATCH
     88export VERSION=${MAJOR}.${MINOR}.${PATCH}
     89export POSTFIX=${MAJOR}${MINOR}
    8990
    9091if [[ "$PATCH" == *svn* ]] ; then
    … …  
    209210
    210211log prepare packaging
    211 mv $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h \
    212     $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h.mingw
    213 cp mswindows/osgeo4w/config.h.switch $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h
    214 cp mswindows/osgeo4w/config.h.vc $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass
     212mv $OSGEO4W_ROOT_MSYS/apps/grass/grass$POSTFIX/include/grass/config.h \
     213   $OSGEO4W_ROOT_MSYS/apps/grass/grass$POSTFIX/include/grass/config.h.mingw
     214cp mswindows/osgeo4w/config.h.switch $OSGEO4W_ROOT_MSYS/apps/grass/grass$POSTFIX/include/grass/config.h
     215cp mswindows/osgeo4w/config.h.vc $OSGEO4W_ROOT_MSYS/apps/grass/grass$POSTFIX/include/grass
    215216mkdir -p $OSGEO4W_ROOT_MSYS/etc/preremove $OSGEO4W_ROOT_MSYS/etc/postinstall
    216 sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT@#$OSGEO4W_ROOT#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
     217sed -e "s#@POSTFIX@#$POSTFIX#g" \
    217218    mswindows/osgeo4w/grass.bat.tmpl >$OSGEO4W_ROOT_MSYS/bin/${GRASS_EXECUTABLE}.bat
    218 sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT_MSYS@#$OSGEO4W_ROOT#g" \
    219     mswindows/osgeo4w/env.bat.tmpl >$OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/env.bat
    220 sed -e "s#@VERSION@#$VERSION#g" -e "s#@GRASS_EXECUTABLE@#$GRASS_EXECUTABLE#g" \
     219sed -e "s#@POSTFIX@#$POSTFIX#g" \
     220    mswindows/osgeo4w/env.bat.tmpl >$OSGEO4W_ROOT_MSYS/apps/grass/grass$POSTFIX/etc/env.bat
     221sed -e "s#@POSTFIX@#$POSTFIX#g" -e "s#@VERSION@#$VERSION#g" -e "s#@GRASS_EXECUTABLE@#$GRASS_EXECUTABLE#g" \
    221222    mswindows/osgeo4w/postinstall.bat >$OSGEO4W_ROOT_MSYS/etc/postinstall/grass${PACKAGE_POSTFIX}.bat
    222 sed -e "s#@VERSION@#$VERSION#g" -e "s#@GRASS_EXECUTABLE@#$GRASS_EXECUTABLE#g" \
     223sed -e "s#@POSTFIX@#$POSTFIX#g" -e "s#@VERSION@#$VERSION#g" -e "s#@GRASS_EXECUTABLE@#$GRASS_EXECUTABLE#g" \
    223224    mswindows/osgeo4w/preremove.bat >$OSGEO4W_ROOT_MSYS/etc/preremove/grass${PACKAGE_POSTFIX}.bat
    224225
    … …  
    226227    log building vc libraries
    227228    OSGEO4W_POSTFIX=$OSGEO4W_POSTFIX sh \
    228         mswindows/osgeo4w/mklibs.sh $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib/*.$VERSION.dll
    229     mv mswindows/osgeo4w/vc/grass*.lib $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib
     229        mswindows/osgeo4w/mklibs.sh $OSGEO4W_ROOT_MSYS/apps/grass/grass$POSTFIX/lib/*.${MAJOR}.${MINOR}.dll
     230    mv mswindows/osgeo4w/vc/grass*.lib $OSGEO4W_ROOT_MSYS/apps/grass/grass$POSTFIX/lib
    230231   
    231232    log creating package
    … …  
    237238
    238239    # update startup script
    239     sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT@#$OSGEO4W_ROOT#g" \
    240         -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
     240    sed -e "s#@POSTFIX@#$POSTFIX#g" \
    241241        $SRC/mswindows/osgeo4w/grass.bat.tmpl > bin/${GRASS_EXECUTABLE}.bat.tmpl
    242242   
    … …  
    267267        /mingw${MINGW_POSTFIX}/bin/zlib1.dll \
    268268        /mingw${MINGW_POSTFIX}/bin/libstdc++-6.dll \
    269         apps/grass/grass-$VERSION/bin
     269        apps/grass/grass$POSTFIX/bin
    270270    cp -uv /mingw${MINGW_POSTFIX}/etc/fonts/fonts.conf \
    271         apps/grass/grass-$VERSION/etc
     271        apps/grass/grass$POSTFIX/etc
    272272   
    273273    # creating grass package
    274274    tar -cjf $PDIR/grass$PACKAGE_POSTFIX-$VERSION-$PACKAGE_PATCH.tar.bz2 \
    275         apps/grass/grass-$VERSION \
     275        apps/grass/grass$POSTFIX \
    276276        bin/${GRASS_EXECUTABLE}.bat.tmpl \
    277277        etc/postinstall/grass${PACKAGE_POSTFIX}.bat \

  • grass/branches/releasebranch_7_6/mswindows/osgeo4w/postinstall.bat

    r73959 r74146  
    1 set ICON=%OSGEO4W_ROOT%\apps\grass\grass-@VERSION@\gui\icons\grass_osgeo.ico
     1set ICON=%OSGEO4W_ROOT%\apps\grass\grass@POSTFIX@\gui\icons\grass_osgeo.ico
    22set BATCH=%OSGEO4W_ROOT%\bin\@GRASS_EXECUTABLE@.bat
    33textreplace -std -t "%BATCH%"
    4 textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass-@VERSION@\etc\fontcap
     4textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass-@POSTFIX@\etc\fontcap
    55
    66xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@.lnk"       "%BATCH%"  "--gui" \ "Launch GRASS GIS @VERSION@" 1 "%ICON%"
    … …  
    1111
    1212rem set gisbase
    13 set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass-@VERSION@
     13set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass@POSTFIX@
    1414
    1515rem set path to freetype dll and its dependencies

  • grass/branches/releasebranch_7_6/mswindows/osgeo4w/preremove.bat

    r73959 r74146  
    33
    44del "%OSGEO4W_ROOT%\bin\@GRASS_EXECUTABLE@.bat"
    5 del "%OSGEO4W_ROOT%"\apps\grass\grass-@VERSION@\etc\fontcap
     5del "%OSGEO4W_ROOT%"\apps\grass\grass@POSTFIX@\etc\fontcap

  • grass/branches/releasebranch_7_6/raster/r.buildvrt/r.buildvrt.html

    r73959 r74146  
    1212the original raster maps which is only valid if the original raster
    1313maps remain in the originally indicated mapset. A VRT can also be built
    14 from raster maps registered with <em>r.external</em>.
     14from raster maps registered with <em><a href="r.external.html">r.external</a></em>.
    1515
    1616<p>
    … …  
    4040r.tile input=elev_state_50m output=elev_state_50m_tile_ width=1000 height=1000 overlap=0
    4141# dump list of tiles to a file
    42 g.list type=raster pattern=elev_state_50m_tile_* > tilelist
     42g.list type=raster pattern=elev_state_50m_tile_* output=tilelist
    4343# build a vrt
    4444r.buildvrt file=tilelist output=elev_state_50m_vrt
    … …  
    4949<em>
    5050<a href="r.tile.html">r.tile</a>,
    51 <a href="r.patch.html">r.patch</a>
     51<a href="r.patch.html">r.patch</a>,
     52<a href="r.external.html">r.external</a>
    5253</em>
    5354

  • grass/branches/releasebranch_7_6/raster/r.compress/main.c

    r73959 r74146  
    236236    int new, old, nrows, row;
    237237    void *rast;
     238    char *cname;
    238239
    239240    Rast_get_cellhd(name, G_mapset(), &cellhd);
     241    cname = getenv("GRASS_COMPRESSOR");
     242    if (cname && *cname) {
     243       if (G_compressor_number(cname) < 1)
     244           cname = G_compressor_name(G_default_compressor());
     245       else
     246           cname = G_compressor_name(G_compressor_number(cname));
     247    } else
     248           cname = G_compressor_name(G_default_compressor());
    240249
    241250    /* check if already compressed/decompressed */
    … …  
    253262            return 1;
    254263            */
    255             G_message(_("Re-compressing <%s>"), name);
     264            G_message(_("Re-compressing <%s> with method %s..."), name, cname);
    256265        }
    257266        else
    258             G_message(_("Compressing <%s>"), name);
     267            G_message(_("Compressing <%s> with method %s..."), name, cname);
    259268    }
    260269

  • grass/branches/releasebranch_7_6/raster/r.compress/r.compress.html

    r73959 r74146  
    77<p>
    88All raster maps (those imported for the first time and those newly
    9 generated) are compressed by default using the ZLIB compression
    10 method (see below). Related no data files (i.e.: NULL files), if
    11 present, are compressed by default unless a specific environment
    12 variable is set to explicitly disable NULL file compression
    13 (<tt>GRASS_COMPRESS_NULLS</tt>, see below).
     9generated) are compressed by default using the ZSTD compression
     10method if available, otherwise ZLIB compression is used (see below).
     11Related no data files (i.e.: NULL files), if present, are compressed by
     12default unless a specific environment variable is set to explicitly
     13disable NULL file compression (<tt>GRASS_COMPRESS_NULLS</tt>, see
     14below).
    1415
    1516<p>
    1617During compression or re-compression, <em>r.compress</em> compresses
    1718raster maps using the method specified by means of the environment
    18 variable <tt>GRASS_COMPRESSOR</tt>. The default compression method is  
    19 ZLIB's "deflate" algorithm (LZ77-based). Raster maps that contain very
    20 little information (such as boundary, geology, soils and land use maps)
    21 can be greatly reduced in size. Some raster maps are shrunk to roughly
    22 1% of their original sizes.
     19variable <tt>GRASS_COMPRESSOR</tt>. The default compression method is
     20ZSTD if available, otherwise ZLIB's "deflate" algorithm (LZ77-based).
     21Raster maps that contain very little information (such as boundary,
     22geology, soils and land use maps) can be greatly reduced in size. Some
     23raster maps are shrunk to roughly 1% of their original sizes.
    2324All newly generated raster maps are automatically stored as compressed
    2425data with varying methods depending on the raster format (i.e.,
    … …  
    102103<!-- keep in sync with raster/rasterintro.html -->
    103104
    104 All GRASS GIS raster map types are by default ZLIB compressed, i.e. using
    105 ZLIB's deflate algorithm. Through the environment variable
    106 <tt>GRASS_COMPRESSOR</tt> the compression method can be set to RLE, ZLIB,
    107 LZ4, BZIP2, or ZSTD.
     105All GRASS GIS raster map types are by default ZSTD compressed if
     106available, otherwise ZLIB compressed. Through the environment variable
     107<tt>GRASS_COMPRESSOR</tt> the compression method can be set to RLE,
     108ZLIB, LZ4, BZIP2, or ZSTD.
    108109<p>
    109110Integer (CELL type) raster maps can be compressed with RLE if
    … …  
    116117<!-- BTW, why not having an option "method" and another one "level"
    117118     instead of the environment variables? Is it too complicated?
     119     
     120     Where should these options "method" and "level" be available/
     121     exposed to the user? Surely not in every module creating a raster map.
    118122-->
    119123<dl>

  • grass/branches/releasebranch_7_6/raster/r.kappa/stats.c

    r73959 r74146  
    4747
    4848    sprintf(buf, "input=%s,%s",
    49             G_fully_qualified_name(maps[1], mmapset),
    50             G_fully_qualified_name(maps[0], rmapset));
     49            G_fully_qualified_name(mname, mmapset),
     50            G_fully_qualified_name(rname, rmapset));
    5151    argv[argc++] = buf;
    5252

  • grass/branches/releasebranch_7_6/raster/r.path/r.path.html

    r73959 r74146  
    197197<em>
    198198<a href="g.region.html">g.region</a>,
     199<a href="r.basins.fill.html">r.basins.fill</a>,
    199200<a href="r.cost.html">r.cost</a>,
     201<a href="r.fill.dir.html">r.fill.dir</a>,
     202<a href="r.mapcalc.html">r.mapcalc</a>,
     203<a href="r.recode.html">r.recode</a>,
     204<a href="r.terraflow.html">r.terraflow</a>,
    200205<a href="r.walk.html">r.walk</a>,
    201 <a href="r.watershed.html">r.watershed</a>,
    202 <a href="r.fill.dir.html">r.fill.dir</a>,
    203 <a href="r.basins.fill.html">r.basins.fill</a>,
    204 <a href="r.terraflow.html">r.terraflow</a>,
    205 <a href="r.mapcalc.html">r.mapcalc</a>,
     206<a href="r.watershed.html">r.watershed</a>
    206207</em>
    207208

  • grass/branches/releasebranch_7_6/raster/r.quantile/r.quantile.html

    r73959 r74146  
    2626<a href="r.mode.html">r.mode</a>,
    2727<a href="r.quant.html">r.quant</a>,
     28<a href="r.recode.html">r.recode</a>,
    2829<a href="r.series.html">r.series</a>,
    2930<a href="r.stats.html">r.stats</a>,

  • grass/branches/releasebranch_7_6/raster/r.reclass/r.reclass.html

    r73959 r74146  
    237237
    238238<em>
     239<a href="r.recode.html">r.recode</a>,
    239240<a href="r.resample.html">r.resample</a>,
    240 <a href="r.rescale.html">r.rescale</a>,
    241 <a href="r.recode.html">r.recode</a>
     241<a href="r.rescale.html">r.rescale</a>
    242242</em>
    243243

  • grass/branches/releasebranch_7_6/raster/r.recode/r.recode.html

    r73959 r74146  
    7373</pre></div>
    7474
     75<h2>SEE ALSO</h2>
     76
     77<em>
     78<a href="r.reclass.html">r.reclass</a>
     79</em>
    7580
    7681<h2>AUTHOR</h2>

  • grass/branches/releasebranch_7_6/raster/r.sim/r.sim.water/r.sim.water.html

    r73959 r74146  
    202202<li> Hofierka, J., Knutova, M., 2015,
    203203Simulating aspects of a flash flood using the Monte Carlo method and
    204 GRASS GIS: a case study of the Malá Svinka Basin (Slovakia),
     204GRASS GIS: a case study of the Mal&aacute; Svinka Basin (Slovakia),
    205205Open Geosciences. Volume 7, Issue 1, ISSN (Online) 2391-5447, DOI:
    206206<a href="http://dx.doi.org/10.1515/geo-2015-0013">10.1515/geo-2015-0013</a>,

  • grass/branches/releasebranch_7_6/raster/r.stats/r.stats.html

    r73959 r74146  
    8080<h2>EXAMPLES</h2>
    8181
     82<h3>Report area for each category</h3>
     83
    8284Report area for each category in the single raster map:
    8385
    8486<div class="code"><pre>
     87g.region raster=geology_30m
    8588r.stats -a in=geology_30m nv=no-data sep=tab
    8689
    … …  
    100103</pre></div>
    101104
     105<h3>Report sorted number of cells for each category</h3>
     106
    102107Report sorted number of cells for each category in the single raster
    103108map (suppress NULL data):
    104109
    105110<div class="code"><pre>
    106 r.stats -cn in=geology_30m sort=desc
     111g.region raster=geology_30m
     112r.stats -cn input=geology_30m sort=desc
    107113
    108114217 1799
    … …  
    120126</pre></div>
    121127
     128<h3>Report area, number of cells, and percents in multiple raster maps</h3>
     129
    122130Report area, number of cells, and percents (separated by tabs) for
    123 each category in the multiple raster maps (suppress NULL data):
     131each category in multiple raster maps (suppress NULL data):
    124132
    125133<div class="code"><pre>
    126 r.stats -nacp in=towns,urban sep=tab
     134g.region raster=towns
     135r.stats -nacp input=towns,urban separator=tab
    127136
    1281371       55      23840000.000000 596     11.89%
    … …  
    134143</pre></div>
    135144
     145<h3>Report sorted area intervals of floating-point raster map</h3>
     146
    136147Report sorted area for each interval of floating-point input raster
    137148map. Number of intervals are given by <b>nsteps</b> option.
    138149
    139150<div class="code"><pre>
    140 r.stats -an in=elevation nsteps=10 sort=desc sep=tab
     151g.region raster=elevation
     152r.stats -an input=elevation nsteps=10 sort=desc separator=tab
    141153
    14215495.879221-105.954329    36440000.000000
    … …  
    152164</pre></div>
    153165
     166<h3>Report raster cell counts in multiple raster maps</h3>
     167
     168Report raster cell counts of landuse and geological categories within
     169zipcode areas:
     170
     171<div class="code"><pre>
     172g.region raster=zipcodes
     173# landuse/landcover and zipcodes
     174r.stats -c input=landclass96,zipcodes separator=comma
     175
     176# landuse/landcover, geology and zipcodes with category labels
     177r.stats -c input=landclass96,zipcodes,geology_30m separator=comma -l
    154178<h2>SEE ALSO</h2>
    155179

  • grass/branches/releasebranch_7_6/raster/r.walk/r.walk.html

    r73959 r74146  
    171171<a href="r.in.ascii.html">r.in.ascii</a>,
    172172<a href="r.mapcalc.html">r.mapcalc</a>,
     173<a href="r.recode.html">r.recode</a>,
    173174<a href="r.out.ascii.html">r.out.ascii</a>
    174175</em>

  • grass/branches/releasebranch_7_6/raster/rasterintro.html

    r73959 r74146  
    280280<!-- keep in sync with raster/r.compress/r.compress.html -->
    281281
    282 All GRASS GIS raster map types are by default compressed. Through the
    283 environment variable <tt>GRASS_COMPRESSOR</tt> the compression method
    284 can be set to RLE, ZLIB, LZ4, BZIP2, or ZSTD.
     282All GRASS GIS raster map types are by default ZSTD compressed if
     283available, otherwise ZLIB compressed. Through the environment variable
     284<tt>GRASS_COMPRESSOR</tt> the compression method can be set to RLE,
     285ZLIB, LZ4, BZIP2, or ZSTD.
    285286<p>
    286287Important: the NULL file compression can be turned off with

  • grass/branches/releasebranch_7_6/scripts/i.pansharpen/i.pansharpen.html

    r73959 r74146  
    176176
    177177<em>
     178<a href="i.colors.enhance.html">i.colors.enhance</a>,
    178179<a href="i.his.rgb.html">i.his.rgb</a>,
    179180<a href="i.rgb.his.html">i.rgb.his</a>,

  • grass/branches/releasebranch_7_6/tools/mkhtml.py

    r73959 r74146  
    242242                in_h3 = False
    243243
     244        text = text.replace(u'\xa0', u' ')
    244245        fd.write('%s<li class="toc"><a href="#%s" class="toc">%s</a>' % \
    245246                     (' ' * indent, escape_href(text), text))

  • grass/branches/releasebranch_7_6/vector/v.external/dsn.c

    r73959 r74146  
    88{
    99    char *dsn;
    10 
    11     dsn = G_store(opt_dsn);
    12    
    13     return dsn;
    14 
    15     /* OGR dsn and GRASS db connections are independent of each other */
    1610
    1711    if (G_strncasecmp(opt_dsn, "PG:", 3) == 0) {

  • grass/branches/releasebranch_7_6/vector/v.external/main.c

    r73959 r74146  
    102102
    103103    dsn = NULL;
    104     /* disabling GRASS-PostGIS driver:
    105      *  TODO: a new fn that converts OGR dsn to PQ connection info,
    106      *   ignoring current GRASS db connection */
    107     use_ogr = TRUE;
    108104    if (options.dsn->answer)
    109         dsn = G_store(options.dsn->answer);
     105        dsn = get_datasource_name(options.dsn->answer, use_ogr);
    110106   
    111107    if (flags.list->answer || flags.tlist->answer) {

  • grass/branches/releasebranch_7_6/vector/v.in.ogr/main.c

    r73959 r74146  
    769769        for (layer = 0; layer < nlayers; layer++) {
    770770            Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]);
     771#if GDAL_VERSION_NUM >= 1110000
     772            if (param.geom->answer) {
     773                Ogr_featuredefn = OGR_L_GetLayerDefn(Ogr_layer);
     774                igeom = OGR_FD_GetGeomFieldIndex(Ogr_featuredefn, param.geom->answer);
     775                if (igeom < 0)
     776                    G_fatal_error(_("Geometry column <%s> not found in input layer <%s>"),
     777                                  param.geom->answer, OGR_L_GetName(Ogr_layer));
     778
     779                OGR_L_SetSpatialFilterEx(Ogr_layer, igeom, poSpatialFilter[layer]);
     780            }
     781            else {
     782                OGR_L_SetSpatialFilter(Ogr_layer, poSpatialFilter[layer]);
     783            }
     784#else
    771785            OGR_L_SetSpatialFilter(Ogr_layer, poSpatialFilter[layer]);
     786#endif
    772787            if (OGR_L_SetAttributeFilter(Ogr_layer, attr_filter) != OGRERR_NONE)
    773788                G_fatal_error(_("Error setting attribute filter '%s'"),
    … …  
    21802195            /* use OGR extents if possible, needed to skip corrupted data
    21812196             * in OGR dsn/layer */
     2197            /* BUT: OGR extents are unreliable,
     2198             * sometimes excluding valid features */
    21822199            have_ogr_extent[layer] = 1;
    21832200        }
    … …  
    22372254        int have_filter = 0;
    22382255
    2239         if (have_ogr_extent[layer]) {
     2256        /* OGR extents are unreliable,
     2257         * sometimes excluding valid features:
     2258         * disabled */
     2259        if (0 && have_ogr_extent[layer]) {
    22402260            if (*xmin <= *xmax && *ymin <= *ymax) {
    22412261                /* check for any overlap */

  • grass/branches/releasebranch_7_6/vector/v.lidar.edgedetection/v.lidar.edgedetection.html

    r73959 r74146  
    6969
    7070<div class="code"><pre>
     71# last return points
    7172v.lidar.edgedetection input=vector_last output=edge ew_step=8 ns_step=8 lambda_g=0.5
    7273</pre></div>

  • grass/branches/releasebranch_7_6/vector/v.out.lidar/main.c

    r73959 r74146  
    119119                      column, f_info->table);
    120120    if (ctype != DB_C_TYPE_INT && ctype != DB_C_TYPE_DOUBLE)
    121         G_fatal_error(_("Only numeric column type is supported"));
     121        G_fatal_error(_("Only numeric column type is supported (column <%s> in table <%s>)"),
     122                      column, f_info->table);
    122123    if (ctype == DB_C_TYPE_DOUBLE)
    123         G_warning(_("Double values will be converted to integers"));
     124        G_warning(_("Double values will be converted to integers (column <%s> in table <%s>)"),
     125                      column, f_info->table);
    124126
    125127    db_CatValArray_init(column_values);
Note: See TracChangeset for help on using the changeset viewer.