Release candidate (GPSBabel#602)

* prep for release 1.7.0.

* update reference files for release.

* use windows resource compiler scripts for CLI and GUI.

These rc scripts are used to set the icon the OS sees and to supply
version information that is shown by windows explorer.

* correct file permissions.

* update rc copyright

CMakeLists.txt

@@ -227,6 +227,7 @@ if(WIN32)
   set(HEADERS ${HEADERS} gbser_win.h)
   set(JEEPS ${JEEPS} jeeps/gpsusbwin.cc)
   set(LIBS ${LIBS} setupapi)
+  set(RC_FILE win32/gpsbabel.rc)
 endif()
 
 if(MSVC)

GPSBabel.pro

@@ -210,6 +210,7 @@ win32 {
   HEADERS += gbser_win.h
   JEEPS += jeeps/gpsusbwin.cc
   LIBS += "-lsetupapi" 
+  RC_FILE = win32/gpsbabel.rc
 }
 
 win32-msvc* {

Makefile.in

@@ -501,7 +501,8 @@ f90g_track.o: f90g_track.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
   src/core/optional.h
 fatal.o: fatal.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-  inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
+  inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
+  src/core/logging.h
 filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
   src/core/optional.h filter_vecs.h arcdist.h filter.h bend.h discard.h \
@@ -882,9 +883,9 @@ navilink.o: navilink.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
 navitel.o: navitel.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
   jeeps/gpsmath.h jeeps/gpsport.h
-netstumbler.o: netstumbler.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-  formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-  src/core/optional.h cet_util.h csv_util.h
+netstumbler.o: netstumbler.cc cet_util.h defs.h config.h zlib/zlib.h \
+  zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
+  src/core/datetime.h src/core/optional.h csv_util.h
 nmea.o: nmea.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
   nmea.h format.h cet_util.h gbser.h jeeps/gpsmath.h jeeps/gpsport.h \

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GPSBabel 1.6.0.
+# Generated by GNU Autoconf 2.69 for GPSBabel 1.7.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GPSBabel'
 PACKAGE_TARNAME='gpsbabel'
-PACKAGE_VERSION='1.6.0'
-PACKAGE_STRING='GPSBabel 1.6.0'
+PACKAGE_VERSION='1.7.0'
+PACKAGE_STRING='GPSBabel 1.7.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1293,7 +1293,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GPSBabel 1.6.0 to adapt to many kinds of systems.
+\`configure' configures GPSBabel 1.7.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1360,7 +1360,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GPSBabel 1.6.0:";;
+     short | recursive ) echo "Configuration of GPSBabel 1.7.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1459,7 +1459,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GPSBabel configure 1.6.0
+GPSBabel configure 1.7.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1862,7 +1862,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GPSBabel $as_me 1.6.0, which was
+It was created by GPSBabel $as_me 1.7.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2210,15 +2210,15 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-DOCVERSION=1.6.0
+DOCVERSION=1.7.0
 
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-DOCVERSION=development
+#DOCVERSION=development
 
 
 # Increase GBBUILD for a new release (why? Where is this ever used?)
 # A: it's used by win32/gpsbabel.rc.in which is used by the setup program,
-GBBUILD=30
+GBBUILD=31
 # PACKAGE_RELEASE="-beta20190413"
 
 cat >>confdefs.h <<_ACEOF
@@ -6549,7 +6549,7 @@ as_dir=zlib/contrib/minizip; as_fn_mkdir_p
 as_dir=testo.d; as_fn_mkdir_p
 as_dir=mac/libusb; as_fn_mkdir_p
 
-ac_config_files="$ac_config_files Makefile gbversion.h gui/setup.iss xmldoc/makedoc win32/gpsbabel.rc"
+ac_config_files="$ac_config_files Makefile gbversion.h gui/setup.iss xmldoc/makedoc"
 
 ac_config_files="$ac_config_files tools/mkcapabilities"
 
@@ -7060,7 +7060,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GPSBabel $as_me 1.6.0, which was
+This file was extended by GPSBabel $as_me 1.7.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7122,7 +7122,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GPSBabel config.status 1.6.0
+GPSBabel config.status 1.7.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7250,7 +7250,6 @@ do
     "gbversion.h") CONFIG_FILES="$CONFIG_FILES gbversion.h" ;;
     "gui/setup.iss") CONFIG_FILES="$CONFIG_FILES gui/setup.iss" ;;
     "xmldoc/makedoc") CONFIG_FILES="$CONFIG_FILES xmldoc/makedoc" ;;
-    "win32/gpsbabel.rc") CONFIG_FILES="$CONFIG_FILES win32/gpsbabel.rc" ;;
     "tools/mkcapabilities") CONFIG_FILES="$CONFIG_FILES tools/mkcapabilities" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

configure.ac

@@ -4,16 +4,16 @@
 AC_PREREQ([2.59])
 
 #PACKAGE_RELEASE=
-AC_INIT([GPSBabel], [1.6.0])
-DOCVERSION=1.6.0
+AC_INIT([GPSBabel], [1.7.0])
+DOCVERSION=1.7.0
 
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-DOCVERSION=development
+#DOCVERSION=development
 
 
 # Increase GBBUILD for a new release (why? Where is this ever used?)
 # A: it's used by win32/gpsbabel.rc.in which is used by the setup program,
-GBBUILD=30
+GBBUILD=31
 # PACKAGE_RELEASE="-beta20190413"
 AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.])
 AC_SUBST(PACKAGE_RELEASE)
@@ -369,6 +369,6 @@ AS_MKDIR_P([zlib/contrib/minizip])
 AS_MKDIR_P([testo.d])
 AS_MKDIR_P([mac/libusb])
 
-AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc win32/gpsbabel.rc])
+AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc])
 AC_CONFIG_FILES([tools/mkcapabilities], [chmod +x tools/mkcapabilities])
 AC_OUTPUT

gbversion.h

@@ -4,5 +4,14 @@
  *
  * Isn't simplification via automation grand?
  */
-#define VERSION "1.6.0"
-#define WEB_DOC_DIR "https://www.gpsbabel.org/htmldoc-development"
+#ifdef RC_INVOKED
+// These defines are for the Microsoft resource compiler scripts
+// win32/gpsbabel.rc and gui/app.rc
+#define VER_FILE 1,7,0,31
+#define VER_PRODUCT 1,7,0,31
+#define VER_FILE_STR "1.7.0"
+#define VER_PRODUCT_STR  "1.7.0"
+#else
+#define VERSION "1.7.0"
+#define WEB_DOC_DIR "https://www.gpsbabel.org/htmldoc-1.7.0"
+#endif

gbversion.h.in

@@ -4,5 +4,14 @@
  *
  * Isn't simplification via automation grand?
  */
+#ifdef RC_INVOKED
+// These defines are for the Microsoft resource compiler scripts
+// win32/gpsbabel.rc and gui/app.rc
+#define VER_FILE @GBMAJOR@,@GBMINOR@,@GBMICRO@,@GBBUILD@
+#define VER_PRODUCT @GBMAJOR@,@GBMINOR@,@GBMICRO@,@GBBUILD@
+#define VER_FILE_STR "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@"
+#define VER_PRODUCT_STR  "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@"
+#else
 #define VERSION "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@"
 #define WEB_DOC_DIR "https://www.gpsbabel.org/htmldoc-@DOCVERSION@"
+#endif

gui/app.rc

@@ -1 +1,38 @@
-IDI_ICON1	ICON	DISCARDABLE "images/appicon.ico"
+#include <winver.h>
+#include "../gbversion.h"
+
+IDI_ICON1               ICON                    "images/appicon.ico"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION VER_FILE
+ PRODUCTVERSION VER_PRODUCT
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "GPSBabel Team"
+            VALUE "FileDescription", "GPS format converter"
+            VALUE "FileVersion", VER_FILE_STR
+            VALUE "InternalName", "GPSBabelFE.exe"
+            VALUE "LegalCopyright", L"\x00a9 2002-2020 Robert Lipe"
+            VALUE "OriginalFilename", "GPSBabelFE.exe"
+            VALUE "ProductName", "GPSBabel"
+            VALUE "ProductVersion", VER_PRODUCT_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+/* End of Version info */

gui/coretool/core_strings.h

@@ -100,6 +100,7 @@ QT_TRANSLATE_NOOP("core","Time-frame (in seconds)")
 QT_TRANSLATE_NOOP("core","Locate waypoint for tagging by this name")
 QT_TRANSLATE_NOOP("core","!OVERWRITE! the original file. Default=N")
 QT_TRANSLATE_NOOP("core","Embedded Exif-GPS data (.jpg)")
+QT_TRANSLATE_NOOP("core","Time zone ID")
 QT_TRANSLATE_NOOP("core","Energympro GPS training watch")
 QT_TRANSLATE_NOOP("core","Enigma binary waypoint file (.ert)")
 QT_TRANSLATE_NOOP("core","Source for name field in .dbf")
@@ -109,6 +110,7 @@ QT_TRANSLATE_NOOP("core","F90G Automobile DVR GPS log file")
 QT_TRANSLATE_NOOP("core","(integer sec or 'auto') Barograph to GPS time diff")
 QT_TRANSLATE_NOOP("core","FAI/IGC Flight Recorder Data Format")
 QT_TRANSLATE_NOOP("core","Read all points even if latitude or longitude is missing")
+QT_TRANSLATE_NOOP("core","Attempt to recovery data from corrupt file")
 QT_TRANSLATE_NOOP("core","Flexible and Interoperable Data Transfer (FIT) Activity file")
 QT_TRANSLATE_NOOP("core","Max synthesized shortname length")
 QT_TRANSLATE_NOOP("core","Allow whitespace synth. shortnames")
@@ -151,15 +153,9 @@ QT_TRANSLATE_NOOP("core","Default category on output (1..16)")
 QT_TRANSLATE_NOOP("core","Bitmap of categories")
 QT_TRANSLATE_NOOP("core","Version of gdb file to generate (1..3)")
 QT_TRANSLATE_NOOP("core","Drop route points that do not have an equivalent waypoint (hidden points)")
+QT_TRANSLATE_NOOP("core","Don't create waypoints for non-user points")
 QT_TRANSLATE_NOOP("core","Include major turn points (with description) from calculated route")
 QT_TRANSLATE_NOOP("core","Garmin MapSource - gdb")
-QT_TRANSLATE_NOOP("core","Length of generated shortnames")
-QT_TRANSLATE_NOOP("core","Allow whitespace synth. shortnames")
-QT_TRANSLATE_NOOP("core","Version of mapsource file to generate (3,4,5)")
-QT_TRANSLATE_NOOP("core","Merge output with existing file")
-QT_TRANSLATE_NOOP("core","Use depth values on output (default is ignore)")
-QT_TRANSLATE_NOOP("core","Use proximity values on output (default is ignore)")
-QT_TRANSLATE_NOOP("core","Garmin MapSource - mps")
 QT_TRANSLATE_NOOP("core","Read/Write date format (i.e. yyyy/mm/dd)")
 QT_TRANSLATE_NOOP("core","GPS datum (def. WGS 84)")
 QT_TRANSLATE_NOOP("core","Distance unit [m=metric, s=statute]")
@@ -235,6 +231,7 @@ QT_TRANSLATE_NOOP("core","list tracks")
 QT_TRANSLATE_NOOP("core","get track")
 QT_TRANSLATE_NOOP("core","Dump raw data to this file")
 QT_TRANSLATE_NOOP("core","Dump raw data to this file")
+QT_TRANSLATE_NOOP("core","Time zone ID")
 QT_TRANSLATE_NOOP("core","GlobalSat GH625XT GPS training watch")
 QT_TRANSLATE_NOOP("core","Google Directions XML")
 QT_TRANSLATE_NOOP("core","Default icon name")
@@ -369,7 +366,6 @@ QT_TRANSLATE_NOOP("core","Basename prepended to URL on output")
 QT_TRANSLATE_NOOP("core","Use shortname instead of description")
 QT_TRANSLATE_NOOP("core","GPS datum (def. WGS 84)")
 QT_TRANSLATE_NOOP("core","Kompass (DAV) Waypoints (.wp)")
-QT_TRANSLATE_NOOP("core","KuDaTa PsiTrex text")
 QT_TRANSLATE_NOOP("core","(USR input) Ignore event marker icons on read")
 QT_TRANSLATE_NOOP("core","(USR output) Treat waypoints as icons on write")
 QT_TRANSLATE_NOOP("core","(USR output) Merge into one segmented trail")
@@ -568,6 +564,7 @@ QT_TRANSLATE_NOOP("core","OziExplorer")
 QT_TRANSLATE_NOOP("core","PocketFMS breadcrumbs")
 QT_TRANSLATE_NOOP("core","PocketFMS flightplan (.xml)")
 QT_TRANSLATE_NOOP("core","PocketFMS waypoints (.txt)")
+QT_TRANSLATE_NOOP("core","Qstarz BL-1000")
 QT_TRANSLATE_NOOP("core","Default location")
 QT_TRANSLATE_NOOP("core","Raymarine Waypoint File (.rwf)")
 QT_TRANSLATE_NOOP("core","Max synthesized shortname length")
@@ -605,9 +602,9 @@ QT_TRANSLATE_NOOP("core","Last sector to be read from the file (-1: read till em
 QT_TRANSLATE_NOOP("core","Seconds that GPS time tracks UTC (0: best guess)")
 QT_TRANSLATE_NOOP("core","GPS week rollover period we're in (-1: best guess)")
 QT_TRANSLATE_NOOP("core","SkyTraq Venus based loggers Binary File Format")
-QT_TRANSLATE_NOOP("core","Video position for which exact GPS time is known (hhmmss, default is 0:00:00)")
-QT_TRANSLATE_NOOP("core","GPS time at position video_time (hhmmss, default is first timestamp of track)")
-QT_TRANSLATE_NOOP("core","GPS date at position video_time (hhmmss, default is first timestamp of track)")
+QT_TRANSLATE_NOOP("core","Video position for which exact GPS time is known (hhmmss[.sss], default is 00:00:00,000)")
+QT_TRANSLATE_NOOP("core","GPS time at position video_time (hhmmss[.sss], default is first timestamp of track)")
+QT_TRANSLATE_NOOP("core","GPS date at position video_time (yyyymmdd, default is first timestamp of track)")
 QT_TRANSLATE_NOOP("core","Format for subtitles")
 QT_TRANSLATE_NOOP("core","SubRip subtitles for video mapping (.srt)")
 QT_TRANSLATE_NOOP("core","Index of route (if more than one in source)")