diff --git a/packaging/debian/changelog.in b/packaging/debian/changelog.in index fee1cd391..7ca717c54 100644 --- a/packaging/debian/changelog.in +++ b/packaging/debian/changelog.in @@ -1,3 +1,27 @@ +icl@PROP_SUFFIX@ (10.0.0+artful5) artful; urgency=low + + * Upload artful release version + + -- Alexander Neumann Tue, 22 Nov 2017 16:08:00 +0100 + +icl@PROP_SUFFIX@ (10.0.0+xenial1) xenial; urgency=low + + * Upload xenial release version + + -- Alexander Neumann Tue, 22 Nov 2017 15:12:00 +0100 + +icl@PROP_SUFFIX@ (10.0.0+trusty2) trusty; urgency=low + + * Added DBUILD_WITH_BULLET_OPTIONAL=@BUILD_WITH_BULLET@ to rules.in + + -- Alexander Neumann Tue, 22 Nov 2017 15:12:00 +0100 + +icl@PROP_SUFFIX@ (10.0.0+trusty1) trusty; urgency=low + + * Release version of 10.0.0 trusty + + -- Alexander Neumann Thu, 17 Nov 2017 14:17:00 +0100 + icl@PROP_SUFFIX@ (10.0.0+artful4) artful; urgency=low * Fix CMAKE_FLAGS for DEMOS, EXAMPLES and APPS diff --git a/packaging/debian/rules.in b/packaging/debian/rules.in index 99bfc1fc5..57abcbf03 100755 --- a/packaging/debian/rules.in +++ b/packaging/debian/rules.in @@ -49,4 +49,5 @@ override_dh_auto_configure: -DBUILD_WITH_LIBIRIMAGER=@BUILD_WITH_LIBIRIMAGER@ \ -DBUILD_WITH_LIBUDEV=@BUILD_WITH_LIBUDEV@ \ -DBUILD_WITH_BULLET=@BUILD_WITH_BULLET@ \ + -DBUILD_WITH_BULLET_OPTIONAL=@BUILD_WITH_BULLET@ \ .. diff --git a/packaging/packaging.md b/packaging/packaging.md index 4c7d9864a..1020fe2ce 100644 --- a/packaging/packaging.md +++ b/packaging/packaging.md @@ -43,7 +43,7 @@ The required container ID has been stored into `${LOCAL_WORKSPACE}/docker_contai ```bash # add new layer -docker commit $(cat {LOCAL_WORKSPACE}/docker_container_id.log) icl-trusty +docker commit $(cat ${LOCAL_WORKSPACE}/docker_container_id.log) icl-trusty # run docker interactively by passing '/bin/bash' AFTER the image name docker run -ti --mount type=bind,source=${LOCAL_WORKSPACE},target=/home/user/workspace icl-trusty /bin/bash ``` @@ -120,3 +120,23 @@ The following batch script builds the msi installer for Visual Studio 2017 Win64 ```bash packaging/scripts/windows-build.bat ``` + +### OSX + +From [here](https://github.com/Homebrew/brew/blob/master/docs/Bottles.md): + +Bottles are produced by installing a formula with `brew install --build-bottle ` and then bottling it with `brew bottle `. This outputs the bottle DSL which should be inserted into the formula file. + +Bottles have a DSL to be used in formulae which is contained in the `bottle do ... end` block. +A simple (and typical) example: + +```ruby +bottle do + sha256 "..." => :sierra + sha256 "..." => :el_capitan + sha256 "..." => :yosemite +end +``` + +An ICL bottle can be created (from `HEAD` aka `master`) with `brew install --HEAD --build-bottle icl`, the output has to be added to https://github.com/iclcv/homebrew-formulas while the bottle itself is added to the related tag/release. +The path to the bottle needs to be added to the icl formula as well as the new `root_url` ([ref](https://docs.brew.sh/Bottles.html)). This should be along the line of `https://github.com/iclcv/icl/releases/download/release-`.