lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 12:03:18 +02:00
Code Activity

misc: change library name "jami" -> "libjami"

Browse source 
Bumps the daemon and adjusts the build to use the appropriate library name.

Change-Id: I4208f161c3522bb58dfc1dc55cb10910ade24eed
This commit is contained in:
Andreas Traczyk 2023-05-25 13:28:56 -04:00
parent a179a9ae2d
commit dc53aa887d
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -363,7 +363,7 @@ if(MSVC)
# daemon
set(JAMID_SRC_PATH ${DAEMON_DIR}/contrib/msvc/include)
set(JAMID_LIB ${DAEMON_DIR}/build/x64/ReleaseLib_win32/bin/jami.lib)
set(JAMID_LIB ${DAEMON_DIR}/build/x64/ReleaseLib_win32/bin/libjami.lib)
set(GNUTLS_LIB ${DAEMON_DIR}/contrib/msvc/lib/x64/libgnutls.lib)
# Beta config

5
extras/build/cmake/modules/FindLibJami.cmake
View file

@ -53,6 +53,11 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES_orig ${CMAKE_FIND_LIBRARY_SUFFIXES})
set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib;.so;.dll")
# Add the lib prefix for Windows checks.
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(CMAKE_FIND_LIBRARY_PREFIXES "lib;")
endif()
if(WITH_DAEMON_SUBMODULE)
find_library(LIBJAMI_LIB NAMES jami ring
PATHS ${DAEMON_DIR}/src/.libs

17
extras/scripts/build-windows.py
View file

@ -1,4 +1,5 @@
#!/usr/bin/env python3
"""
Build, test, and package the project.
@ -340,9 +341,13 @@ def deploy_runtimes(qt_dir):
print("Running windeployqt (this may take a while)...")
win_deploy_qt = os.path.join(qt_dir, "bin", "windeployqt.exe")
qml_src_dir = os.path.join(repo_root_dir, "src", "app")
os.environ["VCINSTALLDIR"] = os.path.join(
get_vs_prop("installationPath"), "VC")
executable = os.path.join(runtime_dir, "Jami.exe")
installation_dir = get_vs_prop("installationPath")
if not installation_dir:
print("Visual Studio not found. Please install Visual Studio 2017 or "
"later.")
sys.exit(1)
os.environ["VCINSTALLDIR"] = os.path.join(installation_dir, "VC")
executable = os.path.join(runtime_dir.encode(), b"Jami.exe")
execute_cmd([win_deploy_qt, "--verbose", "1", "--no-compiler-runtime",
"--qmldir", qml_src_dir, "--release", executable],
False, cmd_dir=runtime_dir)
@ -483,7 +488,11 @@ def main():
print("These scripts will only run on a 64-bit system for now.")
sys.exit(1)
if sys.platform == "win32":
vs_version = get_vs_prop("installationVersion").split(".")[0]
vs_version = get_vs_prop("installationVersion")
if vs_version is None:
print("Visual Studio version not found.")
sys.exit(1)
vs_version = vs_version.split(".")[0]
if vs_version is None or int(vs_version) < 15:
print("Visual Studio 2017 or later is required.")
sys.exit(1)