Skip to content

Commit

Permalink
Merge pull request #332 from GMLC-TDC/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
phlptp authored May 25, 2018
2 parents 2da5950 + 2295679 commit fd9cf67
Show file tree
Hide file tree
Showing 102 changed files with 3,957 additions and 2,590 deletions.
11 changes: 11 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ _basic_env:
packages:
- g++-6
- valgrind
- &daily_osx
if: type = cron
os: osx
compiler: clang
- &linux_base
if: type != cron
os: linux
Expand Down Expand Up @@ -146,6 +150,13 @@ jobs:
- SHARED_LIB_EXT=so
- USE_SWIG=true
- CXX_STANDARD=17
# XCode 8gm, OS X 10.11
- <<: *daily_osx
env:
- MATRIX_EVAL="COMPILER=clang && BUILD_TYPE=Release && TRAVIS_XCODE_VERSION=8gm"
- HOMEBREW_NO_AUTO_UPDATE=1
- SHARED_LIB_EXT=dylib
osx_image: xcode8

branches:
except:
Expand Down
38 changes: 33 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,48 @@
# Changelog
All notable changes to this project after the 1.0.0 release will be documented in this file

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.1]
## [1.1.1] - 2018-05-25
### Added
- BrokerApp as a slightly more convenient runner to Brokers
- getXXSize functions directly in the Subscription object instead of a roundabout call in the C api
- more complete error catching for the C library
- added helics-config executable for getting paths and links and used flags
- added a broker app that can start up a broker easily

### Changed
- upgrade autobuild ZMQ version to 4.2.5 and change CMake scripts to use zmq target
- updated HELICSConfig.cmake install file to link properly to external libraries and find them if necessary, also included some find functions. The find_package(HELICS) should work properly now
- changed boost inclusion to use targets instead of files directly
- changed MPI inclusion to work better on windows and use targets instead of direct links
- update cereal library with latest bug fixes
- update jsoncpp with latest version
- update cppzmq with the latest version
- moved helics_broker executable code to the apps repository
- the CXX shared library can now be built alongside the C shared library and can be built on Windows.

### Fixed
- compilation issue with Xcode 8.0
- inconsistent numerical conversion from vectors to doubles in subscriptions

### Removed
- installation of HELICSImport.cmake this is now redundant with updated HELICSConfig.cmake

## [1.1.0] - 2018-05-09
### Added
- namedpoint functions in the C++ for publications and subscriptions, and corresponding functions in the C interface and language API's
- boolean publication and subscription for C++ interface, and corresponding functions in the C interface and language API's
- Boolean publication and subscription for C++ interface, and corresponding functions in the C interface and language API's
- new options for brokers, --local, --ipv4, --ipv6, --all, are shortcuts for specifying external network interfaces
- additional documentation, CONTRIBUTORS, ROADMAP, CONTRIBUTIONS, and some other other documentation improvements

### Changed
- the default interface configuration for federates and brokers. The --interface option is less important as interfaces should mostly get automatically determined by the broker address
- minor configuration changes to cmake to be more conforming with modern cmake best practices
- minor configuration changes to CMAKE configuration to be more conforming with modern CMAKE best practices
- cleaned up header installation for app directory
- shared libary construction now uses some headers generated by cmake
- shared library construction now uses some headers generated by CMAKE

### Fixed
- better error checking in the C interface
- fixes for occasionally failing tests
Expand Down
Loading

0 comments on commit fd9cf67

Please sign in to comment.