[prev in list] [next in list] [prev in thread] [next in thread]
List: gpsd-commit-watch
Subject: [Gpsd-commit-watch] r4032 - trunk
From: esr at BerliOS <esr () mail ! berlios ! de>
Date: 2006-11-30 17:27:33
Message-ID: 200611301727.kAUHRXa3008177 () sheep ! berlios ! de
[Download RAW message or body]
Author: esr
Date: 2006-11-30 18:27:33 +0100 (Thu, 30 Nov 2006)
New Revision: 4032
Added:
trunk/regress-builder
Modified:
trunk/driver_proto.c
trunk/drivers.c
trunk/gpsd.h
trunk/italk.c
trunk/rtcm.c
trunk/rtcmdecode.c
Log:
Check in regress-builder, after having used it to detect some minor build
problems created by the last big refactoring patch.
Modified: trunk/driver_proto.c
===================================================================
--- trunk/driver_proto.c 2006-11-30 08:22:45 UTC (rev 4031)
+++ trunk/driver_proto.c 2006-11-30 17:27:33 UTC (rev 4032)
@@ -182,7 +182,7 @@
.configurator = configurator,
#endif /* ALLOW_RECONFIGURE */
/* Packet getter (using default routine) */
- .get_packet = packet_get,
+ .get_packet = generic_get,
/* Parse message packets */
.parse_packet = parse_input,
/* RTCM handler (using default routine) */
Modified: trunk/drivers.c
===================================================================
--- trunk/drivers.c 2006-11-30 08:22:45 UTC (rev 4031)
+++ trunk/drivers.c 2006-11-30 17:27:33 UTC (rev 4032)
@@ -689,7 +689,7 @@
gpsd_report(LOG_RAW, "sleep(1)\n");
(void)sleep(1);
} else if (generic_get(session) >= 0) {
- if((session->packet.type == NMEA_PACKET)&&(session->packet_state == \
NMEA_RECOGNIZED)) + if((session->packet.type == \
NMEA_PACKET)&&(session->packet.state == NMEA_RECOGNIZED)) {
gpsd_report(LOG_RAW, "tnt_packet_sniff returns \
%d\n",session->packet.type); return session->packet.type;
Modified: trunk/gpsd.h
===================================================================
--- trunk/gpsd.h 2006-11-30 08:22:45 UTC (rev 4031)
+++ trunk/gpsd.h 2006-11-30 17:27:33 UTC (rev 4032)
@@ -346,12 +346,12 @@
extern unsigned int isgps_parity(isgps30bits_t);
extern enum isgpsstat_t rtcm_decode(struct gps_packet_t *,
- struct rtcm_t *,
+ /*@out@*/struct rtcm_t *,
unsigned int);
extern void rtcm_dump(struct rtcm_t *, /*@out@*/char[], size_t);
extern int rtcm_undump(/*@out@*/struct rtcm_t *, char *);
extern void rtcm_unpack(/*@out@*/struct rtcm_t *, char *);
-extern bool rtcm_repack(struct rtcm_t *, char *);
+extern bool rtcm_repack(struct rtcm_t *, isgps30bits_t *);
extern void ecef_to_wgs84fix(struct gps_data_t *,
double, double, double,
Modified: trunk/italk.c
===================================================================
--- trunk/italk.c 2006-11-30 08:22:45 UTC (rev 4031)
+++ trunk/italk.c 2006-11-30 17:27:33 UTC (rev 4032)
@@ -132,7 +132,7 @@
#ifdef ALLOW_RECONFIGURE
.configurator = italk_configurator,/* configure the device */
#endif /* ALLOW_RECONFIGURE */
- .get_packet = packet_get, /* use generic packet grabber */
+ .get_packet = generic_get, /* use generic packet grabber */
.parse_packet = italk_parse_input,/* parse message packets */
.rtcm_writer = pass_rtcm, /* send RTCM data straight */
.speed_switcher = italk_speed, /* we can change baud rates */
Added: trunk/regress-builder
===================================================================
--- trunk/regress-builder 2006-11-30 08:22:45 UTC (rev 4031)
+++ trunk/regress-builder 2006-11-30 17:27:33 UTC (rev 4032)
@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# Test-compile gpsd with each of every possible combination of device-driver
+# options, excluding stub drivers we don't support yet. This does a good
+# job of catching bugs after driver API changes.
+
+mv regress-builder.log regress-builder.log.old
+cp /dev/null regress-builder.log
+
+for a in enable disable ; do
+for b in enable disable ; do
+for c in enable disable ; do
+for d in enable disable ; do
+for e in enable disable ; do
+for f in enable disable ; do
+for g in enable disable ; do
+for h in enable disable ; do
+for i in enable disable ; do
+for j in enable disable ; do
+for k in enable disable ; do
+for l in enable disable ; do
+
+echo -n "`date` " >> regress-builder.log
+
+make -i distclean 2>&1 > /dev/null
+env X_LIBS="" \
+ CPPFLAGS="-I/usr/local/include " \
+ LDFLAGS=" -L/usr/local/lib -g" \
+ CFLAGS="-g -O2 -W -Wall" \
+./configure --prefix=/home/gpsd --disable-shared \
+ --without-x --enable-python \
+ --disable-itrax \
+ --disable-italk \
+ --${a}-sirf \
+ --${b}-nmea \
+ --${c}-tsip \
+ --${d}-fv18 \
+ --${e}-tripmate \
+ --${f}-earthmate \
+ --${g}-garmin \
+ --${h}-tnt \
+ --${i}-evermore \
+ --${j}-rtcm104 \
+ --${k}-ntrip \
+ --${l}-raw 2>&1 > /dev/null
+
+if [ $? -ne 0 ] ; then
+ echo "configure FAILED: " >> regress-builder.log
+
+else
+ make 2>&1 > /dev/null
+
+ if [ $? -ne 0 ] ; then
+ echo -n "build FAILED: " >> regress-builder.log
+ else
+ echo -n "build OK: " >> regress-builder.log
+ fi
+fi
+echo ${a}-sirf ${b}-nmea ${c}-tsip ${d}-fv18 ${e}-tripmate ${f}-earthmate \
${g}-garmin ${h}-tnt ${i}-evermore ${j}-rtcm104 ${k}-ntrip ${l}-raw >> \
regress-builder.log +
+done
+done
+done
+done
+done
+done
+done
+done
+done
+done
+done
+done
Property changes on: trunk/regress-builder
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/rtcm.c
===================================================================
--- trunk/rtcm.c 2006-11-30 08:22:45 UTC (rev 4031)
+++ trunk/rtcm.c 2006-11-30 17:27:33 UTC (rev 4032)
@@ -226,7 +226,7 @@
}
}
-bool rtcm_repack(struct rtcm_t *tp, char *buf)
+bool rtcm_repack(struct rtcm_t *tp, isgps30bits_t *buf)
/* repack the content fields into the raw bits */
{
int len, sval;
@@ -439,7 +439,7 @@
}
enum isgpsstat_t rtcm_decode(struct gps_packet_t *session,
- struct rtcm_t *rtcm,
+ /*@out@*/struct rtcm_t *rtcm,
unsigned int c)
{
enum isgpsstat_t res = isgps_decode(session,
Modified: trunk/rtcmdecode.c
===================================================================
--- trunk/rtcmdecode.c 2006-11-30 08:22:45 UTC (rev 4031)
+++ trunk/rtcmdecode.c 2006-11-30 17:27:33 UTC (rev 4032)
@@ -77,7 +77,7 @@
if (status == 0) {
(void)memset(session.packet.isgps.buf, 0, sizeof(session.packet.isgps.buf));
- (void)rtcm_repack(&session.gpsdata.rtcm, (char *)session.packet.isgps.buf);
+ (void)rtcm_repack(&session.gpsdata.rtcm, session.packet.isgps.buf);
(void)rtcm_unpack(&session.gpsdata.rtcm, (char *)session.packet.isgps.buf);
(void)rtcm_dump(&session.gpsdata.rtcm, buf, sizeof(buf));
(void)fputs(buf, fpout);
@@ -105,7 +105,7 @@
if (status == 0) {
(void)memset(session.packet.isgps.buf, 0, sizeof(session.packet.isgps.buf));
- (void)rtcm_repack(&session.gpsdata.rtcm, (char *)session.packet.isgps.buf);
+ (void)rtcm_repack(&session.gpsdata.rtcm, session.packet.isgps.buf);
(void)fwrite(session.packet.isgps.buf,
sizeof(isgps30bits_t),
(size_t)session.gpsdata.rtcm.length, fpout);
_______________________________________________
Gpsd-commit-watch mailing list
Gpsd-commit-watch@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/gpsd-commit-watch
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic