Permalink
Browse files

Problem: out of date with zproject

Solution: regenerate
  • Loading branch information...
bluca committed Apr 17, 2018
1 parent 779e02e commit 936d1c05c9b5dbe807df9fc3bcc02aea246c0d38
Showing with 1,390 additions and 473 deletions.
  1. +56 −0 .clang-format
  2. +106 −60 .gitignore
  3. +2 −2 CMakeLists.txt
  4. +1 −1 Dockerfile
  5. +2 −3 Makefile.am
  6. +66 −20 bindings/python_cffi/zyre_cffi/cdefs.py
  7. +57 −1 bindings/qt/src/qzsock.cpp
  8. +25 −1 bindings/qt/src/qzsock.h
  9. +1 −1 builds/cmake/Modules/ClangFormat.cmake
  10. +17 −2 builds/cmake/ci_build.sh
  11. +3 −0 builds/msvc/vs2010/libzyre/libzyre.vcxproj
  12. +3 −0 builds/msvc/vs2010/libzyre/libzyre.vcxproj.filters
  13. +1 −1 builds/msvc/vs2010/perf_local/perf_local.vcxproj
  14. +1 −1 builds/msvc/vs2010/perf_remote/perf_remote.vcxproj
  15. +1 −1 builds/msvc/vs2010/zpinger/zpinger.vcxproj
  16. +1 −1 builds/msvc/vs2010/ztester_beacon/ztester_beacon.vcxproj
  17. +1 −1 builds/msvc/vs2010/ztester_gossip/ztester_gossip.vcxproj
  18. +193 −73 builds/msvc/vs2010/zyre.sln
  19. +1 −1 builds/msvc/vs2010/zyre_selftest/zyre_selftest.vcxproj
  20. +3 −0 builds/msvc/vs2012/libzyre/libzyre.vcxproj
  21. +3 −0 builds/msvc/vs2012/libzyre/libzyre.vcxproj.filters
  22. +1 −1 builds/msvc/vs2012/perf_local/perf_local.vcxproj
  23. +1 −1 builds/msvc/vs2012/perf_remote/perf_remote.vcxproj
  24. +1 −1 builds/msvc/vs2012/zpinger/zpinger.vcxproj
  25. +1 −1 builds/msvc/vs2012/ztester_beacon/ztester_beacon.vcxproj
  26. +1 −1 builds/msvc/vs2012/ztester_gossip/ztester_gossip.vcxproj
  27. +193 −73 builds/msvc/vs2012/zyre.sln
  28. +1 −1 builds/msvc/vs2012/zyre_selftest/zyre_selftest.vcxproj
  29. +3 −0 builds/msvc/vs2013/libzyre/libzyre.vcxproj
  30. +3 −0 builds/msvc/vs2013/libzyre/libzyre.vcxproj.filters
  31. +1 −1 builds/msvc/vs2013/perf_local/perf_local.vcxproj
  32. +1 −1 builds/msvc/vs2013/perf_remote/perf_remote.vcxproj
  33. +1 −1 builds/msvc/vs2013/zpinger/zpinger.vcxproj
  34. +1 −1 builds/msvc/vs2013/ztester_beacon/ztester_beacon.vcxproj
  35. +1 −1 builds/msvc/vs2013/ztester_gossip/ztester_gossip.vcxproj
  36. +193 −73 builds/msvc/vs2013/zyre.sln
  37. +1 −1 builds/msvc/vs2013/zyre_selftest/zyre_selftest.vcxproj
  38. +3 −0 builds/msvc/vs2015/libzyre/libzyre.vcxproj
  39. +3 −0 builds/msvc/vs2015/libzyre/libzyre.vcxproj.filters
  40. +1 −1 builds/msvc/vs2015/perf_local/perf_local.vcxproj
  41. +1 −1 builds/msvc/vs2015/perf_remote/perf_remote.vcxproj
  42. +1 −1 builds/msvc/vs2015/zpinger/zpinger.vcxproj
  43. +1 −1 builds/msvc/vs2015/ztester_beacon/ztester_beacon.vcxproj
  44. +1 −1 builds/msvc/vs2015/ztester_gossip/ztester_gossip.vcxproj
  45. +193 −73 builds/msvc/vs2015/zyre.sln
  46. +1 −1 builds/msvc/vs2015/zyre_selftest/zyre_selftest.vcxproj
  47. +23 −15 ci_build.sh
  48. +29 −13 configure.ac
  49. +7 −3 doc/Makefile.am
  50. +10 −1 include/zyre_library.h
  51. +83 −0 src/Makemodule.am
  52. +1 −1 src/zyre_classes.h
  53. +9 −5 src/zyre_private_selftest.c
  54. +75 −28 src/zyre_selftest.c
@@ -0,0 +1,56 @@
# This is a skeleton created by zproject.
# You can add hand-written code here.
BasedOnStyle: LLVM
IndentWidth: 4
UseTab: Never
BreakBeforeBraces: Custom
BraceWrapping:
AfterClass: true
AfterControlStatement: false
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: true
BeforeCatch: true
BeforeElse: false
IndentBraces: false
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AllowShortIfStatementsOnASingleLine: false
IndentCaseLabels: true
BinPackArguments: true
BinPackParameters: false
AlignTrailingComments: true
AllowShortBlocksOnASingleLine: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortFunctionsOnASingleLine: InlineOnly
AlwaysBreakTemplateDeclarations: false
ColumnLimit: 80
MaxEmptyLinesToKeep: 2
KeepEmptyLinesAtTheStartOfBlocks: false
ContinuationIndentWidth: 2
PointerAlignment: Right
ReflowComments: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: Always
SpaceInEmptyParentheses: false
SpacesInAngles: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
SortIncludes: false
FixNamespaceComments: false
BreakBeforeBinaryOperators: NonAssignment
SpaceAfterTemplateKeyword: true
AlignAfterOpenBracket: Align
AlignOperands: true
BreakConstructorInitializers: AfterColon
ConstructorInitializerAllOnOneLineOrOnePerLine: true
SpaceAfterCStyleCast: true
BreakBeforeTernaryOperators: true
@@ -1,87 +1,133 @@
INSTALL
# This is a skeleton created by zproject.
# You can add hand-written code here.
save.xml
# Object files
*.o
*.so
*.ko
*.pyc
# Libraries
*.lib
*.a
*.la
*.pc
*.dll.a
# Shared objects (inc. Windows DLLs)
*.dll
*.so.*
*.dylib
*.lo
# Executables
src/zyre_selftest
src/perf_local
src/perf_remote
src/zpinger
src/ztester_beacon
src/ztester_gossip
src/zyre_selftest
*.exe
*.out
*.app
core
# Distcheck workspace and archives
zyre-*/
zyre-*.tar.gz
zyre-*.zip
# Man pages
doc/*.1
doc/*.3
doc/*.7
# autoconf files
.deps
.libs
*.log
*.trs
Makefile
Makefile.in
!builds/openwrt/Makefile
aclocal.m4
autom4te.cache/
config.log
config.status
config/
configure
examples/chat
examples/chat/.deps
configure.lineno
libtool
src/.deps/
src/libfmq.pc
src/platform.h
src/platform.h.in
src/platform.h.in~
src/stamp-h1
tools/.deps/
doc/*.1
doc/*.3
.libs/
.dirstamp
*.o
*.lo
*.la
*.lst
*.so
*.swp
core
.cache
testit
*.pc
src/zpinger
src/ztester
src/ztester_beacon
src/ztester_gossip
src/perf_local
src/perf_remote
doit
src/zyre_selftest
src/test-suite.log
src/zyre_selftest.log
src/zyre_selftest.trs
src/.dirstamp
# CMake cache
CMakeCache.txt
CMakeFiles/
Testing/
CTestTestfile.cmake
cmake_install.cmake
compile_commands.json
DartConfiguration.tcl
install_manifest.txt
src/libzyre.so
include/platform.h
src/platform.h.in
*.log
# config files for qtcreator
zyre.config
zyre.creator
zyre.files
zyre.includes
# Windows build intermediate files
*.suo
*.sdf
*.user
*.opensdf
bin/
obj/
builds/msvc/**/*Debug
builds/msvc/**/*Release
Testing/
# eclipse setting
.cproject
.project
# Repositories downloaded by CI integration scripts
libzmq/
czmq/
# android build results
builds/android/prefix/
# Travis build area
tmp/
# Python bindings
*.pyc
# Valgrind files
callgrind*
vgcore*
# vagrant
# Vagrant files
.vagrant
# CLion
# CLion / PyCharm
.idea
# GYP files
project.Makefile
*.target.mk
out/
# Android build results
builds/android/prefix
# Android - generated directories
src/app/bin/
src/app/gen/
src/app/obj/
src/app/local.properties
# Android -dependencies
src/app/jni/output
# Python build directory
build/
# MSVC build directories
obj/
bin/
*.tlog
# Qt
*pro.user
moc_*
build-*
bindings/qt/selftest/selftest
# Temporary files
*.swp
*.bak
.test*
# editor backups
*~
@@ -38,7 +38,7 @@ if (NOT CMAKE_BUILD_TYPE)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
message(STATUS "git workspace root [${git_result}]: ${git_root}")
if ( "${git_result}" == "0" )
if ( "${git_result}" STREQUAL "0" )
set (CMAKE_BUILD_TYPE Debug)
else ()
set (CMAKE_BUILD_TYPE Release)
@@ -522,7 +522,7 @@ add_custom_command(
TARGET distclean
)
include(ClangFormat)
include(ClangFormat OPTIONAL)
########################################################################
# summary
@@ -30,7 +30,7 @@ RUN sudo ldconfig
WORKDIR /home/zmq
RUN git clone --quiet git://github.com/zeromq/zyre.git zyre
WORKDIR /home/zmq/zyre zyre
WORKDIR /home/zmq/zyre
RUN ./autogen.sh 2> /dev/null
RUN ./configure --quiet --without-docs
RUN make
@@ -5,9 +5,6 @@
ACLOCAL_AMFLAGS = -I config
AM_CFLAGS = \
-Werror=format-security
AM_CPPFLAGS = \
${libzmq_CFLAGS} \
@@ -38,6 +35,8 @@ EXTRA_DIST += \
Findlibzmq.cmake \
Findczmq.cmake \
src/CMakeLists-local.txt \
builds/cmake/Modules/ClangFormat.cmake \
builds/cmake/clang-format-check.sh.in \
CMakeLists.txt
endif
Oops, something went wrong.

0 comments on commit 936d1c0

Please sign in to comment.