Merge pull request #1532 from bluca/retire_v2_api

Problem: time to retire deprecated APIs

Author: sappo

CMakeLists.txt

@@ -163,15 +163,6 @@ set (czmq_headers
     include/zproxy.h
     include/zrex.h
     include/zsys.h
-    include/zauth_v2.h
-    include/zbeacon_v2.h
-    include/zctx.h
-    include/zmonitor_v2.h
-    include/zmutex.h
-    include/zproxy_v2.h
-    include/zsocket.h
-    include/zsockopt.h
-    include/zthread.h
     src/zgossip_msg.h
     src/zsock_option.inc
     src/zgossip_engine.inc
@@ -230,15 +221,6 @@ set (czmq_sources
     src/zrex.c
     src/zsys.c
     src/zgossip_msg.c
-    src/zauth_v2.c
-    src/zbeacon_v2.c
-    src/zctx.c
-    src/zmonitor_v2.c
-    src/zmutex.c
-    src/zproxy_v2.c
-    src/zsocket.c
-    src/zsockopt.c
-    src/zthread.c
 )
 
 IF (ENABLE_DRAFTS)
@@ -372,15 +354,6 @@ set(TEST_CLASSES
     zrex
     zsys
     zgossip_msg
-    zauth_v2
-    zbeacon_v2
-    zctx
-    zmonitor_v2
-    zmutex
-    zproxy_v2
-    zsocket
-    zsockopt
-    zthread
 )
 
 IF (ENABLE_DRAFTS)

README.md

@@ -249,19 +249,6 @@ This is the API provided by CZMQ v3.x, in alphabetical order.
 .pull doc/ztrie.doc
 .pull doc/zuuid.doc
 
-### API v2 Summary
-
-This is the deprecated API provided by CZMQ v2.x, in alphabetical order.
-
-.pull doc/zauth_v2.doc
-.pull doc/zctx.doc
-.pull doc/zmonitor_v2.doc
-.pull doc/zmutex.doc
-.pull doc/zproxy_v2.doc
-.pull doc/zsocket.doc
-.pull doc/zsockopt.doc
-.pull doc/zthread.doc
-
 ## Error Handling
 
 The CZMQ policy is to reduce the error flow to 0/-1 where possible. libzmq still does a lot of errno setting. CZMQ does not do that, as it creates a fuzzy API. Things either work as expected, or they fail, and the application's best strategy is usually to assert on non-zero return codes.

README.txt

@@ -10,7 +10,7 @@ INCDIR=-I$(PREFIX)/include -I.
 LIBDIR=-L$(PREFIX)/lib
 CFLAGS=-Wall -Os -g -DCZMQ_EXPORTS $(INCDIR)
 
-OBJS = zactor.o zarmour.o zcert.o zcertstore.o zchunk.o zclock.o zconfig.o zdigest.o zdir.o zdir_patch.o zfile.o zframe.o zhash.o zhashx.o ziflist.o zlist.o zlistx.o zloop.o zmsg.o zpoller.o zproc.o zsock.o zstr.o ztimerset.o ztrie.o zuuid.o zauth.o zbeacon.o zgossip.o zmonitor.o zproxy.o zrex.o zsys.o zgossip_msg.o zauth_v2.o zbeacon_v2.o zctx.o zmonitor_v2.o zmutex.o zproxy_v2.o zsocket.o zsockopt.o zthread.o
+OBJS = zactor.o zarmour.o zcert.o zcertstore.o zchunk.o zclock.o zconfig.o zdigest.o zdir.o zdir_patch.o zfile.o zframe.o zhash.o zhashx.o ziflist.o zlist.o zlistx.o zloop.o zmsg.o zpoller.o zproc.o zsock.o zstr.o ztimerset.o ztrie.o zuuid.o zauth.o zbeacon.o zgossip.o zmonitor.o zproxy.o zrex.o zsys.o zgossip_msg.o
 %.o: ../../src/%.c
 	$(CC) -c -o $@ $< $(CFLAGS)
 

builds/cygwin/Makefile.cygwin

@@ -62,12 +62,8 @@
         '../../include/zarmour.h',
         '../../src/zauth.c',
         '../../include/zauth.h',
-        '../../src/zauth_v2.c',
-        '../../include/zauth_v2.h',
         '../../src/zbeacon.c',
         '../../include/zbeacon.h',
-        '../../src/zbeacon_v2.c',
-        '../../include/zbeacon_v2.h',
         '../../src/zcert.c',
         '../../include/zcert.h',
         '../../src/zcertstore.c',
@@ -78,8 +74,6 @@
         '../../include/zclock.h',
         '../../src/zconfig.c',
         '../../include/zconfig.h',
-        '../../src/zctx.c',
-        '../../include/zctx.h',
         '../../src/zdigest.c',
         '../../include/zdigest.h',
         '../../src/zdir.c',
@@ -108,34 +102,22 @@
         '../../include/zloop.h',
         '../../src/zmonitor.c',
         '../../include/zmonitor.h',
-        '../../src/zmonitor_v2.c',
-        '../../include/zmonitor_v2.h',
         '../../src/zmsg.c',
         '../../include/zmsg.h',
-        '../../src/zmutex.c',
-        '../../include/zmutex.h',
         '../../src/zpoller.c',
         '../../include/zpoller.h',
         '../../src/zproc.c',
         '../../include/zproc.h',
         '../../src/zproxy.c',
         '../../include/zproxy.h',
-        '../../src/zproxy_v2.c',
-        '../../include/zproxy_v2.h',
         '../../src/zrex.c',
         '../../include/zrex.h',
         '../../src/zsock.c',
         '../../include/zsock.h',
-        '../../src/zsocket.c',
-        '../../include/zsocket.h',
-        '../../src/zsockopt.c',
-        '../../include/zsockopt.h',
         '../../src/zstr.c',
         '../../include/zstr.h',
         '../../src/zsys.c',
         '../../include/zsys.h',
-        '../../src/zthread.c',
-        '../../include/zthread.h',
         '../../src/ztimerset.c',
         '../../include/ztimerset.h',
         '../../src/ztrie.c',

builds/gyp/project.gyp

@@ -10,7 +10,7 @@ INCDIR=-I$(PREFIX)/include -I.
 LIBDIR=-L$(PREFIX)/lib
 CFLAGS=-Wall -Os -g -DCZMQ_EXPORTS $(INCDIR)
 
-OBJS = zactor.o zarmour.o zcert.o zcertstore.o zchunk.o zclock.o zconfig.o zdigest.o zdir.o zdir_patch.o zfile.o zframe.o zhash.o zhashx.o ziflist.o zlist.o zlistx.o zloop.o zmsg.o zpoller.o zproc.o zsock.o zstr.o ztimerset.o ztrie.o zuuid.o zauth.o zbeacon.o zgossip.o zmonitor.o zproxy.o zrex.o zsys.o zgossip_msg.o zauth_v2.o zbeacon_v2.o zctx.o zmonitor_v2.o zmutex.o zproxy_v2.o zsocket.o zsockopt.o zthread.o
+OBJS = zactor.o zarmour.o zcert.o zcertstore.o zchunk.o zclock.o zconfig.o zdigest.o zdir.o zdir_patch.o zfile.o zframe.o zhash.o zhashx.o ziflist.o zlist.o zlistx.o zloop.o zmsg.o zpoller.o zproc.o zsock.o zstr.o ztimerset.o ztrie.o zuuid.o zauth.o zbeacon.o zgossip.o zmonitor.o zproxy.o zrex.o zsys.o zgossip_msg.o
 %.o: ../../src/%.c
 	$(CC) -c -o $@ $< $(CFLAGS)