Re: Upcoming changes in CVS

[Ladislav Michl]

On Mon, Dec 09, 2002 at 09:59:07AM +0100, Pawel Kot wrote:
> On Mon, 9 Dec 2002, Jan Derfinak wrote:
> 
> > On Fri, 6 Dec 2002, Pawel Kot wrote:
> >
> > > The changes will cover mainly the libgnokii changes. The user applications
> > > will become broken and will not compile. It applies to: gnokii, gnokiid,
> > > xgnokii, smsd. DO NOT COMPLAIN that CVS does not compile. I KNOW.
> >
> > Is there any translation table or sed script?
> 
> Translation table or sed script doing the conversion from the old API to
> the new API? No.

cvs now compiles (and works for AT phones) again if you apply crappy patch
bellow and are not going to compile xgnokii. allthough i did my best, there
are still some unconverted pieces in gnokii (grep for FIXAPI)

pkot: now it indeed looks better, though API is still not consistent. we can
talk about it after someone get gnokii into useable state.

        ladis

Index: Makefile
===================================================================
RCS file: /cvsroot/gnokii/gnokii/Makefile,v
retrieving revision 1.119
diff -u -r1.119 Makefile
--- Makefile    28 Aug 2002 15:53:11 -0000      1.119
+++ Makefile    12 Dec 2002 15:30:11 -0000
@@ -18,13 +18,12 @@
 BIN_DIRS = gnokii
 
 ifndef WIN32
-BIN_DIRS += gnokiid utils
+BIN_DIRS += utils
 endif
 
 DIRS =  common/phones \
        common/links \
        common/devices \
-       common/data \
        po \
        common \
        $(BIN_DIRS)
Index: common/gsm-api.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/gsm-api.c,v
retrieving revision 1.54
diff -u -r1.54 gsm-api.c
--- common/gsm-api.c    10 Dec 2002 12:59:34 -0000      1.54
+++ common/gsm-api.c    12 Dec 2002 15:30:11 -0000
@@ -46,11 +46,11 @@
 #include "gsm-api.h"
 #include "data/rlp-common.h"
 #include "gsm-statemachine.h"
-#include "phones/nk6510.h"
-#include "phones/nk7110.h"
-#include "phones/nk6100.h"
-#include "phones/nk3110.h"
-#include "phones/nk2110.h"
+//#include "phones/nk6510.h"
+//#include "phones/nk7110.h"
+//#include "phones/nk6100.h"
+//#include "phones/nk3110.h"
+//#include "phones/nk2110.h"
 
 
 #if defined(WIN32) && defined(_USRDLL)
@@ -134,9 +134,9 @@
        memset(&sm->link.port_device, 0, sizeof(sm->link.port_device));
        strncpy(sm->link.port_device, device, sizeof(sm->link.port_device) - 1);
 
-       REGISTER_DRIVER(nokia_7110, NULL);
-       REGISTER_DRIVER(nokia_6510, NULL);
-       REGISTER_DRIVER(nokia_6100, NULL);
+//     REGISTER_DRIVER(nokia_7110, NULL);
+//     REGISTER_DRIVER(nokia_6510, NULL);
+//     REGISTER_DRIVER(nokia_6100, NULL);
 #if 0
        REGISTER_DRIVER(nokia_3110, NULL);
 #ifndef WIN32
@@ -144,9 +144,9 @@
        REGISTER_DRIVER(dancall_2711, NULL);
 #endif
 #endif
-       REGISTER_DRIVER(fake, NULL);
+//     REGISTER_DRIVER(fake, NULL);
        REGISTER_DRIVER(at, model);
-       REGISTER_DRIVER(nokia_6160, NULL);
+//     REGISTER_DRIVER(nokia_6160, NULL);
 
        return GN_ERR_UNKNOWNMODEL;
 }
Index: common/phones/Makefile
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/phones/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- common/phones/Makefile      25 Nov 2002 22:09:42 -0000      1.15
+++ common/phones/Makefile      12 Dec 2002 15:30:11 -0000
@@ -20,18 +20,12 @@
 OBJS = generic.o \
        nokia.o \
        nk7110.o \
-       nk6510.o \
-       nk6100.o \
        atgen.o \
        atbosch.o \
        ateric.o \
        atnok.o \
        atsie.o \
-       fake.o \
-       nk6160.o
-
-#      nk3110.o \
-#      nk2110.o \
+       fake.o 
 
 all: PHONES.o
 
Index: gnokiid/Makefile
===================================================================
RCS file: /cvsroot/gnokii/gnokii/gnokiid/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- gnokiid/Makefile    19 Nov 2002 00:07:27 -0000      1.13
+++ gnokiid/Makefile    12 Dec 2002 15:30:11 -0000
@@ -21,8 +21,8 @@
 
 all: gnokiid
 
-gnokiid: $(OBJS) $(TOPDIR)/common/data/DATA.o $(TOPDIR)/common/$(GNOKII_LIB)
-       $(CC) $(LDFLAGS) $(OBJS) $(TOPDIR)/common/data/DATA.o $(LDLIBS) -o $@
+gnokiid: $(OBJS) $(TOPDIR)/common/$(GNOKII_LIB)
+       $(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
 
 clean:
        $(RM) $(OBJS) *~ depend gnokiid *.exe core *.bak