Skip to content

Commit 6eadf47

Browse files
levlamlevlam
committed
Rename TdWindows to TdDotNet.
GitOrigin-RevId: 0bfff62c224dcbd316534649b119917280b3b398
1 parent 9874d08 commit 6eadf47

File tree

8 files changed

+46
-47
lines changed

8 files changed

+46
-47
lines changed

‎CMakeLists.txt‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
22

33
project(TDLib VERSION 1.1.3 LANGUAGES CXX C)
44

5-
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
6-
set(UWP 1)
7-
endif()
8-
95
option(TD_ENABLE_JNI "Use \"ON\" to enable JNI-compatible TDLib API.")
106
option(TD_ENABLE_DOTNET "Use \"ON\" to enable generation of C++/CLI or C++/CX TDLib API bindings.")
117

@@ -53,7 +49,6 @@ In FAST mode stack is unwinded only using frame pointers, which may fail. \
5349
In SAFE mode stack is unwinded using backtrace function from execinfo.h, which may be very slow. \
5450
By default both methods are used to achieve maximum speed and accuracy")
5551

56-
# LIBRARIES
5752
if (EMSCRIPTEN)
5853
# use prebuilt zlib
5954
set(ZLIB_FOUND 1)
@@ -283,7 +278,7 @@ set(TL_C_SCHEME_SOURCE
283278
set_source_files_properties(${TL_DOTNET_AUTO} PROPERTIES GENERATED TRUE)
284279
set(TL_DOTNET_SCHEME_SOURCE
285280
${TL_TD_DOTNET_AUTO}
286-
td/tl/tl_win_object.h
281+
td/tl/tl_dotnet_object.h
287282
)
288283

289284
set(TDLIB_SOURCE
@@ -595,27 +590,25 @@ if (TD_ENABLE_JNI AND NOT ANDROID) # jni is available by default on Android
595590
endif()
596591

597592
if (TD_ENABLE_DOTNET)
598-
add_library(TdWindows SHARED
599-
td/telegram/ClientWindows.cpp
600-
td/telegram/LogWindows.cpp
593+
add_library(TdDotNet SHARED
594+
td/telegram/ClientDotNet.cpp
595+
td/telegram/LogDotNet.cpp
601596
${TL_DOTNET_SCHEME_SOURCE}
602597
)
603-
target_link_libraries(TdWindows PRIVATE tdclient tdutils)
604-
target_include_directories(TdWindows PUBLIC
598+
target_link_libraries(TdDotNet PRIVATE tdclient tdutils)
599+
target_include_directories(TdDotNet PUBLIC
605600
$<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDES}>
606601
)
607602
if (NOT CMAKE_CROSSCOMPILING)
608-
add_dependencies(TdWindows generate_td_windows_api)
603+
add_dependencies(TdDotNet generate_dotnet_api)
609604
endif()
610-
if (UWP)
611-
set_target_properties(TdWindows PROPERTIES VS_WINRT_COMPONENT "true")
612-
target_compile_options(TdWindows PUBLIC "/ZW")
605+
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
606+
set_target_properties(TdDotNet PROPERTIES VS_WINRT_COMPONENT "true")
607+
target_compile_options(TdDotNet PUBLIC "/ZW")
613608
else()
614-
set_target_properties(TdWindows PROPERTIES COMPILE_FLAGS "/GR /clr")
615-
target_compile_options(TdWindows PUBLIC "/EHa")
609+
set_target_properties(TdDotNet PROPERTIES COMPILE_FLAGS "/GR /clr")
610+
target_compile_options(TdDotNet PUBLIC "/EHa")
616611
endif()
617-
618-
target_compile_options(TdWindows PUBLIC "/bigobj")
619612
endif()
620613

621614
# tdc - TDLib interface in pure c.
@@ -669,6 +662,9 @@ if (BIGOBJ)
669662
target_compile_options(tdclient PUBLIC ${BIGOBJ})
670663
target_compile_options(tdjson PUBLIC ${BIGOBJ})
671664
target_compile_options(tdjson_static PUBLIC ${BIGOBJ})
665+
if (TD_ENABLE_DOTNET)
666+
target_compile_options(TdDotNet PUBLIC "/bigobj")
667+
endif()
672668
endif()
673669

674670
if (EMSCRIPTEN)

‎sqlite/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ elseif (MSVC)
4040
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996")
4141
endif()
4242

43-
if (UWP)
44-
target_compile_options(tdsqlite PRIVATE /DSQLITE_OS_WINRT=1)
43+
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
44+
target_compile_definitions(tdsqlite PRIVATE -DSQLITE_OS_WINRT=1)
4545
endif()
4646

4747
install(TARGETS tdsqlite EXPORT TdTargets

‎td/generate/CMakeLists.txt‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ set(TL_C_AUTO
3838
)
3939

4040
set(TL_TD_DOTNET_AUTO
41-
${CMAKE_CURRENT_SOURCE_DIR}/auto/td/telegram/TdWindowsApi.cpp
42-
${CMAKE_CURRENT_SOURCE_DIR}/auto/td/telegram/TdWindowsApi.h
41+
${CMAKE_CURRENT_SOURCE_DIR}/auto/td/telegram/TdDotNetApi.cpp
42+
${CMAKE_CURRENT_SOURCE_DIR}/auto/td/telegram/TdDotNetApi.h
4343
PARENT_SCOPE
4444
)
4545

@@ -98,7 +98,7 @@ if (NOT CMAKE_CROSSCOMPILING)
9898
add_custom_target(tl_generate_common
9999
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
100100
COMMAND ${GENERATE_COMMON_CMD} COMMENT "Generate common tl source files"
101-
DEPENDS generate_common scheme/mtproto_api.tlo scheme/telegram_api.tlo scheme/secret_api.tlo scheme/td_api.tlo
101+
DEPENDS generate_common scheme/mtproto_api.tlo scheme/telegram_api.tlo scheme/secret_api.tlo ${TL_TD_API_TLO}
102102
)
103103
if (TD_ENABLE_JNI)
104104
target_compile_definitions(generate_common PRIVATE TD_ENABLE_JNI=1)
@@ -110,7 +110,7 @@ if (NOT CMAKE_CROSSCOMPILING)
110110
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
111111
COMMAND generate_c
112112
COMMENT "Generate C tl source files"
113-
DEPENDS generate_c scheme/td_api.tlo
113+
DEPENDS generate_c ${TL_TD_API_TLO}
114114
)
115115

116116
add_executable(td_generate_java_api ${TL_GENERATE_JAVA_SOURCE})
@@ -122,7 +122,7 @@ if (NOT CMAKE_CROSSCOMPILING)
122122
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
123123
COMMAND generate_json
124124
COMMENT "Generate JSON tl source files"
125-
DEPENDS generate_json scheme/td_api.tlo
125+
DEPENDS generate_json ${TL_TD_API_TLO}
126126
)
127127

128128
if (TD_ENABLE_JNI)
@@ -131,12 +131,14 @@ if (NOT CMAKE_CROSSCOMPILING)
131131
install(FILES scheme/td_api.tlo scheme/td_api.tl DESTINATION bin/td/generate/scheme)
132132
endif()
133133

134-
add_executable(generate_td_windows_api_exe generate_td_windows_api.cpp tl_writer_win.h)
135-
target_link_libraries(generate_td_windows_api_exe PRIVATE tdtl)
136-
add_custom_target(generate_td_windows_api
137-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
138-
COMMAND generate_td_windows_api_exe ${TL_TD_API_TLO}
139-
COMMENT "Generate tl-files"
140-
DEPENDS generate_td_windows_api_exe ${TL_TD_API_TLO}
141-
)
134+
if (TD_ENABLE_DOTNET)
135+
add_executable(td_generate_dotnet_api generate_dotnet.cpp tl_writer_dotnet.h)
136+
target_link_libraries(td_generate_dotnet_api PRIVATE tdtl)
137+
add_custom_target(generate_dotnet_api
138+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
139+
COMMAND td_generate_dotnet_api ${TL_TD_API_TLO}
140+
COMMENT "Generate .Net API files"
141+
DEPENDS td_generate_dotnet_api ${TL_TD_API_TLO}
142+
)
143+
endif()
142144
endif()

td/generate/generate_td_windows_api.cpp renamed to td/generate/generate_dotnet.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@
44
// Distributed under the Boost Software License, Version 1.0. (See accompanying
55
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
66
//
7+
#include "tl_writer_dotnet.h"
8+
79
#include "td/tl/tl_config.h"
810
#include "td/tl/tl_generate.h"
911

10-
#include "tl_writer_win.h"
11-
1212
int main(int argc, char *argv[]) {
1313
if (argc < 2) {
1414
return 1;
1515
}
1616

1717
td::tl::tl_config config_td = td::tl::read_tl_config_from_file(argv[1]);
1818

19-
td::tl::write_tl_to_file(config_td, "auto/td/telegram/TdWindowsApi.cpp",
20-
td::tl::TlWriterWinCommon("TdApi", false, "#include \"td/telegram/TdWindowsApi.h\"\n"));
21-
td::tl::write_tl_to_file(config_td, "auto/td/telegram/TdWindowsApi.h",
22-
td::tl::TlWriterWinCommon("TdApi", true, "#include \"td/telegram/td_api.h\"\n"));
23-
24-
return 0;
19+
td::tl::write_tl_to_file(config_td, "auto/td/telegram/TdDotNetApi.cpp",
20+
td::tl::TlWriterDotNet("TdApi", false, "#include \"td/telegram/TdDotNetApi.h\"\n"));
21+
td::tl::write_tl_to_file(config_td, "auto/td/telegram/TdDotNetApi.h",
22+
td::tl::TlWriterDotNet("TdApi", true, "#include \"td/telegram/td_api.h\"\n"));
2523
}

td/generate/tl_writer_win.h renamed to td/generate/tl_writer_dotnet.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
namespace td {
1717
namespace tl {
1818

19-
class TlWriterWinCommon : public TL_writer {
19+
class TlWriterDotNet : public TL_writer {
2020
public:
2121
bool is_header_;
2222
std::string prefix_;
23-
TlWriterWinCommon(const std::string &name, bool is_header, const std::string &prefix = "")
23+
TlWriterDotNet(const std::string &name, bool is_header, const std::string &prefix = "")
2424
: TL_writer(name), is_header_(is_header), prefix_(prefix) {
2525
}
2626
int get_max_arity(void) const override {
@@ -179,7 +179,7 @@ class TlWriterWinCommon : public TL_writer {
179179
std::string gen_output_begin(void) const override {
180180
return prefix_ +
181181
"#include \"td/utils/port/CxCli.h\"\n"
182-
"#include \"td/tl/tl_win_object.h\"\n\n"
182+
"#include \"td/tl/tl_dotnet_object.h\"\n\n"
183183
"namespace TdWindows {\n";
184184
}
185185
std::string gen_output_end() const override {

td/telegram/ClientWindows.cpp renamed to td/telegram/ClientDotNet.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
// Distributed under the Boost Software License, Version 1.0. (See accompanying
55
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
66
//
7-
#include "td/telegram/TdWindowsApi.h"
7+
#include "td/telegram/TdDotNetApi.h"
88

99
#include "td/telegram/Client.h"
1010

1111
#include "td/utils/port/CxCli.h"
1212

1313
namespace TdWindows {
14+
1415
using namespace CxCli;
1516

1617
public interface class ClientResultHandler {

td/telegram/LogWindows.cpp renamed to td/telegram/LogDotNet.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
#include "td/utils/port/CxCli.h"
1010

1111
namespace TdWindows {
12+
1213
using namespace CxCli;
14+
1315
public ref class Log sealed {
1416
public:
1517
static void SetFilePath(String^ filePath) {
@@ -24,4 +26,5 @@ public ref class Log sealed {
2426
::td::Log::set_verbosity_level(verbosityLevel);
2527
}
2628
};
29+
2730
} // namespace TdWindows

td/tl/tl_win_object.h renamed to td/tl/tl_dotnet_object.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "td/utils/misc.h"
1010
#include "td/utils/port/CxCli.h"
11-
#include "td/utils/tl_storers.h"
1211

1312
#include "td/telegram/td_api.h"
1413
#include "td/telegram/td_api.hpp"

0 commit comments

Comments
 (0)