chore, more optimal dockerfile

4 files changed, 16 insertions, 84 deletions

diff --git a/.gitignore b/.gitignore
index 304e84d..1dbb905 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ contrib/depends/_
 contrib/depends/_native
 contrib/depends/simplybs
 *_libwallet2_api_c/build
+monero
+wownero
+zano
\ No newline at end of file
diff --git a/builder/Dockerfile b/builder/Dockerfile
index f1406e2..f034e29 100644
--- a/builder/Dockerfile
+++ b/builder/Dockerfile
@@ -21,25 +21,19 @@ FROM builder_base AS contrib_simplybs
 COPY contrib/depends /w/contrib/depends
 RUN sudo chown -R user:user /w \
     && cd /w/contrib/depends \
-    && make simplybs \
-    && make HOST=aarch64-linux-android \
-    && make HOST=aarch64-linux-android BOOST_VERSION=1_83_0 \
-    && make HOST=x86_64-linux-android \
-    && make HOST=x86_64-linux-android BOOST_VERSION=1_83_0 \
-    && make HOST=armv7a-linux-androideabi \
-    && make HOST=armv7a-linux-androideabi BOOST_VERSION=1_83_0 \
-    && make HOST=aarch64-linux-gnu \
-    && make HOST=aarch64-linux-gnu BOOST_VERSION=1_83_0 \
-    && make HOST=x86_64-linux-gnu \
-    && make HOST=x86_64-apple-darwin \
-    && make HOST=x86_64-apple-darwin BOOST_VERSION=1_83_0 \
-    && make HOST=aarch64-apple-darwin \
-    && make HOST=aarch64-apple-darwin BOOST_VERSION=1_83_0 \
-    && make HOST=aarch64-apple-ios \
-    && make HOST=aarch64-apple-ios BOOST_VERSION=1_83_0 \
-    && make HOST=aarch64-apple-ios-simulator \
-    && make HOST=aarch64-apple-ios-simulator BOOST_VERSION=1_83_0 \
-    && make sbs-cleanup
+    && make simplybs
+WORKDIR /w/contrib/depends
+
+RUN make HOST=aarch64-linux-android && make HOST=aarch64-linux-android BOOST_VERSION=1_83_0 && make sbs-cleanup
+RUN make HOST=x86_64-linux-android && make HOST=x86_64-linux-android BOOST_VERSION=1_83_0 && make sbs-cleanup
+RUN make HOST=armv7a-linux-androideabi && make HOST=armv7a-linux-androideabi BOOST_VERSION=1_83_0 && make sbs-cleanup
+RUN make HOST=x86_64-w64-mingw32 && make sbs-cleanup
+RUN make HOST=aarch64-linux-gnu && make sbs-cleanup
+RUN make HOST=x86_64-linux-gnu && make sbs-cleanup
+RUN make HOST=x86_64-apple-darwin && make sbs-cleanup
+RUN make HOST=aarch64-apple-darwin && make sbs-cleanup 
+RUN make HOST=aarch64-apple-ios && make HOST=aarch64-apple-ios BOOST_VERSION=1_83_0 && make sbs-cleanup
+RUN make HOST=aarch64-apple-ios-simulator && make HOST=aarch64-apple-ios-simulator BOOST_VERSION=1_83_0 && make sbs-cleanup
 
 FROM builder_base AS monero_c_base
 COPY . /w
diff --git a/example/cmake/.gitignore b/example/cmake/.gitignore
deleted file mode 100644
index 378eac2..0000000
--- a/example/cmake/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build
diff --git a/example/cmake/CMakeLists.txt b/example/cmake/CMakeLists.txt
deleted file mode 100644
index bf5361c..0000000
--- a/example/cmake/CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-cmake_minimum_required(VERSION 3.1...3.29.2)
-
-include(CMakePrintHelpers)
-
-set(MONERO_C_COMMIT 36e61433c78750317ced29f0fc94ad22af16111d)
-set(MONERO_C_MIRROR https://git.mrcyjanek.net/mrcyjanek/monero_c)
-set(MONERO_C_WOWNERO OFF)
-set(MONERO_C_MONERO ON)
-
-
-cmake_print_variables(MONERO_C_COMMIT)
-cmake_print_variables(MONERO_C_MIRROR)
-cmake_print_variables(MONERO_C_MONERO)
-cmake_print_variables(MONERO_C_WOWNERO)
-
-project(
-  monero_c
-  VERSION 0.0.0)
-
-if(NOT EXISTS monero_c)
-    execute_process(COMMAND git clone https://git.mrcyjanek.net/mrcyjanek/monero_c)
-endif()
-
-execute_process(WORKING_DIRECTORY monero_c COMMAND git checkout ${MONERO_C_COMMIT})
-execute_process(WORKING_DIRECTORY monero_c COMMAND git submodule update --recursive --force --init)
-
-execute_process(COMMAND rm monero_c/monero/.patch-applied)
-execute_process(COMMAND rm monero_c/wownero/.patch-applied)
-
-# apply patches
-
-if (MONERO_C_MONERO)
-    execute_process(WORKING_DIRECTORY monero_c COMMAND ./apply_patches.sh monero)
-endif()
-
-if (MONERO_C_WOWNERO)
-    execute_process(WORKING_DIRECTORY monero_c COMMAND ./apply_patches.sh wownero)
-endif()
-
-# actually.. build the software
-if (MONERO_C_MONERO)
-    add_custom_command(
-        COMMAND ./build_single.sh monero host-apple-darwin -j8
-        OUTPUT monero_c/release/monero/host-apple-darwin_libwallet2_api_c.dylib.xz
-        WORKING_DIRECTORY monero_c
-    )
-
-    add_custom_command(
-        COMMAND unxz -f monero_c/release/monero/host-apple-darwin_libwallet2_api_c.dylib.xz
-        OUTPUT monero_c/release/monero/host-apple-darwin_libwallet2_api_c.dylib
-        DEPENDS monero_c/release/monero/host-apple-darwin_libwallet2_api_c.dylib.xz
-    )
-
-    add_custom_command(
-        COMMAND mv monero_c/release/monero/host-apple-darwin_libwallet2_api_c.dylib monero_host-apple-darwin_libwallet2_api_c.dylib
-        OUTPUT host-apple-darwin_monero_libwallet2_api_c.dylib
-        DEPENDS monero_c/release/monero/host-apple-darwin_libwallet2_api_c.dylib
-    )
-endif()
-
-add_custom_target(
-    .host-apple-darwin_monero_libwallet2_api_c.dylib ALL
-    DEPENDS host-apple-darwin_monero_libwallet2_api_c.dylib
-)
\ No newline at end of file