Skip to content
Commits on Source (7)
Show whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ 4ac43779
#
# $Id: CMakeLists.txt 18037 2017-04-25 04:04:41Z pwessel $
# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify
......
README
View file @ 4ac43779
$Id: README 18132 2017-05-05 03:05:46Z pwessel $
$Id: README 19521 2017-12-27 22:38:24Z pwessel $
== Information for installing GMT 5 ==
......@@ -98,9 +98,7 @@ SOEST, U. of Hawaii ftp.soest.hawaii.edu
Lab for Satellite Altimetry, NOAA ibis.grdl.noaa.gov
IRIS, Washington, US ftp.iris.washington.edu
IAG-USP, U. of Sao Paulo, BRAZIL ftp.iag.usp.br
Dep. Geology, U. in Oslo, NORWAY ftp.geologi.uio.no
ISV, Hokkaido U, Sapporo, JAPAN ftp.eos.hokudai.ac.jp
GDS, Vienna U. of Technology, AUSTRIA gd.tuwien.ac.at
TENET, Tertiary Education & Research Networks, SOUTH AFRICA
gmt.mirror.ac.za
......
README.CMake
View file @ 4ac43779
////
$Id: README.CMake 18132 2017-05-05 03:05:46Z pwessel $
$Id: README.CMake 19521 2017-12-27 22:38:24Z pwessel $
Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis
Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis
and F. Wobbe. See LICENSE.TXT file for copying and redistribution conditions.
Contact info: http://gmt.soest.hawaii.edu/
......
cmake/ConfigDefault.cmake
View file @ 4ac43779
#
# $Id: ConfigDefault.cmake 18461 2017-06-25 01:18:55Z pwessel $
# $Id: ConfigDefault.cmake 19529 2017-12-28 08:30:55Z pwessel $
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify
......@@ -37,18 +37,18 @@ set (GMT_PACKAGE_DESCRIPTION_SUMMARY "The Generic Mapping Tools")
# GMT_VERSION_YEAR is set to current date in
# cmake/modules/ConfigCMake.cmake if not specified here:
set (GMT_VERSION_YEAR "2017")
set (GMT_VERSION_YEAR "2018")
# The GMT package version.
set (GMT_PACKAGE_VERSION_MAJOR 5)
set (GMT_PACKAGE_VERSION_MINOR 4)
set (GMT_PACKAGE_VERSION_PATCH 2)
set (GMT_PACKAGE_VERSION_PATCH 3)
# The subversion revision of the GMT source code.
# This is manually set when making GMT *public* releases.
# However, when making internal releases or just an ordinary developer build, leave it
# empty; if it is empty, the revision number is automatically populated for you on build.
set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "18461")
set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "19528")
#set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "")
# The GMT package version.
......
cmake/ConfigUserTemplate.cmake
View file @ 4ac43779
#
# $Id: ConfigUserTemplate.cmake 18366 2017-06-12 01:57:16Z pwessel $
# $Id: ConfigUserTemplate.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify it
......
cmake/dist/CMakeLists.txt
View file @ 4ac43779
#
# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify
......
cmake/modules/CopyDirIfDifferent.cmake
View file @ 4ac43779
#
# $Id: CopyDirIfDifferent.cmake 17451 2017-01-16 21:36:06Z pwessel $
# $Id: CopyDirIfDifferent.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify
......
cmake/modules/CreateDebugSym.cmake
View file @ 4ac43779
#
# $Id: CreateDebugSym.cmake 17451 2017-01-16 21:36:06Z pwessel $
# $Id: CreateDebugSym.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
# - Generates Mac .dSYM bundle
# CREATE_DEBUG_SYM ( DESTINATION TARGETS )
......@@ -7,7 +7,7 @@
# DESTINATION - destination directory for installed targets
# TARGETS - list of targets
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify
......
cmake/modules/GmtGenExtraHeaders.cmake
View file @ 4ac43779
#
# $Id: GmtGenExtraHeaders.cmake 18101 2017-05-01 07:09:55Z pwessel $
# $Id: GmtGenExtraHeaders.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
# - Generates extra header files
# GMT_CREATE_HEADERS ()
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify
......
cmake/modules/GmtHelperMacros.cmake
View file @ 4ac43779
#
# $Id: GmtHelperMacros.cmake 17451 2017-01-16 21:36:06Z pwessel $
# $Id: GmtHelperMacros.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
# - Useful CMake macros
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify
......
cmake/modules/ManageString.cmake
View file @ 4ac43779
#
# $Id: ManageString.cmake 17451 2017-01-16 21:36:06Z pwessel $
# $Id: ManageString.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
# - Collection of String utility macros.
# Defines the following macros:
......@@ -78,7 +78,7 @@
# + PADDING: (Optional) apply padding at the location by the marker
# string PADDING
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify
......
debian/changelog
View file @ 4ac43779
gmt (5.4.3+dfsg-1) unstable; urgency=medium
* New upstream release.
* Update copyright years for copyright holders.
* Update symbols for 5.4.3.
* Bump Standards-Version to 4.1.3, no changes.
-- Bas Couwenberg <sebastic@debian.org> Wed, 03 Jan 2018 08:06:26 +0100
gmt (5.4.2+dfsg-2) unstable; urgency=medium
* Change priority from extra to optional.
......
debian/control
View file @ 4ac43779
......@@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 9.20160114),
docbook-xsl,
docbook-xml,
xsltproc
Standards-Version: 4.1.2
Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gmt.git
Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gmt.git
Homepage: http://gmt.soest.hawaii.edu/
......
debian/copyright
View file @ 4ac43779
......@@ -32,9 +32,12 @@ Files-Excluded: src/triangle.c
man_release/*
Files: *
Copyright: 1991-2017, P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
1991-2017, T. Henstock
2016-2017, Dongdong Tian
Copyright: 1991-2018, P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
1991-2018, T. Henstock
2004-2018, Michael Chandler
2009-2018, David Sandwell
2013-2018, the GMT project
2016-2018, Dongdong Tian
1996-2012, G. Patau
License: LGPL-3+
......
debian/libgmt5.symbols
View file @ 4ac43779
......@@ -576,6 +576,7 @@ libgmt.so.5 libgmt5 #MINVER#
gmt_is_a_blank_line@Base 5.3.1
gmt_is_agc_grid@Base 5.3.1
gmt_is_ascii_record@Base 5.3.1
gmt_is_cpt_master@Base 5.4.3
gmt_is_esri_grid@Base 5.3.1
gmt_is_gdal_grid@Base 5.3.1
gmt_is_mgg2_grid@Base 5.3.1
......@@ -775,6 +776,7 @@ libgmt.so.5 libgmt5 #MINVER#
gmt_scanf_arg@Base 5.3.1
gmt_segmentize_data@Base 5.3.1
gmt_segmentize_syntax@Base 5.3.1
gmt_set_R_from_grd@Base 5.4.3
gmt_set_V@Base 5.4.0
gmt_set_cartesian@Base 5.3.1
gmt_set_cols@Base 5.3.1
......@@ -932,6 +934,7 @@ libgmt.so.5 libgmt5 #MINVER#
gmtinit_backwards_SQ_parsing@Base 5.3.1
gmtinit_conf@Base 5.4.0
gmtinit_conf_US@Base 5.4.0
gmtinit_parse_n_option@Base 5.4.3
gmtinit_update_keys@Base 5.4.0
gmtio_ascii_textinput@Base 5.3.1
gmtlib_akima@Base 5.3.1
......
doc/CMakeLists.txt
View file @ 4ac43779
#
# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify
......
doc/examples/CMakeLists.txt
View file @ 4ac43779
#
# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
# This program is free software; you can redistribute it and/or modify
......
doc/examples/animate.in
View file @ 4ac43779
#!/bin/bash
#
# $Id: animate.in 13990 2015-01-26 18:00:58Z pwessel $
# $Id: animate.in 18471 2017-06-26 23:37:11Z pwessel $
#
# Bash script for creating videos of the animation examples.
# The videos will optionally be included in the RST gallery.
......@@ -72,11 +72,16 @@ exec_dir="@CMAKE_CURRENT_BINARY_DIR@/${script_dir}"
rm -rf "$exec_dir"
mkdir -p "$exec_dir"
cd "$exec_dir"
GLOBIGNORE="*.bat:*.ps:*.sh"
for file in "$src"/* ; do
# The GLOBIGNORE is not working for Paul on OSX - unknown why.
# Until this can be solved I have replaced it with an egrep.
#GLOBIGNORE="*.bat:*.ps:*.sh"
#for file in "$src"/* ; do
# test -f "$file" && ln -s "$file" .
#done
#unset GLOBIGNORE
for file in `ls "$src"/* | egrep -v '.bat$|.ps$|.sh$'` ; do
test -f "$file" && ln -s "$file" .
done
unset GLOBIGNORE
# Start with proper GMT defaults
gmt set -Du FORMAT_TIME_STAMP "Version 5"
......
doc/examples/ex14/example_14.ps
View file @ 4ac43779
%!PS-Adobe-3.0
%%BoundingBox: 0 0 612 792
%%HiResBoundingBox: 0 0 612 792
%%Title: GMT v5.4.0_r17581M [64-bit] Document from psxy
%%Title: GMT v5.4.3_r18644M [64-bit] Document from psxy
%%Creator: GMT5
%%For: pwessel
%%For: unknown
%%DocumentNeededResources: font Helvetica
%%CreationDate: Thu Feb 23 10:53:19 2017
%%CreationDate: Wed Jul 26 15:59:13 2017
%%LanguageLevel: 2
%%DocumentData: Clean7Bit
%%Orientation: Portrait
......@@ -674,6 +674,7 @@ clipsave
3672 0 D
0 3780 D
-3672 0 D
P
PSL_clip N
4 W
V
......@@ -1013,6 +1014,7 @@ clipsave
3672 0 D
0 3780 D
-3672 0 D
P
PSL_clip N
4 W
V
......@@ -1512,6 +1514,7 @@ clipsave
3672 0 D
0 3780 D
-3672 0 D
P
PSL_clip N
/PSL_setboxpen {4 W 0 A [] 0 B} def
/PSL_setboxrgb {1 A} def
......@@ -1938,6 +1941,7 @@ PSL_path_pen 15 get cvx exec
S
PSL_cliprestore
U
[] 0 B
PSL_cliprestore
25 W
2 setlinecap
......@@ -2054,6 +2058,7 @@ clipsave
3672 0 D
0 3780 D
-3672 0 D
P
PSL_clip N
4 W
V
......@@ -2118,6 +2123,7 @@ clipsave
3672 0 D
0 3780 D
-3672 0 D
P
PSL_clip N
/PSL_setboxpen {4 W 0 A [] 0 B} def
/PSL_setboxrgb {1 A} def
......@@ -2521,6 +2527,7 @@ PSL_path_pen 11 get cvx exec
S
PSL_cliprestore
U
[] 0 B
PSL_cliprestore
25 W
2 setlinecap
......@@ -2644,12 +2651,12 @@ O0
3.32551 setmiterlimit
17 W
0 1253 M
151 -67 D
151 -61 D
76 -28 D
151 -50 D
303 -90 D
151 -48 D
151 -64 D
151 -60 D
152 -54 D
75 -25 D
378 -117 D
76 -24 D
151 -56 D
76 -33 D
226 -110 D
......@@ -2687,11 +2694,11 @@ O0
227 34 D
75 12 D
152 31 D
226 53 D
227 59 D
151 42 D
152 47 D
226 76 D
151 35 D
227 58 D
226 65 D
227 70 D
151 49 D
S
25 W
2 setlinecap
......@@ -2830,10 +2837,10 @@ O0
8 W
[67 33] 0 B
0 1552 M
76 -53 D
226 -165 D
454 -319 D
151 -103 D
227 -157 D
302 -215 D
227 -164 D
151 -104 D
76 -48 D
75 -44 D
152 -81 D
......@@ -2862,8 +2869,8 @@ O0
226 11 D
152 4 D
226 -1 D
303 -2 D
227 1 D
378 -2 D
152 1 D
226 5 D
S
[] 0 B
......
doc/examples/ex19/example_19.bat
View file @ 4ac43779
REM GMT EXAMPLE 19
REM
REM $Id: example_19.bat 16792 2016-07-13 21:12:21Z pwessel $
REM $Id: example_19.bat 18857 2017-09-06 01:07:34Z pwessel $
REM
REM Purpose: Illustrates various color pattern effects for maps
REM GMT progs: grdimage, grdmath, makecpt, pscoast, pstext, psimage
......@@ -19,9 +19,9 @@ gmt pscoast -R -J -O -K -Dc -A5000 -Gc >> %ps%
gmt grdimage lon.nc -J -Clon.cpt -O -K -nl >> %ps%
gmt pscoast -R -J -O -K -Q >> %ps%
gmt pscoast -R -J -O -K -Dc -A5000 -Wthinnest >> %ps%
echo 0 20 14TH INTERNATIONAL | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
echo 0 20 15TH INTERNATIONAL | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
echo 0 -10 GMT CONFERENCE | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
echo 0 -30 Honolulu, Hawaii, April 1, 2017 | gmt pstext -R -J -O -K -F+f18p,Helvetica-Bold,green=thinnest >> %ps%
echo 0 -30 Honolulu, Hawaii, April 1, 2018 | gmt pstext -R -J -O -K -F+f18p,Helvetica-Bold,green=thinnest >> %ps%
REM Then show example of color patterns and placing a PostScript image
......@@ -37,9 +37,9 @@ gmt pscoast -R -J -O -K -Dc -A5000 -Gc >> %ps%
gmt grdimage lat.nc -J -Clat.cpt -O -K -nl >> %ps%
gmt pscoast -R -J -O -K -Q >> %ps%
gmt pscoast -R -J -O -K -Dc -A5000 -Wthinnest >> %ps%
echo 0 20 14TH INTERNATIONAL | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
echo 0 20 15TH INTERNATIONAL | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
echo 0 -10 GMT CONFERENCE | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
echo 0 -30 Honolulu, Hawaii, April 1, 2017 | gmt pstext -R -J -O -F+f18p,Helvetica-Bold,green=thinnest >> %ps%
echo 0 -30 Honolulu, Hawaii, April 1, 2018 | gmt pstext -R -J -O -F+f18p,Helvetica-Bold,green=thinnest >> %ps%
del l*.nc
del l*.cpt
......