Browse Source

Bump version. Roll back non-working https changes. Deal with annoying Windows issues for release build.

tags/gpsbabel_1_5_4
Robert Lipe 3 years ago
parent
commit
269c55eb58
8 changed files with 31 additions and 22 deletions
  1. 2
    1
      GPSBabel.pro
  2. 10
    10
      configure
  3. 2
    2
      configure.in
  4. 2
    2
      gbversion.h
  5. 1
    1
      gui/mainwindow.cc
  6. 2
    2
      gui/setup.iss
  7. 3
    4
      gui/upgrade.cc
  8. 9
    0
      mtk_logger.cc

+ 2
- 1
GPSBabel.pro View File

@@ -3,6 +3,7 @@ QT -= gui
TARGET = GPSBabel
CONFIG += console
CONFIG -= app_bundle
CONFIG += c++11

TEMPLATE = app

@@ -29,7 +30,7 @@ ALL_FMTS=$$MINIMAL_FMTS gtm.cc gpsutil.cc pcx.cc \
vpl.cc teletype.cc jogmap.cc bushnell.cc bushnell_trl.cc wintec_tes.cc \
subrip.cc garmin_xt.cc garmin_fit.cc lowranceusr4.cc \
mtk_locus.cc googledir.cc mapbar_track.cc mapfactor.cc f90g_track.cc \
energympro.cc mynav.cc ggv_bin.cc globalsat_sport.cc
energympro.cc mynav.cc ggv_bin.cc globalsat_sport.cc geojson.cc

DEPRECIATED_FMTS=cetus.cc copilot.cc gpspilot.cc magnav.cc psp.cc gcdb.cc quovadis.cc gpilots.cc geoniche.cc palmdoc.cc hsa_ndv.cc coastexp.cc pathaway.cc coto.cc msroute.cc mag_pdb.cc axim_gpb.cc delbin.cc google.cc


+ 10
- 10
configure View File

@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.3.
# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.4.
#
# Report bugs to <BUG-REPORT-ADDRESS>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GPSBabel'
PACKAGE_TARNAME='gpsbabel'
PACKAGE_VERSION='1.5.3'
PACKAGE_STRING='GPSBabel 1.5.3'
PACKAGE_VERSION='1.5.4'
PACKAGE_STRING='GPSBabel 1.5.4'
PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS'
PACKAGE_URL=''

@@ -1286,7 +1286,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.5.3 to adapt to many kinds of systems.
\`configure' configures GPSBabel 1.5.4 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1352,7 +1352,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of GPSBabel 1.5.3:";;
short | recursive ) echo "Configuration of GPSBabel 1.5.4:";;
esac
cat <<\_ACEOF

@@ -1452,7 +1452,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
GPSBabel configure 1.5.3
GPSBabel configure 1.5.4
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1859,7 +1859,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.5.3, which was
It was created by GPSBabel $as_me 1.5.4, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
@@ -2207,7 +2207,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu


DOCVERSION=1.5.3
DOCVERSION=1.5.4

# YYYYMMDD, please, if beta, i.e. "-beta20060413"
#DOCVERSION=development
@@ -6013,7 +6013,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.5.3, which was
This file was extended by GPSBabel $as_me 1.5.4, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -6075,7 +6075,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.5.3
GPSBabel config.status 1.5.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"


+ 2
- 2
configure.in View File

@@ -4,8 +4,8 @@
AC_PREREQ(2.59)

#PACKAGE_RELEASE=
AC_INIT(GPSBabel, 1.5.3, BUG-REPORT-ADDRESS)
DOCVERSION=1.5.3
AC_INIT(GPSBabel, 1.5.4, BUG-REPORT-ADDRESS)
DOCVERSION=1.5.4

# YYYYMMDD, please, if beta, i.e. "-beta20060413"
#DOCVERSION=development

+ 2
- 2
gbversion.h View File

@@ -4,5 +4,5 @@
*
* Isn't simplification via automation grand?
*/
#define VERSION "1.5.3"
#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.5.3"
#define VERSION "1.5.4"
#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.5.4"

+ 1
- 1
gui/mainwindow.cc View File

@@ -1029,7 +1029,7 @@ void MainWindow::closeActionX()

QDateTime now = QDateTime::currentDateTime();
if ((babelData_.runCount_ == 1) ||
(babelData_.runCount_ > 5) && (babelData_.donateSplashed_.daysTo(now) > 30)) {
((babelData_.runCount_ > 5) && (babelData_.donateSplashed_.daysTo(now) > 30))) {
Donate donate(0);
if (babelData_.donateSplashed_.date() == QDate(2010,1,1))
donate.showNever(false);

+ 2
- 2
gui/setup.iss View File

@@ -16,7 +16,7 @@
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017}
AppName=GPSBabel
AppVerName=GPSBabel 1.5.3
AppVerName=GPSBabel 1.5.4
AppPublisher=GPSBabel
AppPublisherURL=http://www.gpsbabel.org
AppSupportURL=http://www.gpsbabel.org
@@ -24,7 +24,7 @@ AppUpdatesURL=http://www.gpsbabel.org
DefaultDirName={pf}\GPSBabel
DefaultGroupName=GPSBabel
OutputDir=release
OutputBaseFilename=GPSBabel-1.5.3-Setup
OutputBaseFilename=GPSBabel-1.5.4-Setup
SetupIconFile=images\babel2.ico
Compression=lzma
SolidCompression=yes

+ 3
- 4
gui/upgrade.cc View File

@@ -57,7 +57,7 @@ UpgradeCheck::UpgradeCheck(QWidget *parent, QList<Format> &formatList,
QObject(parent),
manager_(0),
replyId_(0),
upgradeUrl_(QUrl("https://www.gpsbabel.org/upgrade_check.html")),
upgradeUrl_(QUrl("http://www.gpsbabel.org/upgrade_check.html")),
formatList_(formatList),
updateStatus_(updateUnknown),
babelData_(bd)
@@ -134,7 +134,7 @@ QString UpgradeCheck::getOsVersion()
case QSysInfo::WV_6_1: return "7"; break;
case QSysInfo::WV_6_2: return "8"; break;
case QSysInfo::WV_6_3: return "8.1"; break;
case QSysInfo::WV_10_0: return "10"; break;
// case QSysInfo::WV_10_0: return "10"; break;
default:
if (QSysInfo::WindowsVersion == 0x00a0) return "8";
if (QSysInfo::WindowsVersion == 0x00b0) return "8.1";
@@ -212,7 +212,6 @@ UpgradeCheck::updateStatus UpgradeCheck::checkForUpgrade(
}

replyId_ = manager_->post(request, args.toUtf8());

return UpgradeCheck::updateUnknown;
}
@@ -314,7 +313,7 @@ void UpgradeCheck::httpRequestFinished(QNetworkReply* reply)
QDomElement upgrade = upgradeNode.toElement();
QString updateVersion = upgrade.attribute("version");
if (upgrade.attribute("downloadURL").isEmpty()) {
downloadUrl = "https://www.gpsbabel.org/download.html";
downloadUrl = "http://www.gpsbabel.org/download.html";
} else {
downloadUrl = upgrade.attribute("downloadURL");
}

+ 9
- 0
mtk_logger.cc View File

@@ -61,6 +61,11 @@
#include <errno.h>
#include <math.h>
#include <stdlib.h>
#if __WIN32__
#include <io.h>
#else
#include <unistd.h>
#endif

#define MYNAME "mtk_logger"

@@ -765,7 +770,11 @@ mtk_retry:
}
}
if (dout != NULL) {
#if __WIN32__
_chsize(fileno(dout), addr_max);
#else
ftruncate(fileno(dout), addr_max);
#endif
fclose(dout);
}
if (global_opts.verbose_status || (global_opts.debug_level >= 2 && global_opts.debug_level < 5)) {

Loading…
Cancel
Save