Skip to content

Commit 67d8ff0

Browse files
blucabluca
committed
Problem: out of date with zproject and project.xml
Solution: regenerate
1 parent 848a919 commit 67d8ff0

File tree

13 files changed

+4
-533
lines changed

13 files changed

+4
-533
lines changed

‎builds/cygwin/Makefile.cygwin‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ INCDIR=-I$(PREFIX)/include -I.
1010
LIBDIR=-L$(PREFIX)/lib
1111
CFLAGS=-Wall -Os -g -DCZMQ_EXPORTS $(INCDIR)
1212

13-
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
13+
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
1414
%.o: ../../src/%.c
1515
$(CC) -c -o $@ $< $(CFLAGS)
1616

‎builds/gyp/project.gyp‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,8 @@
6262
'../../include/zarmour.h',
6363
'../../src/zauth.c',
6464
'../../include/zauth.h',
65-
'../../src/zauth_v2.c',
66-
'../../include/zauth_v2.h',
6765
'../../src/zbeacon.c',
6866
'../../include/zbeacon.h',
69-
'../../src/zbeacon_v2.c',
70-
'../../include/zbeacon_v2.h',
7167
'../../src/zcert.c',
7268
'../../include/zcert.h',
7369
'../../src/zcertstore.c',
@@ -78,8 +74,6 @@
7874
'../../include/zclock.h',
7975
'../../src/zconfig.c',
8076
'../../include/zconfig.h',
81-
'../../src/zctx.c',
82-
'../../include/zctx.h',
8377
'../../src/zdigest.c',
8478
'../../include/zdigest.h',
8579
'../../src/zdir.c',
@@ -108,34 +102,22 @@
108102
'../../include/zloop.h',
109103
'../../src/zmonitor.c',
110104
'../../include/zmonitor.h',
111-
'../../src/zmonitor_v2.c',
112-
'../../include/zmonitor_v2.h',
113105
'../../src/zmsg.c',
114106
'../../include/zmsg.h',
115-
'../../src/zmutex.c',
116-
'../../include/zmutex.h',
117107
'../../src/zpoller.c',
118108
'../../include/zpoller.h',
119109
'../../src/zproc.c',
120110
'../../include/zproc.h',
121111
'../../src/zproxy.c',
122112
'../../include/zproxy.h',
123-
'../../src/zproxy_v2.c',
124-
'../../include/zproxy_v2.h',
125113
'../../src/zrex.c',
126114
'../../include/zrex.h',
127115
'../../src/zsock.c',
128116
'../../include/zsock.h',
129-
'../../src/zsocket.c',
130-
'../../include/zsocket.h',
131-
'../../src/zsockopt.c',
132-
'../../include/zsockopt.h',
133117
'../../src/zstr.c',
134118
'../../include/zstr.h',
135119
'../../src/zsys.c',
136120
'../../include/zsys.h',
137-
'../../src/zthread.c',
138-
'../../include/zthread.h',
139121
'../../src/ztimerset.c',
140122
'../../include/ztimerset.h',
141123
'../../src/ztrie.c',

‎builds/mingw32/Makefile.mingw32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ INCDIR=-I$(PREFIX)/include -I.
1010
LIBDIR=-L$(PREFIX)/lib
1111
CFLAGS=-Wall -Os -g -DCZMQ_EXPORTS $(INCDIR)
1212

13-
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
13+
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
1414
%.o: ../../src/%.c
1515
$(CC) -c -o $@ $< $(CFLAGS)
1616

‎builds/msvc/vs2008/czmq/czmq.vcproj‎

Lines changed: 0 additions & 297 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,294 +1286,6 @@
12861286
<Tool Name="VCCLCompilerTool" CompileAs="2" />
12871287
</FileConfiguration>
12881288
</File>
1289-
<File RelativePath="..\..\..\..\src\zauth_v2.c">
1290-
<FileConfiguration Name="Release|Win32">
1291-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1292-
</FileConfiguration>
1293-
<FileConfiguration Name="Release|x64">
1294-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1295-
</FileConfiguration>
1296-
<FileConfiguration Name="Debug|Win32">
1297-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1298-
</FileConfiguration>
1299-
<FileConfiguration Name="Debug|x64">
1300-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1301-
</FileConfiguration>
1302-
<FileConfiguration Name="DebugDLL|Win32">
1303-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1304-
</FileConfiguration>
1305-
<FileConfiguration Name="DebugDLL|x64">
1306-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1307-
</FileConfiguration>
1308-
<FileConfiguration Name="ReleaseDLL|Win32">
1309-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1310-
</FileConfiguration>
1311-
<FileConfiguration Name="ReleaseDLL|x64">
1312-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1313-
</FileConfiguration>
1314-
<FileConfiguration Name="RelWithDebInfo|Win32">
1315-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1316-
</FileConfiguration>
1317-
<FileConfiguration Name="RelWithDebInfo|x64">
1318-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1319-
</FileConfiguration>
1320-
</File>
1321-
<File RelativePath="..\..\..\..\src\zbeacon_v2.c">
1322-
<FileConfiguration Name="Release|Win32">
1323-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1324-
</FileConfiguration>
1325-
<FileConfiguration Name="Release|x64">
1326-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1327-
</FileConfiguration>
1328-
<FileConfiguration Name="Debug|Win32">
1329-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1330-
</FileConfiguration>
1331-
<FileConfiguration Name="Debug|x64">
1332-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1333-
</FileConfiguration>
1334-
<FileConfiguration Name="DebugDLL|Win32">
1335-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1336-
</FileConfiguration>
1337-
<FileConfiguration Name="DebugDLL|x64">
1338-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1339-
</FileConfiguration>
1340-
<FileConfiguration Name="ReleaseDLL|Win32">
1341-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1342-
</FileConfiguration>
1343-
<FileConfiguration Name="ReleaseDLL|x64">
1344-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1345-
</FileConfiguration>
1346-
<FileConfiguration Name="RelWithDebInfo|Win32">
1347-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1348-
</FileConfiguration>
1349-
<FileConfiguration Name="RelWithDebInfo|x64">
1350-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1351-
</FileConfiguration>
1352-
</File>
1353-
<File RelativePath="..\..\..\..\src\zctx.c">
1354-
<FileConfiguration Name="Release|Win32">
1355-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1356-
</FileConfiguration>
1357-
<FileConfiguration Name="Release|x64">
1358-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1359-
</FileConfiguration>
1360-
<FileConfiguration Name="Debug|Win32">
1361-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1362-
</FileConfiguration>
1363-
<FileConfiguration Name="Debug|x64">
1364-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1365-
</FileConfiguration>
1366-
<FileConfiguration Name="DebugDLL|Win32">
1367-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1368-
</FileConfiguration>
1369-
<FileConfiguration Name="DebugDLL|x64">
1370-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1371-
</FileConfiguration>
1372-
<FileConfiguration Name="ReleaseDLL|Win32">
1373-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1374-
</FileConfiguration>
1375-
<FileConfiguration Name="ReleaseDLL|x64">
1376-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1377-
</FileConfiguration>
1378-
<FileConfiguration Name="RelWithDebInfo|Win32">
1379-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1380-
</FileConfiguration>
1381-
<FileConfiguration Name="RelWithDebInfo|x64">
1382-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1383-
</FileConfiguration>
1384-
</File>
1385-
<File RelativePath="..\..\..\..\src\zmonitor_v2.c">
1386-
<FileConfiguration Name="Release|Win32">
1387-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1388-
</FileConfiguration>
1389-
<FileConfiguration Name="Release|x64">
1390-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1391-
</FileConfiguration>
1392-
<FileConfiguration Name="Debug|Win32">
1393-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1394-
</FileConfiguration>
1395-
<FileConfiguration Name="Debug|x64">
1396-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1397-
</FileConfiguration>
1398-
<FileConfiguration Name="DebugDLL|Win32">
1399-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1400-
</FileConfiguration>
1401-
<FileConfiguration Name="DebugDLL|x64">
1402-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1403-
</FileConfiguration>
1404-
<FileConfiguration Name="ReleaseDLL|Win32">
1405-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1406-
</FileConfiguration>
1407-
<FileConfiguration Name="ReleaseDLL|x64">
1408-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1409-
</FileConfiguration>
1410-
<FileConfiguration Name="RelWithDebInfo|Win32">
1411-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1412-
</FileConfiguration>
1413-
<FileConfiguration Name="RelWithDebInfo|x64">
1414-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1415-
</FileConfiguration>
1416-
</File>
1417-
<File RelativePath="..\..\..\..\src\zmutex.c">
1418-
<FileConfiguration Name="Release|Win32">
1419-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1420-
</FileConfiguration>
1421-
<FileConfiguration Name="Release|x64">
1422-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1423-
</FileConfiguration>
1424-
<FileConfiguration Name="Debug|Win32">
1425-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1426-
</FileConfiguration>
1427-
<FileConfiguration Name="Debug|x64">
1428-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1429-
</FileConfiguration>
1430-
<FileConfiguration Name="DebugDLL|Win32">
1431-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1432-
</FileConfiguration>
1433-
<FileConfiguration Name="DebugDLL|x64">
1434-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1435-
</FileConfiguration>
1436-
<FileConfiguration Name="ReleaseDLL|Win32">
1437-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1438-
</FileConfiguration>
1439-
<FileConfiguration Name="ReleaseDLL|x64">
1440-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1441-
</FileConfiguration>
1442-
<FileConfiguration Name="RelWithDebInfo|Win32">
1443-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1444-
</FileConfiguration>
1445-
<FileConfiguration Name="RelWithDebInfo|x64">
1446-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1447-
</FileConfiguration>
1448-
</File>
1449-
<File RelativePath="..\..\..\..\src\zproxy_v2.c">
1450-
<FileConfiguration Name="Release|Win32">
1451-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1452-
</FileConfiguration>
1453-
<FileConfiguration Name="Release|x64">
1454-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1455-
</FileConfiguration>
1456-
<FileConfiguration Name="Debug|Win32">
1457-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1458-
</FileConfiguration>
1459-
<FileConfiguration Name="Debug|x64">
1460-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1461-
</FileConfiguration>
1462-
<FileConfiguration Name="DebugDLL|Win32">
1463-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1464-
</FileConfiguration>
1465-
<FileConfiguration Name="DebugDLL|x64">
1466-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1467-
</FileConfiguration>
1468-
<FileConfiguration Name="ReleaseDLL|Win32">
1469-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1470-
</FileConfiguration>
1471-
<FileConfiguration Name="ReleaseDLL|x64">
1472-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1473-
</FileConfiguration>
1474-
<FileConfiguration Name="RelWithDebInfo|Win32">
1475-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1476-
</FileConfiguration>
1477-
<FileConfiguration Name="RelWithDebInfo|x64">
1478-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1479-
</FileConfiguration>
1480-
</File>
1481-
<File RelativePath="..\..\..\..\src\zsocket.c">
1482-
<FileConfiguration Name="Release|Win32">
1483-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1484-
</FileConfiguration>
1485-
<FileConfiguration Name="Release|x64">
1486-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1487-
</FileConfiguration>
1488-
<FileConfiguration Name="Debug|Win32">
1489-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1490-
</FileConfiguration>
1491-
<FileConfiguration Name="Debug|x64">
1492-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1493-
</FileConfiguration>
1494-
<FileConfiguration Name="DebugDLL|Win32">
1495-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1496-
</FileConfiguration>
1497-
<FileConfiguration Name="DebugDLL|x64">
1498-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1499-
</FileConfiguration>
1500-
<FileConfiguration Name="ReleaseDLL|Win32">
1501-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1502-
</FileConfiguration>
1503-
<FileConfiguration Name="ReleaseDLL|x64">
1504-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1505-
</FileConfiguration>
1506-
<FileConfiguration Name="RelWithDebInfo|Win32">
1507-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1508-
</FileConfiguration>
1509-
<FileConfiguration Name="RelWithDebInfo|x64">
1510-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1511-
</FileConfiguration>
1512-
</File>
1513-
<File RelativePath="..\..\..\..\src\zsockopt.c">
1514-
<FileConfiguration Name="Release|Win32">
1515-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1516-
</FileConfiguration>
1517-
<FileConfiguration Name="Release|x64">
1518-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1519-
</FileConfiguration>
1520-
<FileConfiguration Name="Debug|Win32">
1521-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1522-
</FileConfiguration>
1523-
<FileConfiguration Name="Debug|x64">
1524-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1525-
</FileConfiguration>
1526-
<FileConfiguration Name="DebugDLL|Win32">
1527-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1528-
</FileConfiguration>
1529-
<FileConfiguration Name="DebugDLL|x64">
1530-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1531-
</FileConfiguration>
1532-
<FileConfiguration Name="ReleaseDLL|Win32">
1533-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1534-
</FileConfiguration>
1535-
<FileConfiguration Name="ReleaseDLL|x64">
1536-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1537-
</FileConfiguration>
1538-
<FileConfiguration Name="RelWithDebInfo|Win32">
1539-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1540-
</FileConfiguration>
1541-
<FileConfiguration Name="RelWithDebInfo|x64">
1542-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1543-
</FileConfiguration>
1544-
</File>
1545-
<File RelativePath="..\..\..\..\src\zthread.c">
1546-
<FileConfiguration Name="Release|Win32">
1547-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1548-
</FileConfiguration>
1549-
<FileConfiguration Name="Release|x64">
1550-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1551-
</FileConfiguration>
1552-
<FileConfiguration Name="Debug|Win32">
1553-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1554-
</FileConfiguration>
1555-
<FileConfiguration Name="Debug|x64">
1556-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1557-
</FileConfiguration>
1558-
<FileConfiguration Name="DebugDLL|Win32">
1559-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1560-
</FileConfiguration>
1561-
<FileConfiguration Name="DebugDLL|x64">
1562-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1563-
</FileConfiguration>
1564-
<FileConfiguration Name="ReleaseDLL|Win32">
1565-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1566-
</FileConfiguration>
1567-
<FileConfiguration Name="ReleaseDLL|x64">
1568-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1569-
</FileConfiguration>
1570-
<FileConfiguration Name="RelWithDebInfo|Win32">
1571-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1572-
</FileConfiguration>
1573-
<FileConfiguration Name="RelWithDebInfo|x64">
1574-
<Tool Name="VCCLCompilerTool" CompileAs="2" />
1575-
</FileConfiguration>
1576-
</File>
15771289
</Filter>
15781290
<Filter Name="Header Files">
15791291
<File RelativePath="..\..\..\..\builds\msvc\platform.h" />
@@ -1611,15 +1323,6 @@
16111323
<File RelativePath="..\..\..\..\include\zproxy.h" />
16121324
<File RelativePath="..\..\..\..\include\zrex.h" />
16131325
<File RelativePath="..\..\..\..\include\zsys.h" />
1614-
<File RelativePath="..\..\..\..\include\zauth_v2.h" />
1615-
<File RelativePath="..\..\..\..\include\zbeacon_v2.h" />
1616-
<File RelativePath="..\..\..\..\include\zctx.h" />
1617-
<File RelativePath="..\..\..\..\include\zmonitor_v2.h" />
1618-
<File RelativePath="..\..\..\..\include\zmutex.h" />
1619-
<File RelativePath="..\..\..\..\include\zproxy_v2.h" />
1620-
<File RelativePath="..\..\..\..\include\zsocket.h" />
1621-
<File RelativePath="..\..\..\..\include\zsockopt.h" />
1622-
<File RelativePath="..\..\..\..\include\zthread.h" />
16231326
<File RelativePath="..\..\..\..\include\czmq_library.h" />
16241327
<File RelativePath="..\..\..\..\include\czmq_prelude.h" />
16251328
<File RelativePath="..\..\..\..\include\czmq.h" />

0 commit comments

Comments
 (0)