From 8c4f9230d1f097a788ff5be767252fc8e64e348b Mon Sep 17 00:00:00 2001 From: Taiyeba Date: Fri, 3 May 2019 10:06:17 +0200 Subject: [PATCH 1/3] README: Highlights our conan bintray repository --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e421d9cf14..374b5c3d2f 100755 --- a/README.md +++ b/README.md @@ -60,7 +60,10 @@ The following command will configure conan to use our build profiles and remote ```text $ conan config install https://github.com/includeos/conan_config.git ``` -If you prefer to set up conan manually the full configuration can be found in the [conan_config](https://github.com/includeos/conan_config.git)-repository. + +> If you prefer to set up conan manually the full configuration can be found in the [conan_config](https://github.com/includeos/conan_config.git) repository. You can browse our **prebuilt conan packages** on our **[includeos bintray/includeos](https://bintray.com/includeos)** at https://bintray.com/includeos. + + #### Ubuntu @@ -106,7 +109,7 @@ If you are interested in editing/building our dependency packages on your own, y ## Managing dependencies -Prebuilt packages are uploaded to our [bintray repository](https://bintray.com/includeos). +Prebuilt conan packages are uploaded to our [includeos bintray repository](https://bintray.com/includeos/includeos). We upload to two channels: From 8b4dd93c6441da194ad45768c637546cb329a91e Mon Sep 17 00:00:00 2001 From: Martin Nordsletten Date: Wed, 8 May 2019 09:35:32 +0200 Subject: [PATCH 2/3] README: Fixed wording and link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 374b5c3d2f..19004d85cb 100755 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The following command will configure conan to use our build profiles and remote $ conan config install https://github.com/includeos/conan_config.git ``` -> If you prefer to set up conan manually the full configuration can be found in the [conan_config](https://github.com/includeos/conan_config.git) repository. You can browse our **prebuilt conan packages** on our **[includeos bintray/includeos](https://bintray.com/includeos)** at https://bintray.com/includeos. +> If you prefer to set up conan manually the full configuration can be found in the [conan_config](https://github.com/includeos/conan_config.git) repository. You can browse our prebuilt conan packages in [bintray.com/includeos](https://bintray.com/includeos). @@ -109,7 +109,7 @@ If you are interested in editing/building our dependency packages on your own, y ## Managing dependencies -Prebuilt conan packages are uploaded to our [includeos bintray repository](https://bintray.com/includeos/includeos). +Prebuilt conan packages are uploaded to our [bintray repository](https://bintray.com/includeos/includeos). We upload to two channels: From 2f88e4f9f64100cf4b5dd5f595850491f4178b97 Mon Sep 17 00:00:00 2001 From: Martin Nordsletten Date: Thu, 9 May 2019 09:13:57 +0200 Subject: [PATCH 3/3] README: Changed all notes to bold without quote --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 19004d85cb..bd778b5d19 100755 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The following command will configure conan to use our build profiles and remote $ conan config install https://github.com/includeos/conan_config.git ``` -> If you prefer to set up conan manually the full configuration can be found in the [conan_config](https://github.com/includeos/conan_config.git) repository. You can browse our prebuilt conan packages in [bintray.com/includeos](https://bintray.com/includeos). +**Note:** If you prefer to set up conan manually the full configuration can be found in the [conan_config](https://github.com/includeos/conan_config.git) repository. You can browse our prebuilt conan packages in [bintray.com/includeos](https://bintray.com/includeos). @@ -116,7 +116,7 @@ We upload to two channels: - `stable`: this channel has all the stable packages. - `latest`: this channel will have the latest packages in development/test phase (including stable releases). -> **Note:** We only guarantee that the **latest 10 packages** are kept in the `latest` channel. All `stable` packages will be kept in the stable channel unless proven unsafe. One suggested workaround is to copy packages into your own repository. +**Note:** We only guarantee that the **latest 10 packages** are kept in the `latest` channel. All `stable` packages will be kept in the stable channel unless proven unsafe. One suggested workaround is to copy packages into your own repository. To set up our remote, we recommend following the steps listed in [Dependencies](#dependencies). @@ -156,7 +156,7 @@ You can read more about how editable mode works in the [Conan documentation](htt Below we have written down a few steps to get you started with editable packages and IncludeOS. -> **Note:** Currently this is an experimental feature on conan version 1.13 and they have mentioned that for future releases the feature is subject to breaking changes. +**Note:** Currently this is an experimental feature on conan version 1.13 and they have mentioned that for future releases the feature is subject to breaking changes. Start by cloning the IncludeOS source code and create a `build` folder. You have to edit `etc/layout.txt` in the source code to point to the `build` folder you created, by updating the `build_dir` variable. @@ -193,7 +193,7 @@ The layout will look similar to the example below. You only have to update `buil {{ build_dir }} ``` -> **Note:** in the non simple form it is possible to have multiple build folders from the same source which allows multiple architectures and configurations to be tested from the same source however the complexity increases +**Note:** in the non simple form it is possible to have multiple build folders from the same source which allows multiple architectures and configurations to be tested from the same source however the complexity increases You should now be able to set the package in editable mode. The following command will add the package as editable based on the specified layout. We inspect the package to get the version, as this has to match exactly.