# HG changeset patch # User A.M. Thurnherr # Date 1458231962 14400 # Node ID abeaad5308bac0cc4753a463c37d08c7197ad10c # Parent cfee523c44324f0037ac5e365b05e94b2531f752 V6.5 diff --git a/HISTORY b/HISTORY --- a/HISTORY +++ b/HISTORY @@ -1,9 +1,9 @@ #====================================================================== # H I S T O R Y # doc: Thu May 7 13:12:05 2015 -# dlm: Thu Mar 17 07:48:16 2016 +# dlm: Thu Mar 17 12:24:52 2016 # (c) 2015 A.M. Thurnherr -# uE-Info: 51 37 NIL 0 0 72 0 2 4 NIL ofnI +# uE-Info: 54 15 NIL 0 0 72 0 2 4 NIL ofnI #====================================================================== May 7, 2015: @@ -48,6 +48,9 @@ - adapted [libGMT.pl] to gmt5 => [libGMT4.pl] Mar 17, 2016: - - published for LADCP_w V1.2beta5 + - published V6.4 for LADCP_w V1.2beta5 + - V6.5 [ants.pl] [.hg/hgrc] + - improved [libGMT.pl] to check for gmt5 + - published diff --git a/ants.pl b/ants.pl --- a/ants.pl +++ b/ants.pl @@ -2,9 +2,9 @@ #====================================================================== # A N T S . P L # doc: Fri Jun 19 14:01:06 1998 -# dlm: Wed Mar 16 14:08:12 2016 +# dlm: Thu Mar 17 12:02:55 2016 # (c) 1998 A.M. Thurnherr -# uE-Info: 20 56 NIL 0 0 72 2 2 4 NIL ofnI +# uE-Info: 26 21 NIL 0 0 72 2 2 4 NIL ofnI #====================================================================== # HISTORY: @@ -18,11 +18,12 @@ # Oct 12, 2015: - updated to V6.2 (for LADCP_w 1.0) # Mar 8, 2016: - updated to V6.3 (for LADCP_w 1.2beta) # Mar 16, 2016: - updated to V6.4 (for LADCP_w 1.2beta5) +# Mar 17, 2016: - updated to V6.5 exec($ENV{ANTS_PERL},$0,@ARGV),die("$ENV{ANTS_PERL}: $!") if (defined($ENV{ANTS_PERL}) && $^X ne $ENV{ANTS_PERL}); -$antsLibVersion = 6.4; +$antsLibVersion = 6.5; die(sprintf("$0: obsolete library V%.1f; V%.1f required\n", $antsLibVersion,$antsMinLibVersion)) diff --git a/libGMT.pl b/libGMT.pl --- a/libGMT.pl +++ b/libGMT.pl @@ -1,9 +1,9 @@ #====================================================================== # L I B G M T . P L # doc: Sun Jun 14 13:45:47 2015 -# dlm: Wed Mar 16 16:12:38 2016 +# dlm: Thu Mar 17 12:19:42 2016 # (c) 2015 A.M. Thurnherr -# uE-Info: 188 49 NIL 0 0 72 2 2 4 NIL ofnI +# uE-Info: 45 48 NIL 0 0 72 2 2 4 NIL ofnI #====================================================================== # perl implementation of /Data/Makefiles/Makefile.GMT @@ -41,11 +41,24 @@ # Jul 26, 2015: - added usage documentation # - simplified GMT_unitcoords() # Jul 28, 2015: - added GMT_setAnnotFontSize(), GMT_psscale() -# Mar 16, 2016: - began adaptation to GMT5 +# Mar 16, 2016: - adapted to GMT5 +# Mar 17, 2016: - added check for gmt5 on load $DEBUG = 0; #---------------------------------------------------------------------- +# Make sure gmt5 is installed +#---------------------------------------------------------------------- + +if (`which gmt` eq '') { + if (`which psxy` eq '') { + croak("$0: [libGMT.pl] gmt5 required, please install\n"); + } else { + croak("$0: [libGMT.pl] gmt5 required (gmt4 installed on the system), please upgrade\n"); + } +} + +#---------------------------------------------------------------------- # Library #----------------------------------------------------------------------