From cfba1c173f3e1d5b24755c118ae0470b6789ca7f Mon Sep 17 00:00:00 2001 From: Michael Insel Date: Tue, 7 May 2019 16:27:40 +0200 Subject: [PATCH 1/4] Doc: Fix Windows Dev Env indentation This fixes the broken indentation in the Development with Visual Studio chapter (only visible in MkDocs). --- doc/21-development.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/21-development.md b/doc/21-development.md index fe0da2ccd..467337d2c 100644 --- a/doc/21-development.md +++ b/doc/21-development.md @@ -985,30 +985,30 @@ You need a free Microsoft account to download and also store your preferences. Choose these individual components on Visual Studio 2017: * .NET - * .NET Framework 4.6 targeting pack - * .NET Framework 4.6.1 SDK - * .NET Framework 4.6.1 targeting pack + * .NET Framework 4.6 targeting pack + * .NET Framework 4.6.1 SDK + * .NET Framework 4.6.1 targeting pack * Code tools - * Git for Windows - * Static analysis tools + * Git for Windows + * Static analysis tools * Compilers, build tools and runtimes - * C# and Visual Basic Roslyn compilers - * C++/CU Support - * VC++ 2017 v141 toolset (x86_64) + * C# and Visual Basic Roslyn compilers + * C++/CU Support + * VC++ 2017 v141 toolset (x86_64) * Debugging and testing - * C++ profiling tools - * Just-in-Time debugger + * C++ profiling tools + * Just-in-Time debugger * Development activities - * Visual Studio C++ core features + * Visual Studio C++ core features * Games and Graphics - * Graphics debugger and GPU profiler for DirectX (required by C++ profiling tools) + * Graphics debugger and GPU profiler for DirectX (required by C++ profiling tools) * SDKs, libraries and frameworks - * Graphics Tools Windows 8.1 SDK (required by C++ profiling tools) - * Windows 10 SDK **10.0.10240.0 - exactly this version** - * Windows 8.1 SDK - * Windows Universal C Runtime + * Graphics Tools Windows 8.1 SDK (required by C++ profiling tools) + * Windows 10 SDK **10.0.10240.0 - exactly this version** + * Windows 8.1 SDK + * Windows Universal C Runtime * Uncategorized - * GitHub Extension for Visual Studio + * GitHub Extension for Visual Studio After a while, Visual Studio will be ready. From cb9424636cb5a4881b125daceacadf5888d9f49c Mon Sep 17 00:00:00 2001 From: Michael Insel Date: Tue, 7 May 2019 16:30:06 +0200 Subject: [PATCH 2/4] Doc: Move VS Github extension under code tools The Visual Studio Github extension is located under code tools. --- doc/21-development.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/21-development.md b/doc/21-development.md index 467337d2c..d437de18e 100644 --- a/doc/21-development.md +++ b/doc/21-development.md @@ -991,6 +991,7 @@ Choose these individual components on Visual Studio 2017: * Code tools * Git for Windows * Static analysis tools + * GitHub Extension for Visual Studio * Compilers, build tools and runtimes * C# and Visual Basic Roslyn compilers * C++/CU Support @@ -1007,8 +1008,6 @@ Choose these individual components on Visual Studio 2017: * Windows 10 SDK **10.0.10240.0 - exactly this version** * Windows 8.1 SDK * Windows Universal C Runtime -* Uncategorized - * GitHub Extension for Visual Studio After a while, Visual Studio will be ready. From ea8f367873390a7da2bdc11ab8f70a915cf06c04 Mon Sep 17 00:00:00 2001 From: Michael Insel Date: Tue, 7 May 2019 17:08:23 +0200 Subject: [PATCH 3/4] Doc: Fix package build indentation This fixes the broken indentation in the development package build chapter (only visible in MkDocs). --- doc/21-development.md | 51 ++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/doc/21-development.md b/doc/21-development.md index d437de18e..c215a30d8 100644 --- a/doc/21-development.md +++ b/doc/21-development.md @@ -1271,44 +1271,44 @@ Icinga application using a dist tarball (including notes for distributions): * cmake >= 2.6 * GNU make (make) or ninja-build * C++ compiler which supports C++11 - * RHEL/Fedora/SUSE: gcc-c++ >= 4.7 (extra Developer Tools on RHEL5/6 see below) - * Debian/Ubuntu: build-essential - * Alpine: build-base - * you can also use clang++ + * RHEL/Fedora/SUSE: gcc-c++ >= 4.7 (extra Developer Tools on RHEL5/6 see below) + * Debian/Ubuntu: build-essential + * Alpine: build-base + * you can also use clang++ * pkg-config * OpenSSL library and header files >= 1.0.1 - * RHEL/Fedora: openssl-devel - * SUSE: libopenssl-devel - * Debian/Ubuntu: libssl-dev - * Alpine: libressl-dev + * RHEL/Fedora: openssl-devel + * SUSE: libopenssl-devel + * Debian/Ubuntu: libssl-dev + * Alpine: libressl-dev * Boost library and header files >= 1.66.0 - * RHEL/Fedora: boost166-devel - * Debian/Ubuntu: libboost-all-dev - * Alpine: boost-dev + * RHEL/Fedora: boost166-devel + * Debian/Ubuntu: libboost-all-dev + * Alpine: boost-dev * GNU bison (bison) * GNU flex (flex) >= 2.5.35 * systemd headers - * Only required when using systemd - * Debian/Ubuntu: libsystemd-dev - * RHEL/Fedora: systemd-devel + * Only required when using systemd + * Debian/Ubuntu: libsystemd-dev + * RHEL/Fedora: systemd-devel ### Optional features * MySQL (disable with CMake variable `ICINGA2_WITH_MYSQL` to `OFF`) - * RHEL/Fedora: mysql-devel - * SUSE: libmysqlclient-devel - * Debian/Ubuntu: default-libmysqlclient-dev | libmysqlclient-dev - * Alpine: mariadb-dev + * RHEL/Fedora: mysql-devel + * SUSE: libmysqlclient-devel + * Debian/Ubuntu: default-libmysqlclient-dev | libmysqlclient-dev + * Alpine: mariadb-dev * PostgreSQL (disable with CMake variable `ICINGA2_WITH_PGSQL` to `OFF`) - * RHEL/Fedora: postgresql-devel - * Debian/Ubuntu: libpq-dev - * postgresql-dev on Alpine + * RHEL/Fedora: postgresql-devel + * Debian/Ubuntu: libpq-dev + * postgresql-dev on Alpine * libedit (CLI console) - * RHEL/Fedora: libedit-devel on CentOS (RHEL requires rhel-7-server-optional-rpms) - * Debian/Ubuntu/Alpine: libedit-dev + * RHEL/Fedora: libedit-devel on CentOS (RHEL requires rhel-7-server-optional-rpms) + * Debian/Ubuntu/Alpine: libedit-dev * Termcap (only required if libedit doesn't already link against termcap/ncurses) - * RHEL/Fedora: libtermcap-devel - * Debian/Ubuntu: (not necessary) + * RHEL/Fedora: libtermcap-devel + * Debian/Ubuntu: (not necessary) ### Special requirements @@ -1679,6 +1679,7 @@ The Windows MSI packages are located at https://packages.icinga.com/windows/ Download the community edition from [visualstudio.com](https://www.visualstudio.com/en/downloads/) Workloads to install: + * C++ Desktop * .NET Desktop From 24ca8075eeb26873b8835f06d4890f84176a0832 Mon Sep 17 00:00:00 2001 From: Michael Insel Date: Tue, 7 May 2019 17:22:30 +0200 Subject: [PATCH 4/4] Doc: Install C++ & .NET Desktop in Windows Dev Env For developing the Icinga Windows parts you need the C++ Desktop and .NET Desktop workloads in Visual Studio. --- doc/21-development.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/21-development.md b/doc/21-development.md index c215a30d8..fa855cfbf 100644 --- a/doc/21-development.md +++ b/doc/21-development.md @@ -982,7 +982,12 @@ the web installer and start the installation. You need a free Microsoft account to download and also store your preferences. -Choose these individual components on Visual Studio 2017: +Install the following Workloads: + +* C++ Desktop +* .NET Desktop + +In addition also choose these individual components on Visual Studio 2017: * .NET * .NET Framework 4.6 targeting pack @@ -994,7 +999,7 @@ Choose these individual components on Visual Studio 2017: * GitHub Extension for Visual Studio * Compilers, build tools and runtimes * C# and Visual Basic Roslyn compilers - * C++/CU Support + * C++/CLI Support * VC++ 2017 v141 toolset (x86_64) * Debugging and testing * C++ profiling tools