Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Document sam3 build options, fix Android CI

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2021-10-25 13:32:24 +02:00
parent dbb6a7471e
commit b8e27d6bc0
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_scripts/Android/Dockerfile
View File

@ -80,10 +80,9 @@ WORKDIR /jsonapi-generator-build/
RUN qmake ../RetroShare/jsonapi-generator/src/ \ RUN qmake ../RetroShare/jsonapi-generator/src/ \
CONFIG+=no_retroshare_plugins \ CONFIG+=no_retroshare_plugins \
CONFIG+=no_retroshare_service CONFIG+=no_retroshare_gui \ CONFIG+=no_retroshare_service CONFIG+=no_retroshare_gui \
CONFIG+=rs_jsonapi && \ CONFIG+=rs_jsonapi CONFIG+=no_rs_sam3_libsam3 && \
make -j$(nproc) make -j$(nproc)
#CONFIG+=no_keywords
RUN mkdir /retroshare-service-android-build RUN mkdir /retroshare-service-android-build
WORKDIR /retroshare-service-android-build WORKDIR /retroshare-service-android-build
RUN $($PREPARE_TOOLCHAIN get_qt_dir | head -n 1)/bin/qmake ../RetroShare \ RUN $($PREPARE_TOOLCHAIN get_qt_dir | head -n 1)/bin/qmake ../RetroShare \
@ -93,7 +92,8 @@ RUN $($PREPARE_TOOLCHAIN get_qt_dir | head -n 1)/bin/qmake ../RetroShare \
JSONAPI_GENERATOR_EXE=/jsonapi-generator-build/jsonapi-generator \ JSONAPI_GENERATOR_EXE=/jsonapi-generator-build/jsonapi-generator \
NATIVE_LIBS_TOOLCHAIN_PATH=$NATIVE_LIBS_TOOLCHAIN_PATH \ NATIVE_LIBS_TOOLCHAIN_PATH=$NATIVE_LIBS_TOOLCHAIN_PATH \
CONFIG+=no_retroshare_gui CONFIG+=no_rs_service_webui_terminal_password \ CONFIG+=no_retroshare_gui CONFIG+=no_rs_service_webui_terminal_password \
CONFIG+=no_rs_service_terminal_login CONFIG+=no_rs_service_terminal_login \
CONFIG+=no_rs_sam3 CONFIG+=no_rs_sam3_libsam3
RUN make -j$(nproc) RUN make -j$(nproc)
RUN make install INSTALL_ROOT=/retroshare-service-android-build/android-build/ RUN make install INSTALL_ROOT=/retroshare-service-android-build/android-build/
RUN $($PREPARE_TOOLCHAIN get_qt_dir | head -n 1)/bin/androiddeployqt \ RUN $($PREPARE_TOOLCHAIN get_qt_dir | head -n 1)/bin/androiddeployqt \

1
build_scripts/Android/README.asciidoc
View File

@ -81,6 +81,7 @@ JSONAPI_GENERATOR_EXE=Your_Path/jsonapi-generator/src/jsonapi-generator
NATIVE_LIBS_TOOLCHAIN_PATH=Your_Path/retroshare-android-16-arm/ NATIVE_LIBS_TOOLCHAIN_PATH=Your_Path/retroshare-android-16-arm/
CONFIG+=no_retroshare_gui CONFIG+=no_rs_service_webui_terminal_password CONFIG+=no_retroshare_gui CONFIG+=no_rs_service_webui_terminal_password
CONFIG+=no_rs_service_terminal_login CONFIG+=no_rs_service_terminal_login
CONFIG+=no_rs_sam3 CONFIG+=no_rs_sam3_libsam3
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
TIP: Some versions of QtCreator try to find the Android SDK in TIP: Some versions of QtCreator try to find the Android SDK in

5
build_scripts/GitlabCI/Android.Dockerfile
View File

@ -17,7 +17,7 @@ WORKDIR /jsonapi-generator-build/
RUN qmake ../RetroShare/jsonapi-generator/src/ \ RUN qmake ../RetroShare/jsonapi-generator/src/ \
CONFIG+=no_retroshare_plugins \ CONFIG+=no_retroshare_plugins \
CONFIG+=no_retroshare_service CONFIG+=no_retroshare_gui \ CONFIG+=no_retroshare_service CONFIG+=no_retroshare_gui \
CONFIG+=rs_jsonapi && \ CONFIG+=rs_jsonapi CONFIG+=no_rs_sam3_libsam3 && \
make -j$(nproc) make -j$(nproc)
RUN rm -rf /retroshare-service-android-build ; mkdir /retroshare-service-android-build RUN rm -rf /retroshare-service-android-build ; mkdir /retroshare-service-android-build
@ -32,7 +32,8 @@ RUN $($PREPARE_TOOLCHAIN get_qt_dir | head -n 1)/bin/qmake ../RetroShare \
JSONAPI_GENERATOR_EXE=/jsonapi-generator-build/jsonapi-generator \ JSONAPI_GENERATOR_EXE=/jsonapi-generator-build/jsonapi-generator \
NATIVE_LIBS_TOOLCHAIN_PATH=$NATIVE_LIBS_TOOLCHAIN_PATH \ NATIVE_LIBS_TOOLCHAIN_PATH=$NATIVE_LIBS_TOOLCHAIN_PATH \
CONFIG+=no_retroshare_gui CONFIG+=no_rs_service_webui_terminal_password \ CONFIG+=no_retroshare_gui CONFIG+=no_rs_service_webui_terminal_password \
CONFIG+=no_rs_service_terminal_login CONFIG+=no_rs_service_terminal_login \
CONFIG+=no_rs_sam3 CONFIG+=no_rs_sam3_libsam3
RUN make -j$(nproc) RUN make -j$(nproc)
RUN make install INSTALL_ROOT=/retroshare-service-android-build/android-build/ RUN make install INSTALL_ROOT=/retroshare-service-android-build/android-build/

25
retroshare.pri
View File

@ -1,7 +1,8 @@
# RetroShare common qmake build script # RetroShare common qmake build script
# #
# Copyright (C) 2004-2019, Retroshare Team <contact@retroshare.cc> # Copyright (C) 2004-2021 Retroshare Team <contact@retroshare.cc>
# Copyright (C) 2016-2019, Gioacchino Mazzurco <gio@eigenlab.org> # Copyright (C) 2016-2021 Gioacchino Mazzurco <gio@eigenlab.org>
# Copyright (C) 2021 Asociación Civil Altermundi <info@altermundi.net>
# #
# This program is free software: you can redistribute it and/or modify it under # This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the # the terms of the GNU Lesser General Public License as published by the
@ -199,13 +200,16 @@ no_rs_service_terminal_login:CONFIG -= rs_service_terminal_login
CONFIG+=rs_dh_init_check CONFIG+=rs_dh_init_check
no_rs_dh_init_check:CONFIG -= rs_dh_init_check no_rs_dh_init_check:CONFIG -= rs_dh_init_check
# To export all symbols for the plugins on Windows build we need to build libretroshare as # To disable I2P sam3 support append the following assignation to qmake command
# shared library. Fix linking error (ld.exe: Error: export ordinal too large) due to too # line "CONFIG+=no_rs_sam3"
# many exported symbols. CONFIG *= rs_sam3
retroshare_plugins:win32:CONFIG *= libretroshare_shared no_rs_sam3:CONFIG -= rs_sam3
# To disable I2P sam3 library submodule build append the following assignation
# to qmake command line "CONFIG+=no_rs_sam3_libsam3"
CONFIG *= rs_sam3_libsam3
no_rs_sam3_libsam3:CONFIG -= rs_sam3_libsam3
CONFIG+=rs_sam3
CONFIG+=rs_sam3_libsam3
# Specify host precompiled jsonapi-generator path, appending the following # Specify host precompiled jsonapi-generator path, appending the following
# assignation to qmake command line # assignation to qmake command line
@ -649,6 +653,11 @@ android-* {
RS_THREAD_LIB = RS_THREAD_LIB =
} }
# To export all symbols for the plugins on Windows build we need to build
# libretroshare as shared library. Fix linking error (ld.exe: Error: export
# ordinal too large) due to too many exported symbols.
retroshare_plugins:win32:CONFIG *= libretroshare_shared
win32-g++|win32-clang-g++ { win32-g++|win32-clang-g++ {
!isEmpty(EXTERNAL_LIB_DIR) { !isEmpty(EXTERNAL_LIB_DIR) {
message(Use pre-compiled libraries in $${EXTERNAL_LIB_DIR}.) message(Use pre-compiled libraries in $${EXTERNAL_LIB_DIR}.)