Skip to content

Commit 7e227b0

Browse files
MrCyjaneKMrCyjaneK
authored
Cleanup and fixes (#180)
1 parent 2c11591 commit 7e227b0

34 files changed

Lines changed: 776 additions & 238 deletions

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ contrib/depends/simplybs
1111
./monero
1212
./wownero
1313
./zano
14+
*.o
15+
test_wallet2_api_c

‎build_single.sh‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -68,34 +68,24 @@ export PATH="$(pwd)/contrib/depends/_native/bin/:$(pwd)/contrib/depends/$HOST_AB
6868

6969
buildType=Release
7070

71-
pushd ${repo}_libwallet2_api_c
72-
rm -rf build/${HOST_ABI} || true
73-
mkdir -p build/${HOST_ABI}
74-
if [[ "$repo" == "zano" ]];
75-
then
76-
EXTRA_CMAKE_FLAGS="-DCAKEWALLET=ON"
77-
fi
78-
pushd build/${HOST_ABI}
79-
cmake --trace-expand -DCMAKE_TOOLCHAIN_FILE=$PWD/../../../contrib/depends/${HOST_ABI}/share/toolchain.cmake $EXTRA_CMAKE_FLAGS -DUSE_DEVICE_TREZOR=OFF -DMONERO_FLAVOR=$repo -DCMAKE_BUILD_TYPE=Debug -DHOST_ABI=${HOST_ABI} ../..
80-
make $NPROC
71+
for OUTPUT_MODE in SHARED;
72+
do
73+
pushd ${repo}_libwallet2_api_c
74+
rm -rf build/${HOST_ABI}_${OUTPUT_MODE} || true
75+
mkdir -p build/${HOST_ABI}_${OUTPUT_MODE}
76+
if [[ "$repo" == "zano" ]];
77+
then
78+
EXTRA_CMAKE_FLAGS="-DCAKEWALLET=ON"
79+
fi
80+
pushd build/${HOST_ABI}_${OUTPUT_MODE}
81+
cmake -DCMAKE_TOOLCHAIN_FILE=$PWD/../../../contrib/depends/${HOST_ABI}/share/toolchain.cmake $EXTRA_CMAKE_FLAGS -DUSE_DEVICE_TREZOR=OFF -DMONERO_FLAVOR=$repo -DCMAKE_BUILD_TYPE=Debug -DHOST_ABI=${HOST_ABI} -DOUTPUT_MODE=${OUTPUT_MODE} ../..
82+
make $NPROC
83+
popd
8184
popd
82-
popd
85+
done
8386

84-
mkdir -p release/$repo 2>/dev/null || true
85-
pushd release/$repo
86-
APPENDIX=""
87-
if [[ "${HOST_ABI}" == "x86_64-w64-mingw32" || "${HOST_ABI}" == "i686-w64-mingw32" ]];
88-
then
89-
echo "TODO: check if it's still needed"
90-
APPENDIX="${APPENDIX}dll"
91-
# cp ../../$repo/build/${HOST_ABI}/external/polyseed/libpolyseed.${APPENDIX} ${HOST_ABI}_libpolyseed.${APPENDIX}
92-
# rm ${HOST_ABI}_libpolyseed.${APPENDIX}.xz || true
93-
# xz -e ${HOST_ABI}_libpolyseed.${APPENDIX}
94-
elif [[ "${HOST_ABI}" == "x86_64-apple-darwin11" || "${HOST_ABI}" == "aarch64-apple-darwin11" || "${HOST_ABI}" == "host-apple-darwin" || "${HOST_ABI}" == "x86_64-host-apple-darwin" || "${HOST_ABI}" == "aarch64-apple-darwin" || "${HOST_ABI}" == "x86_64-apple-darwin" || "${HOST_ABI}" == "host-apple-ios" || "${HOST_ABI}" == "aarch64-apple-ios" || "${HOST_ABI}" == "aarch64-apple-ios-simulator" ]];
95-
then
96-
APPENDIX="${APPENDIX}dylib"
97-
else
98-
APPENDIX="${APPENDIX}so"
99-
fi
100-
mv ../../${repo}_libwallet2_api_c/build/${HOST_ABI}/libwallet2_api_c.${APPENDIX} ${HOST_ABI}_libwallet2_api_c.${APPENDIX}
87+
mkdir -p release/$(git describe --tags)/${HOST_ABI} 2>/dev/null || true
88+
pushd release/$(git describe --tags)/${HOST_ABI}
89+
pwd
90+
mv ../../../${repo}_libwallet2_api_c/build/${HOST_ABI}_*/lib*_wallet2_api_c.* .
10191
popd

‎contrib/depends/gen_toolchain.cmake.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
133133
SET(CONF_TRIPLE "aarch64-apple-darwin11")
134134
SET(BUILD_TAG "mac-armv8")
135135
SET(CMAKE_OSX_ARCHITECTURES "arm64")
136-
set(ARM ON)
137-
set(ARM_ID "armv8-a")
138136
else()
139137
SET(CLANG_TARGET "x86_64-apple-darwin11")
140138
SET(CONF_TRIPLE "x86_64-apple-darwin11")
141-
SET(BUILD_TAG "mac-x64")
142-
SET(CMAKE_OSX_ARCHITECTURES "x86_64")
143139
endif()
144140
SET(_CMAKE_TOOLCHAIN_PREFIX @nativeprefix@/bin/\${CONF_TRIPLE}-)
145141
SET(CMAKE_C_COMPILER @CC@)

‎generate_checksum.sh‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@ for coin in monero wownero zano;
1010
do
1111
submodule_hash=$(git ls-tree HEAD ${coin} | xargs | awk '{ print $3 }')
1212
COIN=$(echo "$coin" | tr a-z A-Z)
13-
COIN_wallet2_api_c_h_sha256=$(sha256sum ${coin}_libwallet2_api_c/src/main/cpp/wallet2_api_c.h | xargs | awk '{ print $1 }')
14-
COIN_wallet2_api_c_cpp_sha256=$(sha256sum ${coin}_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp | xargs | awk '{ print $1 }')-${submodule_hash}
13+
COIN_wallet2_api_c_h_sha256=$(sha256sum ${coin}_libwallet2_api_c/src/main/cpp/${coin}_wallet2_api_c.h | xargs | awk '{ print $1 }')
14+
COIN_wallet2_api_c_cpp_sha256=$(sha256sum ${coin}_libwallet2_api_c/src/main/cpp/${coin}_wallet2_api_c.cpp | xargs | awk '{ print $1 }')-${submodule_hash}
1515
COIN_wallet2_api_c_exp_sha256=$(sha256sum ${coin}_libwallet2_api_c/${coin}_libwallet2_api_c.exp | xargs | awk '{ print $1 }')
1616

17-
cat > ${coin}_libwallet2_api_c/src/main/cpp/${coin}_checksum.h << EOF
18-
#ifndef MONEROC_CHECKSUMS
19-
#define MONEROC_CHECKSUMS
17+
cat > ${coin}_libwallet2_api_c/src/main/cpp/${coin}_checksum.c << EOF
18+
#include "${coin}_checksum.h"
19+
2020
const char * ${COIN}_wallet2_api_c_h_sha256 = "${COIN_wallet2_api_c_h_sha256}";
2121
const char * ${COIN}_wallet2_api_c_cpp_sha256 = "${COIN_wallet2_api_c_cpp_sha256}";
2222
const char * ${COIN}_wallet2_api_c_exp_sha256 = "${COIN_wallet2_api_c_exp_sha256}";
23-
#endif
2423
EOF
2524
cat > impls/monero.dart/lib/src/checksum_${coin}.dart << EOF
2625
// ignore_for_file: constant_identifier_names
@@ -36,4 +35,3 @@ export const ${coin}Checksum = {
3635
}
3736
EOF
3837
done
39-

‎impls/monero.dart/ffigen_monero.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: monero_c bindings
33
output: 'lib/src/generated_bindings_monero.g.dart'
44
headers:
55
entry-points:
6-
- '../../monero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h'
6+
- '../../monero_libwallet2_api_c/src/main/cpp/monero_wallet2_api_c.h'
77

88
exclude-all-by-default: true
99
functions:

‎impls/monero.dart/ffigen_wownero.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: monero_c wownero bindings
33
output: 'lib/src/generated_bindings_wownero.g.dart'
44
headers:
55
entry-points:
6-
- '../../wownero_libwallet2_api_c/src/main/cpp/wallet2_api_c.h'
6+
- '../../wownero_libwallet2_api_c/src/main/cpp/wownero_wallet2_api_c.h'
77

88
exclude-all-by-default: true
99
functions:

‎impls/monero.dart/ffigen_zano.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: monero_c bindings
33
output: 'lib/src/generated_bindings_zano.g.dart'
44
headers:
55
entry-points:
6-
- '../../zano_libwallet2_api_c/src/main/cpp/wallet2_api_c.h'
6+
- '../../zano_libwallet2_api_c/src/main/cpp/zano_wallet2_api_c.h'
77

88
exclude-all-by-default: true
99
functions:

‎impls/monero.dart/lib/src/checksum_monero.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// ignore_for_file: constant_identifier_names
2-
const String wallet2_api_c_h_sha256 = "3515e4c9e537ca3efa664f0b364a3aeb106ff64337f542a262ce104c00b31235";
3-
const String wallet2_api_c_cpp_sha256 = "ca44a8d4a201ba6dc0a25c857e95d07bc8d514039b38cd5b3826100e8943cbcc-dbcc7d212c094bd1a45f7291dbb99a4b4627a96d";
4-
const String wallet2_api_c_exp_sha256 = "0561e14606106e6b0ec49fb2aefe743ff500f7c3de07557f7041e06aef9509ce";
2+
const String wallet2_api_c_h_sha256 = "563113bbf36f153d66d6f656ea6f364172a0e801074dcffffab62374a628607f";
3+
const String wallet2_api_c_cpp_sha256 = "5231bad07c802e88fc17781b71e85fce7a0dc750301893482577558aa56f925d-dbcc7d212c094bd1a45f7291dbb99a4b4627a96d";
4+
const String wallet2_api_c_exp_sha256 = "d873158058e22fabba8d809e9c6cdf633e1b6b2bd78ee5b617435b66131ce600";

‎impls/monero.dart/lib/src/checksum_wownero.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// ignore_for_file: constant_identifier_names
22
const String wallet2_api_c_h_sha256 = "f99009d1ca1d1c783cc9aa0fb63f680d48753b88124fb5de2079c57b7e34c827";
3-
const String wallet2_api_c_cpp_sha256 = "70b39a0bef660cb9ba0397117eb1590e18461ace89ab18141690658a2a537d5d-cfd2a696245be112a01936d1f2f41b6eb7558376";
3+
const String wallet2_api_c_cpp_sha256 = "4da7caa6ed47e95f0d1ee62315e46d3d9200d32cc6c49dbcadfc0ad053799ea6-cfd2a696245be112a01936d1f2f41b6eb7558376";
44
const String wallet2_api_c_exp_sha256 = "5f53ea8bbe66a5e5aa6cbc4ca00695900e08589cfd32062e88965a24252d05ba";

‎impls/monero.dart/lib/src/checksum_zano.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// ignore_for_file: constant_identifier_names
22
const String wallet2_api_c_h_sha256 = "8acaa95513b85a984c08e05cc3f2ac7530bb8f32946eeeb45357bd846aef33dd";
3-
const String wallet2_api_c_cpp_sha256 = "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-b372a99c7ada82caac53b677d9aaa7c0902e3b0b";
3+
const String wallet2_api_c_cpp_sha256 = "cdec2578df387ab3587712f77470500934d7f18c27201ae71bc3ee52cb784cbd-b372a99c7ada82caac53b677d9aaa7c0902e3b0b";
44
const String wallet2_api_c_exp_sha256 = "66f3ff655bbfd11ad28c318ab707090b5a93276f436b06f7b1c0f329dba3c9c2";

0 commit comments

Comments
 (0)