MXE update

* code changes for update to mxe suite

scripts/builddist.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+#===============================================================================
+# linux binaries no longer created
+#===============================================================================
+
+#-------------------------------------------------------------------------------
+# make the mxe-mingw32 executable
+#-------------------------------------------------------------------------------
+
+autoreconf
+
+rm -f fldigi*$1*
+
+make clean
+
+./configure \
+  $PKGCFG \
+  $CROSSCFG \
+  --without-asciidoc \
+  --with-ptw32=$PREFIX/i686-w64-mingw32.static \
+  --with-libiconv-prefix=$PREFIX/iconv \
+  --enable-static \
+  --with-libintl-prefix=$PREFIX/gettext \
+  PTW32_LIBS="-lpthread -lpcreposix -lpcre -lregex" \
+  FLTK_CONFIG=$PREFIX/bin/i686-w64-mingw32.static-fltk-config \
+
+make
+
+$PREFIX/bin/i686-w64-mingw32.static-strip src/fldigi.exe
+$PREFIX/bin/i686-w64-mingw32.static-strip src/flarq.exe
+
+make nsisinst
+
+mv src/*setup.exe .
+ls -l *setup.exe
+
+make clean
+
+#-------------------------------------------------------------------------------
+# build the distribution tarball
+#-------------------------------------------------------------------------------
+
+./configure --without-asciidoc
+
+make distcheck
+
+make clean
+
+git co po/de.po
+git co po/es.po
+git co po/fr.po
+git co po/it.po
+git co po/pl.po
+git co po/nl.po
+git co po/fldigi.pot
+git co src/dialogs/guide.cxx

scripts/buildmxe.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+#=======================================================================
+# make the mxe-mingw32 executable
+
+./configure \
+  $PKGCFG \
+  $CROSSCFG \
+  --without-asciidoc \
+  --with-ptw32=$PREFIX/i686-w64-mingw32.static \
+  --with-libiconv-prefix=$PREFIX/iconv \
+  --enable-static \
+  --with-libintl-prefix=$PREFIX/gettext \
+  PTW32_LIBS="-lpthread -lpcreposix -lpcre -lregex" \
+  FLTK_CONFIG=$PREFIX/bin/i686-w64-mingw32.static-fltk-config \
+
+make
+
+$PREFIX/bin/i686-w64-mingw32.static-strip src/fldigi.exe
+$PREFIX/bin/i686-w64-mingw32.static-strip src/flarq.exe
+
+make nsisinst
+
+mv src/*setup.exe .
+ls -l *setup.exe

scripts/mknsisinst.sh

@@ -42,11 +42,11 @@ if test "x$WANT_FLDIGI" != "xyes" && test "x$WANT_FLARQ" != "xyes"; then
     exit 1
 fi
 if test "x$WANT_FLDIGI" = "xyes"; then
-    test "x$NOSTRIP" = "x" && $STRIP -S "$fldigi_bin"
+#    test "x$NOSTRIP" = "x" && $STRIP -S "$fldigi_bin"
     def="$def -DHAVE_FLDIGI -DFLDIGI_NAME=$fldigi_name -DFLDIGI_BINARY=$fldigi_bin -DFLDIGI_VERSION=$PACKAGE_VERSION"
 fi
 if test "x$WANT_FLARQ" = "xyes"; then
-    test "x$NOSTRIP" = "x" && $STRIP -S "$flarq_bin"
+#    test "x$NOSTRIP" = "x" && $STRIP -S "$flarq_bin"
     def="$def -DHAVE_FLARQ -DFLARQ_NAME=$flarq_name -DFLARQ_BINARY=$flarq_bin -DFLARQ_VERSION=$FLARQ_VERSION"
 fi
 

src/Makefile.am

@@ -759,9 +759,12 @@ flarq_SOURCES += \
 
 # Additional files that we distribute
 EXTRA_DIST = \
+    $(srcdir)/../build-aux/config.rpath \
 	$(srcdir)/../scripts/mkappbundle.sh \
 	$(srcdir)/../scripts/mkhamlibstatic.sh \
 	$(srcdir)/../scripts/mknsisinst.sh \
+	$(srcdir)/../scripts/buildmxe.sh \
+	$(srcdir)/../scripts/builddist.sh \
 	$(srcdir)/../scripts/tests/cr.sh \
 	$(srcdir)/../scripts/tests/config-h.sh \
 	$(srcdir)/../data/fldigi-psk.png \
@@ -775,6 +778,7 @@ EXTRA_DIST = \
 	$(srcdir)/../data/mac/Info.plist.in \
 	$(srcdir)/../data/mac/fldigi.icns \
 	$(srcdir)/../data/win32/fldigi.ico \
+	$(srcdir)/../data/win32/fldigi.nsi \
 	$(srcdir)/../data/flarq.desktop \
 	$(srcdir)/../data/flarq.xpm \
 	$(srcdir)/../data/mac/flarq.icns \

src/include/dxcc.h

@@ -24,6 +24,8 @@
 #define DXCC_H_
 
 #include <vector>
+#include <string>
+#include <iostream>
 
 struct dxcc {
 	const char* country;
@@ -35,6 +37,15 @@ struct dxcc {
 	float gmt_offset;
 	dxcc(const char* cn = "", int cq = 0, int itu = 0, const char* ct = "",
 	     float lat = 0.0f, float lon = 0.0f, float tz = 0.0f);
+	void print() {
+std::cout << country << ", "
+		  << cq_zone << ", " 
+		  << itu_zone << ", " 
+		  << continent << ", "
+		  << latitude << ", "
+		  << longitude << ", " 
+		  << gmt_offset << "\n";
+	  }
 };
 
 enum qsl_t { QSL_LOTW, QSL_EQSL, QSL_END };

src/include/socket.h

@@ -35,6 +35,7 @@
 #  include <netinet/in.h>
 #else
 #  include <winsock2.h>
+#  include <windows.h>
 #endif
 
 #include <string>

src/include/threads.h

@@ -29,10 +29,14 @@
 #include <stdint.h>
 
 #include <semaphore.h>
+#ifndef WIN32
 #if !HAVE_SEM_TIMEDWAIT
 #  include <time.h>
 int sem_timedwait(sem_t* sem, const struct timespec* abs_timeout);
 #endif
+#else
+#include <time.h>
+#endif
 
 int sem_timedwait_rel(sem_t* sem, double rel_timeout);
 int pthread_cond_timedwait_rel(pthread_cond_t* cond, pthread_mutex_t* mutex, double rel_timeout);

src/include/timeops.h

@@ -26,11 +26,12 @@
 #include <sys/time.h>
 #ifdef __MINGW32__
 #  include <pthread.h>
-#endif
-
-#if !HAVE_CLOCK_GETTIME
+//#endif
+#else
+#  if !HAVE_CLOCK_GETTIME
 enum clockid_t { CLOCK_REALTIME, CLOCK_MONOTONIC };
 int clock_gettime(clockid_t clock_id, struct timespec* tp);
+#  endif
 #endif
 
 struct timespec operator+(const struct timespec &t0, const double &t);

src/logbook/lookupcall.cxx

@@ -1188,7 +1188,7 @@ static void *EQSL_loop(void *args)
 			return NULL;
 
 		size_t p;
-		if (fetch_http(EQSL_url, EQSL_xmlpage, 5.0) == -1)
+		if (fetch_http(EQSL_url, EQSL_xmlpage, 5.0) == false)
 			LOG_ERROR("%s", "eQSL not available");
 
 		else if ((p = EQSL_xmlpage.find("Error:")) != std::string::npos) {

src/logbook/table.cxx

@@ -1654,9 +1654,9 @@ void Table::calcDimensions() {
   hideV = (tableHeight <= iH),
   hideH = (tableWidth <= iW);
 
-  if (!hideH & hideV)
+  if (!hideH && hideV)
     hideV = (tableHeight - iH - scrollbarSize) <= 0;
-  if (!hideV & hideH)
+  if (!hideV && hideH)
     hideH = (tableWidth - iW + scrollbarSize) <= 0;
 
   if (Vscroll == always) {

src/misc/dxcc.cxx

@@ -85,9 +85,16 @@ bool dxcc_open(const char* filename)
 
 	cmap = new dxcc_map_t;
 	cnames = new vector<string>;
-	cnames->reserve(345); // approximate number of dxcc entities
+
+// this MUST be greater than the actual number of dcxx entities or
+// the Windows gcc string library will move all of the strings and
+// destroy the integrity of the cmap c_str() pointer to the country
+// string in cnames
+
+	cnames->reserve(500); // approximate number of dxcc entities
+	
 	clist = new dxcc_list_t;
-	clist->reserve(345);
+	clist->reserve(500);
 
 	dxcc* entry;
 	string record;
@@ -175,9 +182,9 @@ const dxcc* dxcc_lookup(const char* callsign)
 	// first look for a full callsign (prefixed with '=')
 	sstr[0] = '=';
 	dxcc_map_t::const_iterator entry = cmap->find(sstr);
-	if (entry != cmap->end())
+	if (entry != cmap->end()) {
 		return entry->second;
-
+}
 	// erase the '=' and do a longest prefix search
 	sstr.erase(0, 1);
 	size_t len = sstr.length();
@@ -192,8 +199,9 @@ const dxcc* dxcc_lookup(const char* callsign)
 	}
 	do {
 		sstr.resize(len--);
-		if ((entry = cmap->find(sstr)) != cmap->end())
+		if ((entry = cmap->find(sstr)) != cmap->end()) {
 			return entry->second;
+		}
 	} while (len);
 
 	return NULL;

src/rigcontrol/xmlrpc_rig.cxx

@@ -819,6 +819,7 @@ void flrig_connection()
 		bool ret;
 		{
 			guard_lock flrig_lock(&mutex_flrig);
+//LOG_WARN("%s", "checking flrig listMethods");
 			ret = flrig_client->execute("system.listMethods", noArgs, result, timeout);
 		}
 //		if (flrig_client->execute("system.listMethods", noArgs, result, timeout)) {
@@ -833,10 +834,13 @@ void flrig_connection()
 			flrig_get_xcvr();
 			Fl::awake(flrig_setQSY);
 		} else {
+//LOG_WARN("%s", "not able to connect");
 			connected_to_flrig = false;
 			poll_interval = 1000;//500;
 		}
-	} catch (...) {}
+	} catch (...) {
+//LOG_WARN("%s", "failure in flrig_client");
+	}
 }
 
 void connect_to_flrig()
@@ -847,6 +851,9 @@ void connect_to_flrig()
 		flrig_client = (XmlRpcClient *)0;
 	}
 	try {
+//LOG_WARN("creating flrig client %s, %d",
+//	progdefaults.flrig_ip_address.c_str(),
+//	atol(progdefaults.flrig_ip_port.c_str()));
 		flrig_client = new XmlRpcClient(
 				progdefaults.flrig_ip_address.c_str(),
 				atol(progdefaults.flrig_ip_port.c_str()));

src/spot/pskrep.cxx

@@ -418,9 +418,10 @@ void pskrep::append(string call, const char* loc, long long freq, trx_mode mode,
 	band_map_t& bandq = queue[call][band(freq)];
 	if (bandq.empty() || rtime - bandq.back().rtime >= DUP_INTERVAL) { // add new
 		bandq.push_back(rcpt_report_t(mode, freq, rtime, rtype, loc));
-		LOG_VERBOSE("Added (call=\"%s\", loc=\"%s\", mode=\"%s\", freq=%d, time=%" PRIdMAX ", type=%u)",
+		LOG_VERBOSE("Added (call=\"%s\", loc=\"%s\", mode=\"%s\", freq=%d, time=%d, type=%u)",
 			 call.c_str(), loc, mode_info[mode].adif_name,
-			 static_cast<int>(freq), (intmax_t)rtime, rtype);
+			 static_cast<int>(freq), 
+			 static_cast<int>(rtime), rtype);
 		new_count++;
 		save_queue();
 	}

src/xmlrpcpp/XmlRpcSocket.cpp

@@ -59,7 +59,7 @@ static void initialize()
 
 #if defined(_WINDOWS)
     {
-        WORD wVersionRequested = MAKEWORD( WSA_MAJOR, WSA_MINOR );
+        WORD wVersionRequested = MAKEWORD( 2, 0 );
         WSADATA wsaData;
         WSAStartup(wVersionRequested, &wsaData);
        	atexit((void(*)(void)) WSACleanup);