Skip to content

Commit c4dcb62

Browse files
MisterTeaMisterTea
authored
rev deps (#696)
* rev deps * circleci image * force zlib * work * turn off telemetry for circleci * . * apple * rev * fix windows * windows * work * windows * .
1 parent 46fbe72 commit c4dcb62

File tree

10 files changed

+57
-67
lines changed

10 files changed

+57
-67
lines changed

‎.circleci/config.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
connect_to_initial_version:
44
machine:
5-
image: ubuntu-2004:202101-01
5+
image: ubuntu-2204:current
66
steps:
77
- run:
88
name: Avoid hosts unknown for github
@@ -31,25 +31,25 @@ jobs:
3131
no_output_timeout: 60m
3232
- run:
3333
name: Connect new -> old
34-
command: sudo ../root_version/build/etserver --daemon; sudo cp ../root_version/build/etterminal /usr/bin/etterminal; sleep 3; build/et -c "ls" localhost --logtostdout --verbose=9
34+
command: export ET_NO_TELEMETRY=YES; sudo ../root_version/build/etserver --daemon; sudo cp ../root_version/build/etterminal /usr/bin/etterminal; sleep 3; build/et -c "ls" localhost --logtostdout --verbose=9
3535
- run:
3636
name: Connect new -> old (ipv6)
37-
command: build/et -c "ls" 0:0:0:0:0:0:0:1 --logtostdout --verbose=9
37+
command: ET_NO_TELEMETRY=YES build/et -c "ls" 0:0:0:0:0:0:0:1 --logtostdout --verbose=9
3838
- run:
3939
name: Connect new -> old (ipv6 with port in host)
40-
command: build/et -c "ls" 0:0:0:0:0:0:0:1:2022 --logtostdout --verbose=9
40+
command: ET_NO_TELEMETRY=YES build/et -c "ls" 0:0:0:0:0:0:0:1:2022 --logtostdout --verbose=9
4141
- run:
4242
name: Connect new -> old (ipv6 abbreviated)
43-
command: build/et -c "ls" ::1 --logtostdout --verbose=9
43+
command: ET_NO_TELEMETRY=YES build/et -c "ls" ::1 --logtostdout --verbose=9
4444
- run:
4545
name: Connect new -> old (ipv6 abbreviated with port arg)
46-
command: build/et -c "ls" ::1 --port 2022 --logtostdout --verbose=9
46+
command: ET_NO_TELEMETRY=YES build/et -c "ls" ::1 --port 2022 --logtostdout --verbose=9
4747
- run:
4848
name: Kill server
4949
command: sudo pkill etserver
5050
- run:
5151
name: Connect old -> new
52-
command: export TERM=xterm-256color; sudo build/etserver --daemon; sudo cp build/etterminal /usr/bin/etterminal; sleep 3; ../root_version/build/et -c "ls" localhost --logtostdout --verbose=9
52+
command: export TERM=xterm-256color; export ET_NO_TELEMETRY=YES; sudo build/etserver --daemon; sudo cp build/etterminal /usr/bin/etterminal; sleep 3; ../root_version/build/et -c "ls" localhost --logtostdout --verbose=9
5353
- run:
5454
name: Kill server
5555
command: sudo pkill etserver
@@ -60,7 +60,7 @@ jobs:
6060

6161
connect_with_jumphost:
6262
machine:
63-
image: ubuntu-2004:202101-01
63+
image: ubuntu-2204:current
6464
steps:
6565
- run:
6666
name: Avoid hosts unknown for github

‎CMakeLists.txt‎

Lines changed: 41 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,27 @@ cmake_minimum_required(VERSION 3.16.3)
22

33
set(EXTERNAL_DIR "${CMAKE_SOURCE_DIR}/external")
44

5+
if(MSVC)
6+
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
7+
endif()
8+
9+
if(APPLE)
10+
if(NOT CMAKE_OSX_SYSROOT)
11+
set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk")
12+
endif()
13+
endif()
14+
515
if(DISABLE_VCPKG)
616
else()
717
# Enable vcpkg
818
set(CMAKE_TOOLCHAIN_FILE
919
"${EXTERNAL_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake")
10-
20+
set(VCPKG_INSTALL_OPTIONS "--allow-unsupported")
21+
1122
# Set the triplet
1223
if(WIN32)
1324
set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "VCPKG Triplet")
25+
set(protobuf_MSVC_STATIC_RUNTIME ON)
1426
elseif(APPLE)
1527
execute_process(
1628
COMMAND uname -m
@@ -47,41 +59,40 @@ else()
4759

4860
# Some hacks to fix vcpkg
4961
if(WIN32)
50-
set(Protobuf_PROTOC_EXECUTABLE
51-
"${EXTERNAL_DIR}/vcpkg/packages/protobuf_${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc.exe"
52-
)
53-
set(ZLIB_LIBRARY_RELEASE
54-
"${CMAKE_CURRENT_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/lib/zlib.lib"
55-
)
56-
set(ZLIB_LIBRARY_DEBUG
57-
"${CMAKE_CURRENT_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/debug/lib/zlibd.lib"
58-
)
62+
# set(Protobuf_PROTOC_EXECUTABLE
63+
# "${EXTERNAL_DIR}/vcpkg/packages/protobuf_${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc.exe"
64+
# )
65+
# set(ZLIB_INCLUDE_DIR
66+
# "${CMAKE_CURRENT_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/include" CACHE PATH
67+
# )
68+
# set(ZLIB_LIBRARY_RELEASE
69+
# "${CMAKE_CURRENT_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/lib/zlib.lib" CACHE FILEPATH
70+
# )
71+
# set(ZLIB_LIBRARY_DEBUG
72+
# "${CMAKE_CURRENT_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/debug/lib/zlibd.lib" CACHE FILEPATH
73+
# )
5974
else()
60-
# Make BoostConfig.cmake able to check its inputs
61-
cmake_policy(SET CMP0057 NEW)
75+
# set(Protobuf_PROTOC_EXECUTABLE
76+
# "${EXTERNAL_DIR}/vcpkg/packages/protobuf_${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc"
77+
# )
78+
endif()
6279

63-
# Honor the visibility properties for all target types, including
64-
# object libraries and static libraries.
65-
cmake_policy(SET CMP0063 NEW)
80+
# Make BoostConfig.cmake able to check its inputs
81+
cmake_policy(SET CMP0057 NEW)
6682

67-
# Don't ignore <PackageName>_ROOT variables
68-
cmake_policy(SET CMP0074 NEW)
69-
set(Protobuf_PROTOC_EXECUTABLE
70-
"${EXTERNAL_DIR}/vcpkg/packages/protobuf_${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc"
71-
)
72-
endif()
83+
# Honor the visibility properties for all target types, including
84+
# object libraries and static libraries.
85+
cmake_policy(SET CMP0063 NEW)
86+
87+
# Don't ignore <PackageName>_ROOT variables
88+
cmake_policy(SET CMP0074 NEW)
7389

7490
set(Protobuf_USE_STATIC_LIBS ON)
75-
set(protobuf_MSVC_STATIC_RUNTIME ON)
7691
endif()
7792

7893
message(STATUS "VCPKG TRIPLET: ${VCPKG_TARGET_TRIPLET}")
7994

80-
# Don't specify languages yet in case we need to bump the cmake version
81-
project(EternalTCP VERSION 6.2.9 LANGUAGES NONE)
82-
83-
enable_language(C)
84-
enable_language(CXX)
95+
project(EternalTCP VERSION 6.2.9 LANGUAGES C CXX)
8596

8697
include(CMakeFindDependencyMacro)
8798

@@ -91,14 +102,15 @@ set(CMAKE_MODULE_PATH "${EXTERNAL_DIR}/sanitizers-cmake/cmake" ${CMAKE_MODULE_PA
91102

92103
# Do not install httplib files
93104
set(HTTPLIB_INSTALL OFF)
105+
set(HTTPLIB_USE_ZSTD_IF_AVAILABLE OFF)
94106

95107
# Required packages
108+
find_package(ZLIB REQUIRED)
96109
find_package(OpenSSL REQUIRED)
97110
find_package(Sanitizers REQUIRED)
98111
find_package(Threads REQUIRED)
99112
find_package(sodium REQUIRED)
100113
find_package(Protobuf REQUIRED)
101-
find_package(ZLIB REQUIRED)
102114
find_package(Unwind)
103115

104116
if(DISABLE_VCPKG)
@@ -225,29 +237,7 @@ if(WIN32)
225237
add_definitions(-D_UNICODE)
226238
endif()
227239

228-
option(FULL_PROTOBUF "Link to full protobuf library instead of protobuf-lite" ON)
229-
230-
if(FULL_PROTOBUF)
231-
if(WIN32)
232-
set(PROTOBUF_LIBS protobuf::libprotobuf)
233-
else()
234-
set(PROTOBUF_LIBS ${PROTOBUF_LIBRARIES})
235-
endif()
236-
else()
237-
if(WIN32)
238-
set(PROTOBUF_LIBS protobuf::libprotobuf-lite)
239-
else()
240-
set(PROTOBUF_LIBS ${PROTOBUF_LITE_LIBRARIES})
241-
endif()
242-
endif()
243-
244-
# Needed for arch: https://github.com/protocolbuffers/protobuf/issues/15604
245-
if (Protobuf_VERSION VERSION_GREATER_EQUAL 4)
246-
find_package(absl REQUIRED)
247-
248-
set(PROTOBUF_LIBS ${PROTOBUF_LIBS} absl::log_internal_check_op)
249-
endif()
250-
240+
set(PROTOBUF_LIBS protobuf::libprotobuf)
251241

252242
if(SELINUX_FOUND)
253243
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_SELINUX")

‎external/Catch2‎

Submodule Catch2 updated 194 files

‎external/cpp-httplib‎

Submodule cpp-httplib updated 83 files

‎external/cxxopts‎

‎external/json‎

Submodule json updated 837 files

‎external/sentry-native‎

Submodule sentry-native updated 301 files

‎external/simpleini‎

‎external/vcpkg‎

Submodule vcpkg updated 7488 files

‎vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eternal-terminal",
3-
"version-string": "6.0.13",
3+
"version-string": "6.2.10",
44
"dependencies": [
55
"zlib",
66
"openssl",

0 commit comments

Comments
 (0)