Problem: out of date with zproject

Solution: regenerate

Author: bluca

.editorconfig

@@ -0,0 +1,19 @@
+# This is a skeleton created by zproject.
+# You can add hand-written code here.
+# See http://editorconfig.org/ and https://github.com/editorconfig/ for
+# details about the format and links to plugins for IDEs and editors which
+# do not yet support this configuration out of the box - but easily can.
+
+# This is a top-level setting for project sources under this directory
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+charset = utf-8
+
+[*.am]
+indent_style = tab

CMakeLists.txt

@@ -66,6 +66,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)
@@ -162,7 +169,10 @@ set_target_properties(glar
     PROPERTIES DEFINE_SYMBOL "GLAR_EXPORTS"
 )
 set_target_properties (glar
-    PROPERTIES SOVERSION "0.0.0"
+    PROPERTIES SOVERSION "0"
+)
+set_target_properties (glar
+    PROPERTIES VERSION "0.0.1"
 )
 target_link_libraries(glar
     ${ZEROMQ_LIBRARIES} ${MORE_LIBRARIES}
@@ -177,7 +187,7 @@ install(TARGETS glar
 ########################################################################
 # pkgconfig
 ########################################################################
-set (VERSION "0.0.0")
+set (VERSION "0.0.1")
 set (prefix "${CMAKE_INSTALL_PREFIX}")
 set (exec_prefix "\${prefix}")
 set (libdir "\${prefix}/lib${LIB_SUFFIX}")
@@ -256,6 +266,22 @@ IF (ENABLE_DRAFTS)
     )
 ENDIF (ENABLE_DRAFTS)
 
+
+add_custom_target(
+    copy-selftest-ro ALL
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/selftest-ro ${CMAKE_BINARY_DIR}/src/selftest-ro
+)
+
+add_custom_target(
+    make-selftest-rw ALL
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/src/selftest-rw
+)
+
+set_directory_properties(
+    PROPERTIES
+    ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_BINARY_DIR}/src/selftest-ro;${CMAKE_BINARY_DIR}/src/selftest-rw"
+)
+
 foreach(TEST_CLASS ${TEST_CLASSES})
     add_test(
         NAME ${TEST_CLASS}
@@ -265,6 +291,10 @@ foreach(TEST_CLASS ${TEST_CLASSES})
         ${TEST_CLASS}
         PROPERTIES TIMEOUT ${CLASSTEST_TIMEOUT}
     )
+    set_tests_properties(
+        ${TEST_CLASS}
+        PROPERTIES DEPENDS "copy-selftest-ro;make-selftest-rw"
+    )
 endforeach(TEST_CLASS)
 
 include(CTest)

Makefile.am

@@ -29,7 +29,7 @@ check_PROGRAMS =
 noinst_LTLIBRARIES =
 TESTS =
 # Prepare variables that can be populated (appended) in generated Makefiles or
-# manually maintained src/Makemodules-local.am
+# manually maintained src/Makemodule-local.am
 EXTRA_DIST =
 CLEANFILES =
 DISTCLEANFILES =
@@ -48,6 +48,8 @@ EXTRA_DIST += \
     README.md \
     src/glar_classes.h
 
+# NOTE: this "include" syntax is not a "make" but an "autotools" keyword,
+# see https://www.gnu.org/software/automake/manual/html_node/Include.html
 include $(srcdir)/src/Makemodule.am
 include $(srcdir)/src/Makemodule-local.am # Optional project-local hook
 

autogen.sh

@@ -6,6 +6,11 @@
 
 #   Script to generate all required files from fresh git checkout.
 
+if [ ! -f src/Makemodule-local.am ] ; then
+    echo "autogen.sh: generating a dummy src/Makemodule-local.am to fulfill dependencies." 1>&2
+    touch src/Makemodule-local.am
+fi
+
 # Debian and Ubuntu do not shipt libtool anymore, but OSX does not ship libtoolize.
 command -v libtoolize >/dev/null 2>&1
 if  [ $? -ne 0 ]; then

ci_build.sh

@@ -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
@@ -44,12 +45,12 @@ if [ "$BUILD_TYPE" == "default" ] || [ "$BUILD_TYPE" == "default-Werror" ] || [
     if which ccache && ls -la /usr/lib/ccache ; then
         HAVE_CCACHE=yes
     fi
+    mkdir -p "${CCACHE_DIR}" || HAVE_CCACHE=no
 
     if [ "$HAVE_CCACHE" = yes ] && [ -d "$CCACHE_DIR" ]; then
         echo "CCache stats before build:"
         ccache -s || true
     fi
-    mkdir -p "${HOME}/.ccache"
 
     CONFIG_OPTS=()
     COMMON_CFLAGS=""
@@ -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,9 @@ if [ "$BUILD_TYPE" == "default" ] || [ "$BUILD_TYPE" == "default-Werror" ] || [
         CONFIG_OPTS+=("CPP=${CPP}")
     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)..."
@@ -272,14 +275,23 @@ 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
+    if [ -n "$ADDRESS_SANITIZER" ] && [ "$ADDRESS_SANITIZER" == "enabled" ]; then
+        CONFIG_OPTS+=("--enable-address-sanitizer=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}")
     $CI_TIME ./autogen.sh 2> /dev/null
     $CI_TIME ./configure --enable-drafts=yes "${CONFIG_OPTS[@]}"
     if [ "$BUILD_TYPE" == "valgrind" ] ; then
         # Build and check this project
-        $CI_TIME make VERBOSE=1 memcheck
+        $CI_TIME make VERBOSE=1 memcheck && exit
+        echo "Re-running failed ($?) memcheck with greater verbosity" >&2
+        $CI_TIME make VERBOSE=1 memcheck-verbose
         exit $?
     fi
     $CI_TIME make VERBOSE=1 all
@@ -323,9 +335,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

ci_deploy.sh

@@ -22,8 +22,8 @@ if [ "$BUILD_TYPE" == "default" ]; then
     cd -
 elif [ "$BUILD_TYPE" == "bindings" ] && [ "$BINDING" == "jni" ]; then
     ( cd bindings/jni && TERM=dumb PKG_CONFIG_PATH=/tmp/lib/pkgconfig ./gradlew clean bintrayUpload )
-    cp bindings/jni/android/glar150-android.jar glar150-android-0.0.0.jar
-    export GLAR150_DEPLOYMENT=glar150-android-0.0.0.jar
+    cp bindings/jni/android/glar150-android.jar glar150-android-0.0.1.jar
+    export GLAR150_DEPLOYMENT=glar150-android-0.0.1.jar
 else
     export GLAR150_DEPLOYMENT=""
 fi

ci_deploy_obs.sh

@@ -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/zmqers/glar150/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/zmqers/glar150/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/zmqers/glar150/git/refs/heads/tmp_obs_release_branch
+fi

configure.ac

@@ -7,7 +7,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
 #
-AC_INIT([glar150],[0.0.0],[[email protected]])
+AC_INIT([glar150],[0.0.1],[[email protected]])
 
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
@@ -52,7 +52,11 @@ AC_PROG_SED
 AC_PROG_AWK
 PKG_PROG_PKG_CONFIG
 
+# Check endianess of the system
+AC_C_BIGENDIAN
+
 # 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])],
                   [GLAR_GCOV="$withval"])
@@ -64,8 +68,27 @@ if test "x${GLAR_GCOV}" == "xyes"; then
         CFLAGS="${CFLAGS} ${GLAR_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])],
+                  [GLAR_ASAN="$enableval"])
+
+if test "x${GLAR_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
@@ -458,6 +481,9 @@ case "${host_os}" in
         AC_DEFINE(GLAR_HAVE_HPUX, 1, [Have HPUX OS])
         ;;
     *mingw32*)
+        # Disable format error due to incomplete ANSI C
+        CFLAGS="-Wno-error=format -Wno-unused-function -Wno-unused-variable -D_XOPEN_SOURCE $CFLAGS"
+        CPPFLAGS="-Wno-error=format -Wno-unused-function -Wno-unused-variable -D_XOPEN_SOURCE $CPPFLAGS"
         AC_DEFINE(GLAR_HAVE_WINDOWS, 1, [Have Windows OS])
         AC_DEFINE(GLAR_HAVE_MINGW32, 1, [Have MinGW32])
         AC_CHECK_HEADERS(windows.h)
@@ -467,7 +493,8 @@ case "${host_os}" in
     *mingw64*)
         # Define on MINGW64 to enable all libeary features
         # Disable format error due to incomplete ANSI C
-        CPPFLAGS="-Wno-error=format -D_XOPEN_SOURCE $CPPFLAGS"
+        CFLAGS="-Wno-error=format -Wno-unused-function -Wno-unused-variable -D_XOPEN_SOURCE $CFLAGS"
+        CPPFLAGS="-Wno-error=format -Wno-unused-function -Wno-unused-variable -D_XOPEN_SOURCE $CPPFLAGS"
         AC_DEFINE(GLAR_HAVE_WINDOWS, 1, [Have Windows OS])
         AC_DEFINE(GLAR_HAVE_MINGW32, 1, [Have MinGW32])
         AC_CHECK_HEADERS(windows.h)
@@ -651,6 +678,7 @@ AM_COND_IF([WITH_SYSTEMD_UNITS],
     ])],
     [])
 
+
 AC_OUTPUT
 
 # Print configure summary and list make options

doc/asciidoc.conf

@@ -45,7 +45,7 @@ template::[header-declarations]
 <refsect1 id="_resources">
 <title>RESOURCES</title>
 <simpara>Main web site: <ulink url=""></ulink></simpara>
-<simpara>Report bugs to the email &lt;<ulink url="mailto:[email protected]">[email protected]</ulink>&gt;</simpara>
+<simpara>Report bugs to the email &lt;<ulink url="mailto:[email protected]">[email protected]</ulink>&gt;</simpara>
 </refsect1>
 <refsect1 id="_copyright">
 <title>COPYRIGHT</title>

include/glar_library.h

@@ -1,12 +1,12 @@
 /*  =========================================================================
     glar150 - generated layer of public API
 
-    Copyright (c) the Contributors as noted in the AUTHORS file.       
-    This file is part of the Glar150 Project.                          
-                                                                       
+    Copyright (c) the Contributors as noted in the AUTHORS file.
+    This file is part of the Glar150 Project.
+
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
-    file, You can obtain one at http://mozilla.org/MPL/2.0/.           
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ################################################################################
 #  THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY  #
@@ -26,7 +26,7 @@
 //  GLAR version macros for compile-time API detection
 #define GLAR_VERSION_MAJOR 0
 #define GLAR_VERSION_MINOR 0
-#define GLAR_VERSION_PATCH 0
+#define GLAR_VERSION_PATCH 1
 
 #define GLAR_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

packaging/debian/changelog

@@ -1,5 +1,5 @@
-glar150 (0.0.0) UNRELEASED; urgency=low
+glar150 (0.0.1) UNRELEASED; urgency=low
 
   * Initial packaging.
 
- -- glar150 Developers <[email protected]>        Wed, 31 Dec 2014 00:00:00 +0000
+ -- glar150 Developers <[email protected]>  Wed, 31 Dec 2014 00:00:00 +0000

packaging/debian/compat

@@ -1 +1 @@
-9
+10