Skip to content

Commit 9ce67d0

Browse files
authored
Release preparation (#203)
1 parent 482f849 commit 9ce67d0

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

.gitexternals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# -*- mode: cmake -*-
2-
# CMake/common https://github.com/Eyescale/CMake.git 11ee9c1
2+
# CMake/common https://github.com/Eyescale/CMake.git 3d5d284

.gitsubprojects

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# -*- mode: cmake -*-
2-
git_subproject(Servus https://github.com/HBPVIS/Servus.git 001588d)
3-
git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 640cd69)
4-
git_subproject(Pression https://github.com/Eyescale/Pression.git 0a6bf49)
2+
git_subproject(Servus https://github.com/HBPVIS/Servus.git 2da95ea)
3+
git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git e1ecab8)
4+
git_subproject(Pression https://github.com/Eyescale/Pression.git 8242c90)

.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ notifications:
33
on_success: never
44
language: cpp
55
sudo: false
6-
cache:
7-
ccache: true
8-
pip: true
9-
directories:
10-
- /usr/local
11-
before_cache:
12-
- brew cleanup
136
os:
147
- osx
158
env:

README.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
[TOC]
2-
3-
# Introduction {#Introduction}
1+
# Introduction
42

53
Collage is a cross-platform C++ library for building heterogenous, distributed
6-
applications. Among other things, it is the cluster backend for the [Equalizer
4+
applications. Among others, it is the cluster backend for the [Equalizer
75
parallel rendering framework](https://github.com/Eyescale/Equalizer). Collage
86
provides an abstraction of different network connections, peer-to-peer
97
messaging, node discovery, synchronization and high-performance,
@@ -28,7 +26,7 @@ available from [Eyescale](http://www.eyescale.ch). Please contact
2826
[info@eyescale.ch](mailto:info@eyescale.ch?subject=Collage%20support)
2927
for further information.
3028

31-
# Features {#Features}
29+
# Features
3230

3331
Collage provides different levels of abstraction to facilitate the
3432
development distributed applications:
@@ -43,21 +41,22 @@ development distributed applications:
4341
distribution for C++ objects based on delta serialization.
4442
* Detailed @ref Changelog
4543

46-
# Building {#Building}
44+
# Building
4745

48-
Collage is a cross-platform library, designed to run on any modern operating
49-
system, including all Unix variants and the Windows operating system. Collage
50-
uses CMake to create a platform-specific build environment. The following
51-
platforms and build environments are tested:
46+
Collage is a cross-platform library, designed to run on any modern
47+
operating system, including all Unix variants and the Windows operating
48+
system. It requires a C++11 compiler and uses CMake to create a
49+
platform-specific build environment. The following platforms and build
50+
environments are tested:
5251

53-
* Linux: Ubuntu 14.04, RHEL 6.6 (Makefile, Ninja)
52+
* Linux: Ubuntu 16.04, RHEL 6.8 (Makefile, Ninja)
5453
* Windows: 7 (Visual Studio 2012)
55-
* Mac OS X: 10.8 (Makefile, Ninja)
54+
* Mac OS X: 10.9 (Makefile, Ninja)
5655

5756
Building from source is as simple as:
5857

5958
git clone https://github.com/Eyescale/Collage.git
6059
mkdir Collage/build
6160
cd Collage/build
62-
cmake ..
63-
make
61+
cmake -GNinja ..
62+
ninja

doc/Changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog {#Changelog}
22

3+
# git master
4+
5+
# Release 1.6 (09-12-2016)
6+
7+
* [192](https://github.com/Eyescale/Collage/pull/192)
8+
Add remote launch capability
9+
310
# Release 1.5 (30-Jul-2016)
411

512
* [188](https://github.com/Eyescale/Collage/pull/188)

0 commit comments

Comments
 (0)