Fix UWP documentation generation.

Author: levlam

CMakeLists.txt

@@ -28,7 +28,7 @@ prevent_in_source_build()
 option(TD_INSTALL_STATIC_LIBRARIES "Enable installation of static libraries." ON)
 option(TD_INSTALL_SHARED_LIBRARIES "Enable installation of shared libraries." ON)
 option(TD_ENABLE_JNI "Use \"ON\" to enable JNI-compatible TDLib API.")
-option(TD_ENABLE_DOTNET "Use \"ON\" to enable generation of C++/CLI or C++/CX TDLib API bindings.")
+option(TD_ENABLE_DOTNET "Use \"ON\" or \"CX\" to enable generation of C++/CLI or C++/CX TDLib API bindings respectively.")
 if (NOT CMAKE_CROSSCOMPILING)
   option(TD_GENERATE_SOURCE_FILES "Use \"ON\" to just generate TDLib source files.")
 endif()

README.md

@@ -116,7 +116,7 @@ See [example/java](https://github.com/tdlib/td/tree/master/example/java) for exa
 
 <a name="using-dotnet"></a>
 ## Using in .NET projects
-`TDLib` provides native .NET interface through `C++/CLI` and `C++/CX`. To enable it, specify option `-DTD_ENABLE_DOTNET=ON` to CMake.
+`TDLib` provides native .NET interface through `C++/CLI` and `C++/CX`. To enable it, specify option `-DTD_ENABLE_DOTNET=ON` or `-DTD_ENABLE_DOTNET=CX` respectively to CMake.
 .NET Core supports `C++/CLI` only since version 3.1 and only on Windows, so if older .NET Core is used or portability is needed, then `TDLib` JSON interface should be used through P/Invoke instead.
 
 See [example/csharp](https://github.com/tdlib/td/tree/master/example/csharp) for example of using `TDLib` from C# and detailed build and usage instructions.

build.html

@@ -1008,7 +1008,10 @@
     if (target === 'JNI') {
       cmake_init_options.push('-DTD_ENABLE_JNI=ON');
     }
-    if (target === 'C++/CX' || target === 'C++/CLI') {
+    if (target === 'C++/CX') {
+      cmake_init_options.push('-DTD_ENABLE_DOTNET=CX');
+    }
+    if (target === 'C++/CLI') {
       cmake_init_options.push('-DTD_ENABLE_DOTNET=ON');
     }
     if (use_lto) {

example/uwp/build.ps1

@@ -40,7 +40,7 @@ function prepare {
 
   cd build-native
 
-  cmake -A Win32 -DTD_GENERATE_SOURCE_FILES=ON -DTD_ENABLE_DOTNET=ON "$td_root"
+  cmake -A Win32 -DTD_GENERATE_SOURCE_FILES=ON -DTD_ENABLE_DOTNET=CX "$td_root"
   CheckLastExitCode
   cmake --build .
   CheckLastExitCode
@@ -61,7 +61,7 @@ function config {
     if ($arch -eq "x86") {
       $fixed_arch = "win32"
     }
-    cmake -A $fixed_arch -DCMAKE_SYSTEM_VERSION="10.0" -DCMAKE_SYSTEM_NAME="WindowsStore" -DCMAKE_TOOLCHAIN_FILE="$vcpkg_cmake" -DTD_ENABLE_DOTNET=ON "$td_root"
+    cmake -A $fixed_arch -DCMAKE_SYSTEM_VERSION="10.0" -DCMAKE_SYSTEM_NAME="WindowsStore" -DCMAKE_TOOLCHAIN_FILE="$vcpkg_cmake" -DTD_ENABLE_DOTNET=CX "$td_root"
     CheckLastExitCode
     cd ..
   }

td/generate/CMakeLists.txt

@@ -208,7 +208,7 @@ if (NOT CMAKE_CROSSCOMPILING)
 
   if (TD_ENABLE_DOTNET)
     if (PHP_EXECUTABLE)
-      set(GENERATE_DOTNET_API_CMD td_generate_dotnet_api ${TD_API_TLO_FILE} && ${PHP_EXECUTABLE} ../DotnetTlDocumentationGenerator.php ../scheme/td_api.tl td/telegram/Telegram.Td.xml ${CMAKE_SYSTEM_NAME})
+      set(GENERATE_DOTNET_API_CMD td_generate_dotnet_api ${TD_API_TLO_FILE} && ${PHP_EXECUTABLE} ../DotnetTlDocumentationGenerator.php ../scheme/td_api.tl td/telegram/Telegram.Td.xml ${TD_ENABLE_DOTNET})
     else()
       set(GENERATE_DOTNET_API_CMD td_generate_dotnet_api ${TD_API_TLO_FILE})
     endif()

td/generate/DotnetTlDocumentationGenerator.php

@@ -345,12 +345,12 @@ protected function addFullConstructorDocumentation($class_name, $class_descripti
         $this->addDocumentation("M:$class_name.#ctor($full_constructor)", $full_doc);
     }
 
-    public function __construct($system_name) {
-        $this->cpp_cli = $system_name !== 'WindowsStore';
+    public function __construct($flavor_name) {
+        $this->cpp_cli = $flavor_name !== 'CX';
     }
 }
 
-$system_name = isset($argv[3]) ? $argv[3] : 'Windows';
+$flavor_name = isset($argv[3]) ? $argv[3] : 'Windows';
 
-$generator = new DotnetTlDocumentationGenerator($system_name);
+$generator = new DotnetTlDocumentationGenerator($flavor_name);
 $generator->generate($argv[1], $argv[2]);