Skip to content

Remove Swiften dependency from plugins #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vitalyster wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Remove Swiften dependency from plugins #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ee9b3a
Drop Swiften dependency from backends
vitalyster Jan 26, 2022
53056a0
Fix missing fileappender.h include
vitalyster Jun 17, 2026
8f245a6
Fix Slack test compilation: include slack/*.cpp in SRC_TEST
vitalyster Jun 17, 2026
a1ac739
Add slack/ include directory for test compilation
vitalyster Jun 17, 2026
7cdbe3c
Remove Swiften dependency from backend plugins
vitalyster Jun 17, 2026
375e43e
Add libtransport_test to install target for Windows CI
vitalyster Jun 17, 2026
1169936
Fix transport-protocol install: add RUNTIME destination for DLL
vitalyster Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,15 @@ jobs:
run: |
set CMAKE_PREFIX_PATH=%cd%\deps32
set PATH=%PATH%;%cd%\deps32\bin;%cd%\deps32\tools\bin
cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_UNITY_BUILD=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=ON -DENABLE_IRC=OFF -DENABLE_FROTZ=OFF -DENABLE_PURPLE=OFF -DENABLE_MYSQL=OFF -DENABLE_PQXX=OFF -DCMAKE_INSTALL_PREFIX=dist -DCMAKE_CXX_STANDARD=17 .
cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_UNITY_BUILD=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=ON -DENABLE_IRC=OFF -DENABLE_FROTZ=OFF -DENABLE_PURPLE=OFF -DENABLE_MYSQL=OFF -DENABLE_PQXX=OFF -DENABLE_SLACK_FRONTEND=ON -DCMAKE_INSTALL_PREFIX=dist -DCMAKE_CXX_STANDARD=17 .
shell: cmd
- name: Build solution
run: msbuild /t:Build INSTALL.vcxproj /p:Configuration=RelWithDebInfo /p:Platform=Win32 /m
run: cmake --build . --config RelWithDebInfo --target install -- /m
- name: Run tests
shell: cmd
run: |
set PATH=%PATH%;%cd%\deps32\bin
cd tests\libtransport\RelWithDebInfo
set PATH=%PATH%;%cd%\deps32\bin;%cd%\dist\bin
cd dist\bin
libtransport_test

linux-debian:
Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ option(ENABLE_PURPLE "Build Libpurple plugin" ON)
option(ENABLE_SMSTOOLS3 "Build SMSTools3 plugin" ON)
option(ENABLE_XMPP "Build XMPP plugin" ON)
option(ENABLE_WEBUI "Build Web UI" ON)

option(ENABLE_SLACK_FRONTEND "Build Slack frontend" OFF)
option(ENABLE_DOCS "Build Docs" ON)
# option(ENABLE_LOG "Build with logging using Log4cxx" ON)
option(ENABLE_TESTS "Build Tests using CppUnit" OFF)
Expand Down Expand Up @@ -91,6 +91,8 @@ if(WIN32)
link_directories("$ENV{CMAKE_PREFIX_PATH}/lib")
endif(WIN32)

find_package( Threads )

set(Boost_FIND_QUIETLY ON)
find_package(Boost COMPONENTS program_options date_time system filesystem regex thread locale REQUIRED)

Expand Down Expand Up @@ -383,6 +385,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
include_directories(${OPENSSL_INCLUDE_DIR})
endif()

add_subdirectory(protocol)
add_subdirectory(libtransport)
add_subdirectory(plugin)
add_subdirectory(include)
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-backports as base

Check warning on line 1 in Dockerfile

View workflow job for this annotation

GitHub Actions / linux-glibc

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

ARG DEBIAN_FRONTEND=noninteractive
ARG APT_LISTCHANGES_FRONTEND=none
Expand All @@ -23,18 +23,18 @@
# Spectrum 2
COPY . spectrum2/

FROM base as test

Check warning on line 26 in Dockerfile

View workflow job for this annotation

GitHub Actions / linux-glibc

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

ARG DEBIAN_FRONTEND=noninteractive
ARG APT_LISTCHANGES_FRONTEND=none

WORKDIR /spectrum2

RUN cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=ON -DENABLE_QT4=OFF -DCMAKE_UNITY_BUILD=ON . && make -j4
RUN cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=ON -DENABLE_QT4=OFF -DENABLE_SLACK_FRONTEND=ON -DCMAKE_UNITY_BUILD=ON . && make -j4

ENTRYPOINT ["make", "extended_test"]

FROM base as test-clang

Check warning on line 37 in Dockerfile

View workflow job for this annotation

GitHub Actions / linux-glibc

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

ARG DEBIAN_FRONTEND=noninteractive
ARG APT_LISTCHANGES_FRONTEND=none
Expand All @@ -48,21 +48,21 @@

WORKDIR /spectrum2

RUN cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=ON -DENABLE_QT4=OFF -DCMAKE_UNITY_BUILD=ON -DCMAKE_C_COMPILER=/usr/bin/clang-13 -DCMAKE_CXX_COMPILER=/usr/bin/clang++-13 -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld . && make -j4
RUN cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=ON -DENABLE_QT4=OFF -DENABLE_SLACK_FRONTEND=ON -DCMAKE_UNITY_BUILD=ON -DCMAKE_C_COMPILER=/usr/bin/clang-13 -DCMAKE_CXX_COMPILER=/usr/bin/clang++-13 -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld . && make -j4

ENTRYPOINT ["make", "test"]

FROM ghcr.io/spectrumim/alpine:1.0.1 as test-musl

Check warning on line 55 in Dockerfile

View workflow job for this annotation

GitHub Actions / linux-glibc

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

COPY . /spectrum2/

WORKDIR /spectrum2

RUN cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=ON -DENABLE_QT4=OFF -DENABLE_WEBUI=OFF -DCMAKE_UNITY_BUILD=ON . && make -j4
RUN cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=ON -DENABLE_QT4=OFF -DENABLE_WEBUI=OFF -DENABLE_SLACK_FRONTEND=ON -DCMAKE_UNITY_BUILD=ON . && make -j4

ENTRYPOINT ["make", "test"]

FROM base as staging

Check warning on line 65 in Dockerfile

View workflow job for this annotation

GitHub Actions / linux-glibc

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

ARG DEBIAN_FRONTEND=noninteractive
ARG APT_LISTCHANGES_FRONTEND=none
Expand Down Expand Up @@ -120,7 +120,7 @@
make DESTDIR=/tmp/out install


FROM debian:bullseye-slim as production

Check warning on line 123 in Dockerfile

View workflow job for this annotation

GitHub Actions / linux-glibc

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

EXPOSE 8080
VOLUME ["/etc/spectrum2/transports", "/var/lib/spectrum2"]
Expand Down
2 changes: 1 addition & 1 deletion backends/frotz/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ file(GLOB SRC *.c *.cpp)
add_executable(spectrum2_frotz_backend ${SRC})
target_compile_features(spectrum2_frotz_backend PUBLIC cxx_std_11)

target_link_libraries(spectrum2_frotz_backend transport pthread ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
target_link_libraries(spectrum2_frotz_backend transport-plugin ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES})

install(TARGETS spectrum2_frotz_backend RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
Loading