Permalink
Browse files

Problem: out of date with zproject

Solution: regenerate
  • Loading branch information...
bluca committed Apr 29, 2017
1 parent dfd29b5 commit 8ce18b1a767db4afca5c05fb73d95ff9bd81d38d
Showing with 84 additions and 16 deletions.
  1. +7 −0 CMakeLists.txt
  2. +1 −0 Makefile.am
  3. +7 −7 bindings/jni/build.gradle
  4. +19 −6 ci_build.sh
  5. +23 −0 ci_deploy_obs.sh
  6. +20 −0 configure.ac
  7. +5 −1 packaging/obs/_service
  8. +1 −1 packaging/redhat/zyre.spec
  9. +1 −1 setup.py
View
@@ -91,6 +91,13 @@ if (MSVC)
set(MORE_LIBRARIES ws2_32 Rpcrt4 Iphlpapi)
endif()
# specific case of windows UWP
if( ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore" AND ${CMAKE_SYSTEM_VERSION} STREQUAL "10.0")
ADD_DEFINITIONS(-DZMQ_HAVE_WINDOWS_UWP)
ADD_DEFINITIONS(-D_WIN32_WINNT=_WIN32_WINNT_WIN10)
endif()
# required libraries for mingw
if (MINGW)
set(MORE_LIBRARIES -lws2_32 -lrpcrt4 -liphlpapi)
View
@@ -39,6 +39,7 @@ EXTRA_DIST += \
endif
EXTRA_DIST += \
bindings \
src/zre_msg.h \
src/zyre_peer.h \
src/zyre_group.h \
View
@@ -81,16 +81,16 @@ publishing {
asNode().appendNode('packaging', 'jar')
asNode().appendNode('name', 'zyre-jni')
asNode().appendNode('description', 'an open-source framework for proximity-based P2P apps')
asNode().appendNode('url', 'http://github.com/zeromq/zyre')
asNode().appendNode('url', 'https://github.com/zeromq/zyre')
def license = asNode().appendNode('licenses').appendNode('license')
license.appendNode('name', 'Mozilla Public License Version 2.0')
license.appendNode('url', 'https://www.mozilla.org/en-US/MPL/2.0/')
def scm = asNode().appendNode('scm')
scm.appendNode('connection', 'http://github.com/zeromq/zyre.git')
scm.appendNode('developerConnection', 'http://github.com/zeromq/zyre.git')
scm.appendNode('url', 'http://github.com/zeromq/zyre')
scm.appendNode('connection', 'https://github.com/zeromq/zyre.git')
scm.appendNode('developerConnection', 'https://github.com/zeromq/zyre.git')
scm.appendNode('url', 'https://github.com/zeromq/zyre')
}
}
}
@@ -108,9 +108,9 @@ bintray {
desc = "an open-source framework for proximity-based P2P apps"
userOrg = System.getenv('BINTRAY_USER_ORG')
licenses = ["MPL-2.0"]
websiteUrl = 'http://github.com/zeromq/zyre'
issueTrackerUrl = 'http://github.com/zeromq/zyre/issues'
vcsUrl = 'http://github.com/zeromq/zyre.git'
websiteUrl = 'https://github.com/zeromq/zyre'
issueTrackerUrl = 'https://github.com/zeromq/zyre/issues'
vcsUrl = 'https://github.com/zeromq/zyre.git'
githubRepo = System.getenv('BINTRAY_USER_ORG') + '/zyre'
version {
name = '2.0.1'
View
@@ -25,7 +25,8 @@ case "$CI_TRACE" in
set -x ;;
esac
if [ "$BUILD_TYPE" == "default" ] || [ "$BUILD_TYPE" == "default-Werror" ] || [ "$BUILD_TYPE" == "valgrind" ]; then
case "$BUILD_TYPE" in
default|default-Werror|default-with-docs|valgrind)
LANG=C
LC_ALL=C
export LANG LC_ALL
@@ -111,7 +112,6 @@ if [ "$BUILD_TYPE" == "default" ] || [ "$BUILD_TYPE" == "default-Werror" ] || [
CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
CONFIG_OPTS+=("--with-docs=no")
if [ -z "${CI_CONFIG_QUIET-}" ] || [ "${CI_CONFIG_QUIET-}" = yes ] || [ "${CI_CONFIG_QUIET-}" = true ]; then
CONFIG_OPTS+=("--quiet")
fi
@@ -167,6 +167,13 @@ if [ "$BUILD_TYPE" == "default" ] || [ "$BUILD_TYPE" == "default-Werror" ] || [
CONFIG_OPTS+=("CPP=${CPP}")
fi
if [ -n "$ADDRESS_SANITIZER" ] && [ "$ADDRESS_SANITIZER" == "enabled" ]; then
CONFIG_OPTS+=("--enable-address-sanitizer=yes")
fi
CONFIG_OPTS_COMMON=$CONFIG_OPTS
CONFIG_OPTS+=("--with-docs=no")
# Clone and build dependencies, if not yet installed to Travis env as DEBs
# or MacOS packages; other OSes are not currently supported by Travis cloud
[ -z "$CI_TIME" ] || echo "`date`: Starting build of dependencies (if any)..."
@@ -240,6 +247,10 @@ if [ "$BUILD_TYPE" == "default" ] || [ "$BUILD_TYPE" == "default-Werror" ] || [
echo "`date`: INFO: Starting build of currently tested project with DRAFT APIs..."
CCACHE_BASEDIR=${PWD}
export CCACHE_BASEDIR
if [ "$BUILD_TYPE" = "default-with-docs" ]; then
CONFIG_OPTS=$CONFIG_OPTS_COMMON
CONFIG_OPTS+=("--with-docs=yes")
fi
# Only use --enable-Werror on projects that are expected to have it
# (and it is not our duty to check prerequisite projects anyway)
CONFIG_OPTS+=("${CONFIG_OPT_WERROR}")
@@ -291,9 +302,11 @@ if [ "$BUILD_TYPE" == "default" ] || [ "$BUILD_TYPE" == "default-Werror" ] || [
echo "CCache stats after build:"
ccache -s
fi
elif [ "$BUILD_TYPE" == "bindings" ]; then
;;
bindings)
pushd "./bindings/${BINDING}" && ./ci_build.sh
else
;;
*)
pushd "./builds/${BUILD_TYPE}" && REPO_DIR="$(dirs -l +1)" ./ci_build.sh
fi
;;
esac
View
@@ -0,0 +1,23 @@
#!/usr/bin/env bash
################################################################################
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# READ THE ZPROJECT/README.MD FOR INFORMATION ABOUT MAKING PERMANENT CHANGES. #
################################################################################
# do NOT set -x or it will log the secret tokens!
set -e
if [ "$BUILD_TYPE" == "default" -a -n "${GH_TOKEN}" -a -n "${OBS_STABLE_TOKEN}" -a -n "${OBS_DRAFT_TOKEN}" ]; then
# Trigger source run on new tag on OBS. See travis.yml for token instructions.
# We have to create a temporary branch from the tag and delete it, as it is
# not possible to edit files on OBS with secure tokens, and it is not
# possible to dynamically fetch the latest git tag either.
TAG_SHA=$(curl -s -H "Authorization: token ${GH_TOKEN}" -X GET https://api.github.com/repos/zeromq/zyre/git/refs/tags/${TRAVIS_TAG} | grep -o -P '(?<=sha":\s).*(?=,)')
curl -H "Authorization: token ${GH_TOKEN}" -X POST --data "{\"ref\":\"refs/heads/tmp_obs_release_branch\",\"sha\":${TAG_SHA}}" https://api.github.com/repos/zeromq/zyre/git/refs
curl -H "Authorization: Token ${OBS_STABLE_TOKEN}" -X POST https://api.opensuse.org/trigger/runservice
curl -H "Authorization: Token ${OBS_DRAFT_TOKEN}" -X POST https://api.opensuse.org/trigger/runservice
# give some time for the git clone to happen before deleting the temp branch
sleep 60
curl -H "Authorization: token ${GH_TOKEN}" -X DELETE https://api.github.com/repos/zeromq/zyre/git/refs/heads/tmp_obs_release_branch
fi
View
@@ -56,6 +56,7 @@ PKG_PROG_PKG_CONFIG
AX_PROJECT_LOCAL_HOOK
# Code coverage
AC_MSG_CHECKING([whether to enable GCov])
AC_ARG_WITH(gcov, [AS_HELP_STRING([--with-gcov=yes/no],
[With GCC Code Coverage reporting])],
[ZYRE_GCOV="$withval"])
@@ -67,8 +68,27 @@ if test "x${ZYRE_GCOV}" == "xyes"; then
CFLAGS="${CFLAGS} ${ZYRE_ORIG_CFLAGS}"
fi
AM_CONDITIONAL(WITH_GCOV, true)
AC_MSG_RESULT([yes])
else
AM_CONDITIONAL(WITH_GCOV, false)
AC_MSG_RESULT([no])
fi
# Memory mis-use detection
AC_MSG_CHECKING([whether to enable ASan])
AC_ARG_ENABLE(address-sanitizer, [AS_HELP_STRING([--enable-address-sanitizer=yes/no],
[Build with GCC Address Sanitizer instrumentation])],
[ZYRE_ASAN="$enableval"])
if test "x${ZYRE_ASAN}" == "xyes"; then
CFLAGS="${CFLAGS} -fsanitize=address"
CXXFLAGS="${CXXFLAGS} -fsanitize=address"
AM_CONDITIONAL(ENABLE_ASAN, true)
AC_MSG_RESULT([yes])
else
AM_CONDITIONAL(ENABLE_ASAN, false)
AC_MSG_RESULT([no])
fi
# Set pkgconfigdir
View
@@ -1,10 +1,14 @@
<services>
<service name="tar_scm">
<param name="url">http://github.com/zeromq/zyre</param>
<param name="url">https://github.com/zeromq/zyre</param>
<param name="scm">git</param>
<param name="versionformat">@PARENT_TAG@+git%cd</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="versionrewrite-replacement">1</param>
<!-- extract redhat packaging -->
<param name="exclude">.git</param>
<param name="changesgenerate">enable</param>
<param name="filename">zyre</param>
</service>
<!-- extract redhat packaging -->
@@ -26,7 +26,7 @@ Version: 2.0.1
Release: 1
Summary: an open-source framework for proximity-based p2p apps
License: MIT
URL: http://github.com/zeromq/zyre
URL: https://github.com/zeromq/zyre
Source0: %{name}-%{version}.tar.gz
Group: System/Libraries
# Note: ghostscript is required by graphviz which is required by
View
@@ -3,7 +3,7 @@
setup(name='zyre',
description="""an open-source framework for proximity-based P2P apps""",
version='0.1',
url='http://github.com/zeromq/zyre',
url='https://github.com/zeromq/zyre',
packages=['zyre'],
package_dir={'': 'bindings/python'},
)

0 comments on commit 8ce18b1

Please sign in to comment.