tiamak/monero_c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: wownero and monero wallets in the same process

Browse Source 
ci: cache ~/.ccache directory
This commit is contained in:
Czarek Nakamoto
2024-04-01 06:54:50 +02:00
parent b72d2dff62
commit f2057a2363
4 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.woodpecker/linux.yaml
View File

@@ -35,60 +35,80 @@ steps:
- apt update - apt update
- apt install -y gperf libtinfo5 - apt install -y gperf libtinfo5
- ./build_single.sh ${repo} x86_64-apple-darwin11 -j$(nproc) - ./build_single.sh ${repo} x86_64-apple-darwin11 -j$(nproc)
volumes:
- /opt/cache/monero_c/dotccache:/root/.ccache
- name: aarch64-apple-darwin11 - name: aarch64-apple-darwin11
image: git.mrcyjanek.net/mrcyjanek/debian:bookworm image: git.mrcyjanek.net/mrcyjanek/debian:bookworm
commands: commands:
- apt update - apt update
- apt install -y gperf libtinfo5 - apt install -y gperf libtinfo5
- ./build_single.sh ${repo} aarch64-apple-darwin11 -j$(nproc) - ./build_single.sh ${repo} aarch64-apple-darwin11 -j$(nproc)
volumes:
- /opt/cache/monero_c/dotccache:/root/.ccache
- name: x86_64-w64-mingw32 - name: x86_64-w64-mingw32
image: git.mrcyjanek.net/mrcyjanek/debian:buster image: git.mrcyjanek.net/mrcyjanek/debian:buster
commands: commands:
- apt update - apt update
- apt install -y ccache gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gperf libtinfo5 - apt install -y ccache gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gperf libtinfo5
- ./build_single.sh ${repo} x86_64-w64-mingw32 -j$(nproc) - ./build_single.sh ${repo} x86_64-w64-mingw32 -j$(nproc)
volumes:
- /opt/cache/monero_c/dotccache:/root/.ccache
- name: i686-w64-mingw32 - name: i686-w64-mingw32
image: git.mrcyjanek.net/mrcyjanek/debian:buster image: git.mrcyjanek.net/mrcyjanek/debian:buster
commands: commands:
- apt update - apt update
- apt install -y ccache gcc-mingw-w64-i686 g++-mingw-w64-i686 gperf libtinfo5 - apt install -y ccache gcc-mingw-w64-i686 g++-mingw-w64-i686 gperf libtinfo5
- ./build_single.sh ${repo} i686-w64-mingw32 -j$(nproc) - ./build_single.sh ${repo} i686-w64-mingw32 -j$(nproc)
volumes:
- /opt/cache/monero_c/dotccache:/root/.ccache
- name: x86_64-linux-gnu - name: x86_64-linux-gnu
image: git.mrcyjanek.net/mrcyjanek/debian:buster image: git.mrcyjanek.net/mrcyjanek/debian:buster
commands: commands:
- apt update - apt update
- apt install -y ccache gcc g++ gperf - apt install -y ccache gcc g++ gperf
- ./build_single.sh ${repo} x86_64-linux-gnu -j$(nproc) - ./build_single.sh ${repo} x86_64-linux-gnu -j$(nproc)
volumes:
- /opt/cache/monero_c/dotccache:/root/.ccache
- name: i686-linux-gnu - name: i686-linux-gnu
image: git.mrcyjanek.net/mrcyjanek/debian:buster image: git.mrcyjanek.net/mrcyjanek/debian:buster
commands: commands:
- apt update - apt update
- apt install -y ccache gcc-i686-linux-gnu g++-i686-linux-gnu gperf - apt install -y ccache gcc-i686-linux-gnu g++-i686-linux-gnu gperf
- ./build_single.sh ${repo} i686-linux-gnu -j$(nproc) - ./build_single.sh ${repo} i686-linux-gnu -j$(nproc)
volumes:
- /opt/cache/monero_c/dotccache:/root/.ccache
- name: aarch64-linux-gnu - name: aarch64-linux-gnu
image: git.mrcyjanek.net/mrcyjanek/debian:buster image: git.mrcyjanek.net/mrcyjanek/debian:buster
commands: commands:
- apt update - apt update
- apt install -y ccache gcc-aarch64-linux-gnu g++-aarch64-linux-gnu gperf - apt install -y ccache gcc-aarch64-linux-gnu g++-aarch64-linux-gnu gperf
- ./build_single.sh ${repo} aarch64-linux-gnu -j$(nproc) - ./build_single.sh ${repo} aarch64-linux-gnu -j$(nproc)
volumes:
- /opt/cache/monero_c/dotccache:/root/.ccache
- name: x86_64-linux-android - name: x86_64-linux-android
image: git.mrcyjanek.net/mrcyjanek/debian:buster image: git.mrcyjanek.net/mrcyjanek/debian:buster
commands: commands:
- apt update - apt update
- apt install -y ccache libtinfo5 gperf - apt install -y ccache libtinfo5 gperf
- ./build_single.sh ${repo} x86_64-linux-android -j$(nproc) - ./build_single.sh ${repo} x86_64-linux-android -j$(nproc)
volumes:
- /opt/cache/monero_c/dotccache:/root/.ccache
- name: aarch64-linux-android - name: aarch64-linux-android
image: git.mrcyjanek.net/mrcyjanek/debian:buster image: git.mrcyjanek.net/mrcyjanek/debian:buster
commands: commands:
- apt update - apt update
- apt install -y ccache libtinfo5 gperf - apt install -y ccache libtinfo5 gperf
- ./build_single.sh ${repo} aarch64-linux-android -j$(nproc) - ./build_single.sh ${repo} aarch64-linux-android -j$(nproc)
volumes:
- /opt/cache/monero_c/dotccache:/root/.ccache
- name: arm-linux-androideabi - name: arm-linux-androideabi
image: git.mrcyjanek.net/mrcyjanek/debian:buster image: git.mrcyjanek.net/mrcyjanek/debian:buster
commands: commands:
- apt update - apt update
- apt install -y ccache libtinfo5 gperf - apt install -y ccache libtinfo5 gperf
- ./build_single.sh ${repo} arm-linux-androideabi -j$(nproc) - ./build_single.sh ${repo} arm-linux-androideabi -j$(nproc)
volumes:
- /opt/cache/monero_c/dotccache:/root/.ccache
- name: cache depends - name: cache depends
image: git.mrcyjanek.net/mrcyjanek/debian:buster image: git.mrcyjanek.net/mrcyjanek/debian:buster
commands: commands:

6
monero_libwallet2_api_c/CMakeLists.txt
View File

@@ -21,6 +21,9 @@ add_library( wallet2_api_c
src/main/cpp/helpers.cpp src/main/cpp/helpers.cpp
src/main/cpp/wallet2_api_c.cpp ) src/main/cpp/wallet2_api_c.cpp )
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
set(MONERO_DIR ${CMAKE_SOURCE_DIR}/../${MONERO_FLAVOR}) set(MONERO_DIR ${CMAKE_SOURCE_DIR}/../${MONERO_FLAVOR})
set(EXTERNAL_LIBS_DIR ${MONERO_DIR}/contrib/depends/${HOST_ABI}) set(EXTERNAL_LIBS_DIR ${MONERO_DIR}/contrib/depends/${HOST_ABI})
@@ -295,6 +298,9 @@ elseif(${MONERO_FLAVOR} STREQUAL "wownero")
target_compile_definitions(wallet2_api_c PRIVATE FLAVOR_WOWNERO) target_compile_definitions(wallet2_api_c PRIVATE FLAVOR_WOWNERO)
endif() endif()
if(NOT ${HOST_ABI} STREQUAL "x86_64-apple-darwin11" AND NOT ${HOST_ABI} STREQUAL "aarch64-apple-darwin11")
set_target_properties(wallet2_api_c PROPERTIES LINK_FLAGS "-Wl,--exclude-libs,ALL")
endif()
target_link_libraries( wallet2_api_c target_link_libraries( wallet2_api_c
wallet_api wallet_api

2
monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h
View File

@@ -19,7 +19,7 @@ extern "C"
#ifdef __MINGW32__ #ifdef __MINGW32__
#define ADDAPI __declspec(dllexport) #define ADDAPI __declspec(dllexport)
#else #else
#define ADDAPI #define ADDAPI __attribute__((__visibility__("default")))
#endif #endif
// namespace Monero { // namespace Monero {

2
wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h
View File

@@ -19,7 +19,7 @@ extern "C"
#ifdef __MINGW32__ #ifdef __MINGW32__
#define ADDAPI __declspec(dllexport) #define ADDAPI __declspec(dllexport)
#else #else
#define ADDAPI #define ADDAPI __attribute__((__visibility__("default")))
#endif #endif
// namespace Monero { // namespace Monero {