Skip to content
Permalink
Browse files

Problem: Out of sync with zproject

Solution: Re-generate!
  • Loading branch information
sappo committed Mar 10, 2020
1 parent e359873 commit 2e1b24537b866264b5c4d305db210abf9e643a41
Showing with 23 additions and 12 deletions.
  1. +13 −4 ci_build.sh
  2. +0 −8 include/zyre_library.h
  3. +10 −0 src/zyre_classes.h
@@ -46,6 +46,12 @@ windows)
cmake --build . --config Release --target install
cd ../..

if [ -d "libzmq/bindings/jni" ]; then
cd libzmq/bindings/jni
./gradlew publishToMavenLocal -PbuildPrefix=$BUILD_PREFIX --info
cd ../../..
fi

git clone --quiet --depth 1 https://github.com/zeromq/czmq.git czmq
cd czmq
mkdir build
@@ -54,9 +60,11 @@ windows)
cmake --build . --config Release --target install
cd ../..

cd czmq/bindings/jni
./gradlew publishToMavenLocal -PbuildPrefix=$BUILD_PREFIX --info
cd ../../..
if [ -d "czmq/bindings/jni" ]; then
cd czmq/bindings/jni
./gradlew publishToMavenLocal -PbuildPrefix=$BUILD_PREFIX --info
cd ../../..
fi

cd zyre
mkdir build
@@ -66,7 +74,8 @@ windows)
ctest --build-config Release
cd ../..

cd zyre/bindings/jni
cd zyre
cd bindings/jni
./gradlew build jar -PbuildPrefix=$BUILD_PREFIX -x test --info
./gradlew publishToMavenLocal -PbuildPrefix=$BUILD_PREFIX --info

@@ -63,14 +63,6 @@
# endif
#endif

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#include <assert.h>
#endif

// Opaque class structures to allow forward references
// These classes are stable or legacy and built in all releases
typedef struct _zyre_t zyre_t;
@@ -22,6 +22,16 @@
// Platform definitions, must come first
#include "platform.h"

// Asserts check the invariants of methods. If they're not
// fulfilled the program should fail fast. Therefore enforce them!
#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#include <assert.h>
#endif

// External API
#include "../include/zyre.h"

0 comments on commit 2e1b245

Please sign in to comment.
You can’t perform that action at this time.