Merge branch 'master' of github.com:d98762625/qpid-proton into v0.27

Author: d98762625

.appveyor.yml

@@ -1,20 +1,33 @@
 version: '{branch}.{build}'
 configuration: RelWithDebInfo
 environment:
+  PYTHON: C:\Python35\python.exe
+
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       CMAKE_GENERATOR: Visual Studio 15
+      VCPKG_INTEGRATION: '-DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake'
     - CMAKE_GENERATOR: Visual Studio 12
     - CMAKE_GENERATOR: Visual Studio 10
 install:
 - cinst -y swig
+- cd C:\Tools\vcpkg
+- git pull
+- .\bootstrap-vcpkg.bat
+- cd %APPVEYOR_BUILD_FOLDER%
+- vcpkg install jsoncpp:x86-windows
+- vcpkg install jsoncpp:x64-windows
+- vcpkg integrate install
+- "%PYTHON% -m pip install --user --upgrade pip"
+- "%PYTHON% -m pip install --user --upgrade setuptools wheel tox"
 cache:
 - C:\ProgramData\chocolatey\bin -> .appveyor.yml
 - C:\ProgramData\chocolatey\lib -> .appveyor.yml
+- C:\Tools\vcpkg\installed -> .appveyor.yml
 before_build:
 - mkdir BLD
 - cd BLD
-- cmake -G "%CMAKE_GENERATOR%" %QPID_PROTON_CMAKE_ARGS% ..
+- cmake %VCPKG_INTEGRATION% -G "%CMAKE_GENERATOR%" -DPYTHON_EXECUTABLE=%PYTHON% %QPID_PROTON_CMAKE_ARGS% ..
 - cd ..
 build:
   project: BLD/Proton.sln

.asf.yaml

@@ -0,0 +1,39 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+github:
+  description: "Mirror of Apache Qpid Proton"
+  homepage: https://qpid.apache.org/proton
+  labels:
+    - qpid
+    - amqp
+    - messaging
+    - library
+    - apache
+
+    - amqp-client
+    - amqp-connection
+    - amqp-messages
+    - amqps
+    - amqp10
+
+    - c
+    - cpp
+    - golang
+    - ruby
+    - python
+    - python2
+    - python3

.travis.yml

@@ -22,7 +22,8 @@ language: cpp
 compiler:
 - gcc
 - clang
-
+env:
+- OPENSSL_ia32cap='0x00000000'
 
 matrix:
   include:
@@ -33,31 +34,25 @@ matrix:
     - bash <(curl -s https://codecov.io/bash)
 
   - os: osx
-    osx_image: xcode7.3
+    osx_image: xcode9.4
     env:
-    - PKG_CONFIG_PATH='/usr/local/opt/openssl/lib/pkgconfig'
     - PATH="/usr/local/opt/python/libexec/bin:/usr/local/bin:$PATH"
-    - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DBUILD_RUBY=NO'
-    before_install:
-    - brew update
-    - brew upgrade cmake openssl
-    - brew install libuv swig
+    - PKG_CONFIG_PATH='/usr/local/opt/[email protected]/lib/pkgconfig'
+    - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13'
+    # python-tox-test segfaults and ruby tests do not start due to dynamic library issues
+    - QPID_PROTON_CTEST_ARGS="--exclude-regex 'python-tox-test|ruby.*'"
 
   - os: osx
-    osx_image: xcode9
+    osx_image: xcode11.3
     env:
-    - PKG_CONFIG_PATH='/usr/local/opt/openssl/lib/pkgconfig'
     - PATH="/usr/local/opt/python/libexec/bin:/usr/local/bin:$PATH"
-    - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DBUILD_RUBY=NO'
-    before_install:
-    - brew update
-    - brew uninstall postgis
-    - brew upgrade cmake python openssl
-    - brew install libuv swig
+    - PKG_CONFIG_PATH='/usr/local/opt/[email protected]/lib/pkgconfig'
+    - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14'
+    # python-tox-test segfaults and ruby tests do not start due to dynamic library issues
+    - QPID_PROTON_CTEST_ARGS="--exclude-regex 'python-tox-test|ruby.*'"
 
-# Note addons is apt specific at the moment and will not be applied for osx.
-# See before_install brew commands below
 addons:
+  # Ubuntu 16.04 APT dependencies, https://packages.ubuntu.com/
   apt:
     packages:
     - cmake
@@ -73,10 +68,19 @@ addons:
     - golang
     - lcov
     - libjsoncpp-dev
+  # macOS Homebrew dependencies, https://formulae.brew.sh/
+  homebrew:
+    packages:
+      - jsoncpp
+      - libuv
+      - swig
+# update:true workaround as of Feb. 22/20 as per
+# https://travis-ci.community/t/macos-build-fails-because-of-homebrew-bundle-unknown-command/7296/10
+    update: true 
 
 install:
 - python -m pip install --user --upgrade pip
-- python -m pip install --user coverage tox
+- python -m pip install --user coverage setuptools wheel tox
 - gem install minitest
 
 before_script:
@@ -85,5 +89,4 @@ before_script:
 - cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/install ${QPID_PROTON_CMAKE_ARGS}
 
 script:
-- cmake --build . --target install && ctest -V ${QPID_PROTON_CTEST_ARGS}
-
+- cmake --build . --target install -- -j$(nproc) && eval ctest -V ${QPID_PROTON_CTEST_ARGS}

CMakeLists.txt

@@ -37,9 +37,10 @@ find_package (SWIG)
 find_package (CyrusSASL)
 
 enable_testing ()
+include(tests/PNAddTest.cmake)
 
 # Set up runtime checks (valgrind, sanitizers etc.)
-include(tests/RuntimeCheck.cmake)  
+include(tests/RuntimeCheck.cmake)
 
 ## Variables used across components
 
@@ -76,7 +77,7 @@ else (CMAKE_CONFIGURATION_TYPES)
   # There is a single build configuration
   # If the build type is not set then set the default
   if (NOT CMAKE_BUILD_TYPE)
-  set (CMAKE_BUILD_TYPE RelWithDebInfo CACHE string
+  set (CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
        "Build type: Debug, Release, RelWithDebInfo, MinSizeRel or Coverage (default RelWithDebInfo)" FORCE)
   endif ()
 
@@ -113,12 +114,8 @@ endif()
 # off if building there:
 if (APPLE)
   set (NOENABLE_WARNING_ERROR ON)
-  set (NOENABLE_UNDEFINED_ERROR ON)
 endif (APPLE)
 
-# Make LTO default to off until we can figure out the valgrind issues
-set (NOENABLE_LINKTIME_OPTIMIZATION ON)
-
 # Add options here called <whatever> they will turn into "ENABLE_<whatever" and can be
 # overridden on a platform specific basis above by NOENABLE_<whatever>
 set (OPTIONS WARNING_ERROR UNDEFINED_ERROR LINKTIME_OPTIMIZATION HIDE_UNEXPORTED_SYMBOLS FUZZ_TESTING)
@@ -275,7 +272,7 @@ foreach (LANG ${BINDING_LANGS})
   endif ()
 endforeach()
 
-set (PROTON_SHARE ${SHARE_INSTALL_DIR}/proton-${PN_VERSION})
+set (PROTON_SHARE ${SHARE_INSTALL_DIR}/proton)
 # End of variables used during install
 
 # Set result to a native search path - used by examples and binding tests.
@@ -289,17 +286,19 @@ macro(set_search_path result)
 endmacro()
 
 if (CMAKE_SYSTEM_NAME STREQUAL Windows)
-  # No change needed for windows already use correct separator
+  # CMake uses semicolon as list separator. Change ';'->'\;'
   function(to_native_path path result)
     file (TO_NATIVE_PATH "${path}" path)
-    set (${result} ${path} PARENT_SCOPE)
+    string (REPLACE ";" "\;" path "${path}")
+    # without this, ...;last\dir\ would later combine with list separator ; into \;
+    set (${result} "${path}\;" PARENT_SCOPE)
   endfunction()
 else (CMAKE_SYSTEM_NAME STREQUAL Windows)
   # Just change ';'->':'
   function(to_native_path path result)
     file (TO_NATIVE_PATH "${path}" path)
-    string (REGEX REPLACE ";" ":" path "${path}")
-    set (${result} ${path} PARENT_SCOPE)
+    string (REPLACE ";" ":" path "${path}")
+    set (${result} "${path}" PARENT_SCOPE)
   endfunction()
 endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
 
@@ -334,12 +333,19 @@ if(SWIG_FOUND)
   # Add any new swig bindings here - the directory name must be the same as the binding name
   list(APPEND BINDINGS python ruby)
 
+  if (POLICY CMP0078)
+    cmake_policy(SET CMP0078 OLD)
+  endif()
+  if (POLICY CMP0086)
+    cmake_policy(SET CMP0086 OLD)
+  endif()
   include(UseSWIG)
 
   # All swig modules should include ${PROTON_HEADERS} in SWIG_MODULE_<name>_EXTRA_DEPS
   file(GLOB PROTON_HEADERS "${CMAKE_SOURCE_DIR}/c/include/proton/*.h")
-  # All swig modules should include ${BINDING_DEPS} in swig_link_libraries
-  set (BINDING_DEPS qpid-proton)
+  # All swig modules should include ${BINDING_DEPS} or ${BINDING_DEPS_FULL} in swig_link_libraries
+  set (BINDING_DEPS qpid-proton-core)
+  set (BINDING_DEPS_FULL qpid-proton)
 
   # Add a block here to detect the prerequisites to build each language binding:
   #
@@ -348,15 +354,13 @@ if(SWIG_FOUND)
 
   # Prerequisites for Python wrapper:
   find_package (PythonLibs ${PYTHON_VERSION_STRING} EXACT)
-  # TODO aconway 2018-09-07: get python binding tests working with sanitizers
-  if (PYTHONLIBS_FOUND AND NOT SANITIZE_FLAGS)
+  if (PYTHONLIBS_FOUND)
     set (DEFAULT_PYTHON ON)
   endif ()
 
   # Prerequisites for Ruby:
   find_package(Ruby)
-  # TODO aconway 2018-09-07: get ruby binding tests working with sanitizers
-  if (RUBY_FOUND AND NOT SANITIZE_FLAGS)
+  if (RUBY_FOUND)
     set (DEFAULT_RUBY ON)
   endif ()
 endif()

INSTALL.md

@@ -50,10 +50,11 @@ language.
     $ yum install jsoncpp-devel                              # C++ optional config file
 
     # Dependencies needed to generate documentation
-    $ yum install epydoc                                     # Python
+    $ yum install python-sphinx                              # Python
     $ yum install rubygem-yard                               # Ruby
     $ yum install doxygen                                    # C, C++
 
+
 The following prerequisites are required to do a full build on
 Debian-based systems (Ubuntu).  If you do not wish to build a given
 language binding you can omit the dev package for that language.
@@ -71,7 +72,7 @@ language binding you can omit the dev package for that language.
     $ apt-get install swig python-dev ruby-dev
 
     # dependencies needed for python docs
-    $ apt-get install python-epydoc
+    $ apt-get install python-sphinx
 
 From the directory where you found this `INSTALL.md` file:
 

NOTICE.txt

@@ -1,5 +1,5 @@
 Apache Qpid Proton
-Copyright 2012-2019 The Apache Software Foundation
+Copyright 2012-2020 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

VERSION.txt

@@ -1 +1 @@
-0.27.0
+0.31.0-SNAPSHOT

azure-pipelines/azure-pipelines.yml

@@ -0,0 +1,53 @@
+# Azure Pipeline build definition
+#
+# Use RelWithDebInfo build configuration so that linking on Windows doesn't require the
+# usually absent python debug dll.
+#
+# Set up the Windows python version to be the x86 (32 bit) version so that we can use the
+# default cmake generator which uses the 32 bit compiler
+#
+variables:
+  Config: 'RelWithDebInfo'
+  PythonVersion: '3.6'
+  PythonArch: 'x64'
+  CmakeConfigExtraArgs: ''
+
+jobs:
+- job: Windows
+  variables:
+    PythonArch: 'x86'
+    CmakeConfigExtraArgs: '-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake'
+  pool:
+    vmImage: 'vs2017-win2016'
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: $(PythonVersion)
+      addToPath: true
+      architecture: $(PythonArch)
+  - script: |
+      choco install swig
+      vcpkg install jsoncpp
+      vcpkg integrate install
+    name: InstallExtraStuff
+  - template: steps.yml
+- job: Ubuntu
+  pool:
+    vmImage: 'ubuntu-18.04'
+  steps:
+  - script: sudo apt-get install -y swig libpython3-dev libsasl2-dev libjsoncpp-dev
+    name: InstallExtraStuff
+  - template: steps.yml
+- job: MacOS
+  variables:
+    PKG_CONFIG_PATH: '/usr/local/opt/[email protected]/lib/pkgconfig'
+    CmakeConfigExtraArgs: '-DPYTHON_EXECUTABLE=/usr/local/bin/python3 -DBUILD_RUBY=no'
+  pool:
+    vmImage: 'macOS-10.15'
+  steps:
+  - script: |
+      brew update
+      brew install libuv swig pkgconfig [email protected] jsoncpp
+      brew upgrade python@3 python@2 || true
+    name: InstallExtraStuff
+  - template: steps.yml

azure-pipelines/steps.yml

@@ -0,0 +1,34 @@
+steps:
+- task: UsePythonVersion@0
+  enabled: false
+  inputs:
+    versionSpec: $(PythonVersion)
+    addToPath: true
+    architecture: $(PythonArch)
+- script: |
+    python -m pip install --user --upgrade pip
+    python -m pip install --user setuptools wheel tox
+  name: InstallPythonModules
+- task: CMake@1
+  name: CMakeConfigure
+  inputs:
+    workingDirectory: 'BLD'
+    cmakeArgs: $(Build.SourcesDirectory) $(CmakeConfigExtraArgs)
+- task: CMake@1
+  name: CMakeBuild
+  inputs:
+    workingDirectory: 'BLD'
+    cmakeArgs: --build . --config $(Config)
+- script: ctest -C $(Config) -V -T Test --no-compress-output
+  displayName: CMakeTest
+  workingDirectory: 'BLD'
+  continueOnError: true
+- task: PublishTestResults@2
+  inputs:
+    testRunTitle: Test run on $(Agent.OS) build $(Build.BuildNumber)
+    testResultsFormat: cTest
+    testResultsFiles: '**/Test.xml'
+    buildConfiguration: $(Config)
+- bash: env | sort
+  displayName: Environment
+  condition: always()