From 9d2f083a973808a75a7a38b63e86d65339df02f5 Mon Sep 17 00:00:00 2001 From: selsta Date: Fri, 16 Oct 2020 23:36:59 +0200 Subject: [PATCH] repo: cleanup qmake --- build.sh | 121 -------- deployment.pri | 27 -- get_libwallet_api.sh | 286 ------------------- ios_get_libwallet.api.sh | 49 ---- linuxdeploy_helper.sh | 62 ----- monero-wallet-gui.pro | 581 --------------------------------------- utils.sh | 74 ----- windeploy_helper.sh | 48 ---- 8 files changed, 1248 deletions(-) delete mode 100755 build.sh delete mode 100644 deployment.pri delete mode 100755 get_libwallet_api.sh delete mode 100755 ios_get_libwallet.api.sh delete mode 100755 linuxdeploy_helper.sh delete mode 100644 monero-wallet-gui.pro delete mode 100755 utils.sh delete mode 100644 windeploy_helper.sh diff --git a/build.sh b/build.sh deleted file mode 100755 index d2c6f313..00000000 --- a/build.sh +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/bash - -BUILD_TYPE=$1 -BUILD_TREZOR=${BUILD_TREZOR-true} -source ./utils.sh -platform=$(get_platform) -# default build type -if [ -z $BUILD_TYPE ]; then - BUILD_TYPE=release -fi - -# Return 0 if the command exists, 1 if it does not. -exists() { - command -v "$1" &>/dev/null -} - -# Return the first value in $@ that's a runnable command. -find_command() { - for arg in "$@"; do - if exists "$arg"; then - echo "$arg" - return 0 - fi - done - return 1 -} - -if [ "$BUILD_TYPE" == "release" ]; then - echo "Building release" - CONFIG="CONFIG+=release"; - BIN_PATH=release/bin -elif [ "$BUILD_TYPE" == "release-static" ]; then - echo "Building release-static" - if [ "$platform" != "darwin" ]; then - CONFIG="CONFIG+=release static"; - else - # OS X: build static libwallet but dynamic Qt. - echo "OS X: Building Qt project without static flag" - CONFIG="CONFIG+=release"; - fi - BIN_PATH=release/bin -elif [ "$BUILD_TYPE" == "release-android" ]; then - echo "Building release for ANDROID" - CONFIG="CONFIG+=release static WITH_SCANNER DISABLE_PASS_STRENGTH_METER"; - ANDROID=true - BIN_PATH=release/bin - DISABLE_PASS_STRENGTH_METER=true -elif [ "$BUILD_TYPE" == "debug-android" ]; then - echo "Building debug for ANDROID : ultra INSECURE !!" - CONFIG="CONFIG+=debug qml_debug WITH_SCANNER DISABLE_PASS_STRENGTH_METER"; - ANDROID=true - BIN_PATH=debug/bin - DISABLE_PASS_STRENGTH_METER=true -elif [ "$BUILD_TYPE" == "debug" ]; then - echo "Building debug" - CONFIG="CONFIG+=debug" - BIN_PATH=debug/bin -else - echo "Valid build types are release, release-static, release-android, debug-android and debug" - exit 1; -fi - - -source ./utils.sh -pushd $(pwd) -ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -MONERO_DIR=monero -MONEROD_EXEC=monerod - -MAKE='make' -if [[ $platform == *bsd* ]]; then - MAKE='gmake' -fi - -# build libwallet -export BUILD_TREZOR -./get_libwallet_api.sh $BUILD_TYPE - -# build zxcvbn -if [ "$DISABLE_PASS_STRENGTH_METER" != true ]; then - $MAKE -C src/zxcvbn-c || exit -fi - -if [ ! -d build ]; then mkdir build; fi - - -# Platform indepenent settings -if [ "$ANDROID" != true ] && ([ "$platform" == "linux32" ] || [ "$platform" == "linux64" ]); then - exists lsb_release && distro="$(lsb_release -is)" - if [ "$distro" = "Ubuntu" ] || [ "$distro" = "Fedora" ] || test -f /etc/fedora-release; then - CONFIG="$CONFIG libunwind_off" - fi -fi - -if [ "$platform" == "darwin" ]; then - BIN_PATH=$BIN_PATH/monero-wallet-gui.app/Contents/MacOS/ -elif [ "$platform" == "mingw64" ] || [ "$platform" == "mingw32" ]; then - MONEROD_EXEC=monerod.exe -fi - -# force version update -get_tag -GUI_VERSION=$(echo "$TAGNAME" | sed 's/^v\([[:digit:]]\)/\1/') -echo "var GUI_VERSION = \"$GUI_VERSION\"" > version.js - -cd build -if ! QMAKE=$(find_command qmake qmake-qt5); then - echo "Failed to find suitable qmake command." - exit 1 -fi -$QMAKE ../monero-wallet-gui.pro "$CONFIG" || exit -$MAKE || exit - -# Copy monerod to bin folder -if [ "$platform" != "mingw32" ] && [ "$ANDROID" != true ]; then -cp ../$MONERO_DIR/bin/$MONEROD_EXEC $BIN_PATH -fi - -# make deploy -popd - diff --git a/deployment.pri b/deployment.pri deleted file mode 100644 index 5441b63d..00000000 --- a/deployment.pri +++ /dev/null @@ -1,27 +0,0 @@ -android-no-sdk { - target.path = /data/user/qt - export(target.path) - INSTALLS += target -} else:android { - x86 { - target.path = /libs/x86 - } else: armeabi-v7a { - target.path = /libs/armeabi-v7a - } else { - target.path = /libs/armeabi - } - export(target.path) - INSTALLS += target -} else:unix { - isEmpty(target.path) { - qnx { - target.path = /tmp/$${TARGET}/bin - } else { - target.path = /opt/$${TARGET}/bin - } - export(target.path) - } - INSTALLS += target -} - -export(INSTALLS) diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh deleted file mode 100755 index eb2ba061..00000000 --- a/get_libwallet_api.sh +++ /dev/null @@ -1,286 +0,0 @@ -#!/bin/bash -MONERO_URL=https://github.com/monero-project/monero.git -MONERO_BRANCH=master - -pushd $(pwd) -ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -source $ROOT_DIR/utils.sh - -INSTALL_DIR=$ROOT_DIR/wallet -MONERO_DIR=$ROOT_DIR/monero -BUILD_LIBWALLET=false - -# init and update monero submodule -if [ ! -d $MONERO_DIR/src ]; then - git submodule init monero -fi -git submodule update --remote -git -C $MONERO_DIR fetch -git -C $MONERO_DIR checkout v0.17.1.1 - -# get monero core tag -pushd $MONERO_DIR -get_tag -popd -# create local monero branch -git -C $MONERO_DIR checkout -B $VERSIONTAG - -# Merge monero PR dependencies - -# Workaround for git username requirements -# Save current user settings and revert back when we are done with merging PR's -OLD_GIT_USER=$(git -C $MONERO_DIR config --local user.name) -OLD_GIT_EMAIL=$(git -C $MONERO_DIR config --local user.email) -git -C $MONERO_DIR config user.name "Monero GUI" -git -C $MONERO_DIR config user.email "gui@monero.local" -# check for PR requirements in most recent commit message (i.e requires #xxxx) -for PR in $(git log --format=%B -n 1 | grep -io "requires #[0-9]*" | sed 's/[^0-9]*//g'); do - echo "Merging monero push request #$PR" - # fetch pull request and merge - git -C $MONERO_DIR fetch origin pull/$PR/head:PR-$PR - git -C $MONERO_DIR merge --quiet PR-$PR -m "Merge monero PR #$PR" - BUILD_LIBWALLET=true -done - -# revert back to old git config -$(git -C $MONERO_DIR config user.name "$OLD_GIT_USER") -$(git -C $MONERO_DIR config user.email "$OLD_GIT_EMAIL") - -git -C $MONERO_DIR submodule init -git -C $MONERO_DIR submodule update - -# Build libwallet if it doesnt exist -if [ ! -f $MONERO_DIR/lib/libwallet_merged.a ]; then - echo "libwallet_merged.a not found - Building libwallet" - BUILD_LIBWALLET=true -# Build libwallet if no previous version file exists -elif [ ! -f $MONERO_DIR/version.sh ]; then - echo "monero/version.h not found - Building libwallet" - BUILD_LIBWALLET=true -## Compare previously built version with submodule + merged PR's version. -else - source $MONERO_DIR/version.sh - # compare submodule version with latest build - pushd "$MONERO_DIR" - get_tag - popd - echo "latest libwallet version: $GUI_MONERO_VERSION" - echo "Installed libwallet version: $VERSIONTAG" - # check if recent - if [ "$VERSIONTAG" != "$GUI_MONERO_VERSION" ]; then - echo "Building new libwallet version $GUI_MONERO_VERSION" - BUILD_LIBWALLET=true - else - echo "latest libwallet ($GUI_MONERO_VERSION) is already built. Remove monero/lib/libwallet_merged.a to force rebuild" - fi -fi - -if [ "$BUILD_LIBWALLET" != true ]; then - exit 0 -fi - -echo "GUI_MONERO_VERSION=\"$VERSIONTAG\"" > $MONERO_DIR/version.sh - -## Continue building libwallet - -# default build type -BUILD_TYPE=$1 -if [ -z $BUILD_TYPE ]; then - BUILD_TYPE=release -fi - -BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=ON" -if [ "$BUILD_TREZOR" == false ]; then - BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=OFF" -fi -BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR_UDP_RELEASE=ON ${BUILD_TREZOR_FLAGS}" - -STATIC=false -ANDROID=false -if [ "$BUILD_TYPE" == "release" ]; then - echo "Building libwallet release" - CMAKE_BUILD_TYPE=Release -elif [ "$BUILD_TYPE" == "release-static" ]; then - echo "Building libwallet release-static" - CMAKE_BUILD_TYPE=Release - STATIC=true -elif [ "$BUILD_TYPE" == "release-android" ]; then - echo "Building libwallet release-static for ANDROID" - CMAKE_BUILD_TYPE=Release - STATIC=true - ANDROID=true -elif [ "$BUILD_TYPE" == "debug-android" ]; then - echo "Building libwallet debug-static for ANDROID" - CMAKE_BUILD_TYPE=Debug - STATIC=true - ANDROID=true -elif [ "$BUILD_TYPE" == "debug" ]; then - echo "Building libwallet debug" - CMAKE_BUILD_TYPE=Debug - STATIC=true -else - echo "Valid build types are release, release-static, release-android, debug-android and debug" - exit 1; -fi - - -echo "cleaning up existing monero build dir, libs and includes" -rm -fr $MONERO_DIR/build -rm -fr $MONERO_DIR/lib -rm -fr $MONERO_DIR/include -rm -fr $MONERO_DIR/bin - - -mkdir -p $MONERO_DIR/build/$BUILD_TYPE -pushd $MONERO_DIR/build/$BUILD_TYPE - -# reusing function from "utils.sh" -platform=$(get_platform) -# default make executable -make_exec="make" - -if [ -z "$ARCH" ]; then - ARCH="native" - if [ "$platform" == "darwin" ]; then - if [ "$STATIC" == true ]; then - ARCH="x86-64" - fi - elif [ "$platform" == "linux64" ]; then - if [ "$ANDROID" == true ]; then - ARCH="armv7-a" - elif [ "$STATIC" == true ]; then - ARCH="x86-64" - fi - elif [ "$platform" == "linux32" ]; then - if [ "$STATIC" == true ]; then - ARCH="i686" - fi - elif [ "$platform" == "linuxarmv7" ]; then - ARCH="armv7-a" - elif [ "$platform" == "mingw32" ]; then - ARCH="i686" - elif [ "$platform" == "mingw64" ]; then - ARCH="x86-64" - fi -fi - -echo "Building for ARCH=$ARCH" - -## OS X -if [ "$platform" == "darwin" ]; then - echo "Configuring build for MacOS.." - if [ "$STATIC" == true ]; then - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_64=ON -D BUILD_TAG="mac-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - else - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_TAG="mac-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - fi - -## LINUX 64 -elif [ "$platform" == "linux64" ]; then - echo "Configuring build for Linux x64" - if [ "$ANDROID" == true ]; then - echo "Configuring build for Android on Linux host" - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D ANDROID=true -D BUILD_GUI_DEPS=ON -D USE_LTO=OFF -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - elif [ "$STATIC" == true ]; then - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_64=ON -D BUILD_TAG="linux-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - else - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_TAG="linux-x64" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - fi - -## LINUX 32 -elif [ "$platform" == "linux32" ]; then - echo "Configuring build for Linux i686" - if [ "$STATIC" == true ]; then - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - else - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - fi - -## LINUX ARMv7 -elif [ "$platform" == "linuxarmv7" ]; then - echo "Configuring build for Linux armv7" - if [ "$STATIC" == true ]; then - cmake -D BUILD_TESTS=OFF -D ARCH="$ARCH" -D STATIC=ON -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - else - cmake -D BUILD_TESTS=OFF -D ARCH="$ARCH" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - fi - -## LINUX other -elif [ "$platform" == "linux" ]; then - echo "Configuring build for Linux general" - if [ "$STATIC" == true ]; then - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - else - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - fi - -## Windows 64 -## Windows is always static to work outside msys2 -elif [ "$platform" == "mingw64" ]; then - # Do something under Windows NT platform - echo "Configuring build for MINGW64.." - BOOST_ROOT=/mingw64/boost - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D BOOST_ROOT="$BOOST_ROOT" -D ARCH="$ARCH" -D BUILD_TAG="win-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" -D CMAKE_TOOLCHAIN_FILE=../../cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(cd $MINGW_PREFIX/.. && pwd -W) ../.. - -## Windows 32 -elif [ "$platform" == "mingw32" ]; then - # Do something under Windows NT platform - echo "Configuring build for MINGW32.." - BOOST_ROOT=/mingw32/boost - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D Boost_DEBUG=ON -D BOOST_ROOT="$BOOST_ROOT" -D ARCH="$ARCH" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" -D CMAKE_TOOLCHAIN_FILE=../../cmake/32-bit-toolchain.cmake -D MSYS2_FOLDER=$(cd $MINGW_PREFIX/.. && pwd -W) ../.. - make_exec="mingw32-make" -else - echo "Unknown platform, configuring general build" - if [ "$STATIC" == true ]; then - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - else - cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. - fi -fi - -# set CPU core count -# thanks to SO: http://stackoverflow.com/a/20283965/4118915 -if test -z "$CPU_CORE_COUNT"; then - CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu) -fi - -# Build libwallet_merged -pushd $MONERO_DIR/build/$BUILD_TYPE/src/wallet -eval $make_exec version -C ../.. -eval $make_exec -j$CPU_CORE_COUNT -eval $make_exec install -j$CPU_CORE_COUNT -popd - -# Build monerod -# win32 need to build daemon manually with msys2 toolchain -if [ "$platform" != "mingw32" ] && [ "$ANDROID" != true ]; then - pushd $MONERO_DIR/build/$BUILD_TYPE/src/daemon - eval make -j$CPU_CORE_COUNT - eval make install -j$CPU_CORE_COUNT - popd -fi - -# build install epee -eval make -C $MONERO_DIR/build/$BUILD_TYPE/contrib/epee all install - -# install easylogging -eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/easylogging++ all install - -# install lmdb -eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/db_drivers/liblmdb all install - -# Install libunbound -if [ -d $MONERO_DIR/build/$BUILD_TYPE/external/unbound ]; then - echo "Installing libunbound..." - pushd $MONERO_DIR/build/$BUILD_TYPE/external/unbound - # no need to make, it was already built as dependency for libwallet - # make -j$CPU_CORE_COUNT - $make_exec install -j$CPU_CORE_COUNT - popd -fi - -# install randomx -eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/randomx all install - -popd diff --git a/ios_get_libwallet.api.sh b/ios_get_libwallet.api.sh deleted file mode 100755 index df07a98e..00000000 --- a/ios_get_libwallet.api.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -e - -# 3 header files required by monero are missing from the IOS SDK. I copied them from iphoneSimulator SDK -# cd /Applications/XCode.app -# sudo cp ./Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/sys/vmmeter.h ./Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sys/ -# sudo cp ./Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/netinet/udp_var.h ./Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/netinet/ -# sudo cp ./Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/netinet/ip_var.h ./Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/netinet/ - - -if [ -z $BUILD_TYPE ]; then - BUILD_TYPE=release -fi - -ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -if [ -z $BOOST_LIBRARYDIR ]; then - BOOST_LIBRARYDIR=${ROOT_DIR}/../ofxiOSBoost/build/ios/prefix/lib -fi -if [ -z $BOOST_INCLUDEDIR ]; then - BOOST_INCLUDEDIR=${ROOT_DIR}/../ofxiOSBoost/build/ios/prefix/include -fi -if [ -z $OPENSSL_INCLUDE_DIR ]; then - OPENSSL_INCLUDE_DIR=${ROOT_DIR}/../openssl/1.0.2j/include -fi -if [ -z $OPENSSL_ROOT_DIR ]; then - OPENSSL_ROOT_DIR=${ROOT_DIR}/../openssl/1.0.2j -fi - -echo "Building IOS armv7" -rm -r monero/build > /dev/null -mkdir -p monero/build/release -pushd monero/build/release -cmake -D IOS=ON -D ARCH=armv7 -D BOOST_LIBRARYDIR=${BOOST_INCLUDEDIR} -D BOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -D OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -D OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -D CMAKE_BUILD_TYPE=debug -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="/Users/jacob/crypto/monero-core/monero" ../.. -make -j4 && make install -popd -echo "Building IOS arm64" -rm -r monero/build > /dev/null -mkdir -p monero/build/release -pushd monero/build/release -cmake -D IOS=ON -D ARCH=armv8-a -D BOOST_LIBRARYDIR=${BOOST_INCLUDEDIR} -D BOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -D OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -D OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -D CMAKE_BUILD_TYPE=debug -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="/Users/jacob/crypto/monero-core/monero" ../.. -make -j4 && make install -popd - -echo "Creating fat library for armv7 and arm64" -pushd monero -mkdir -p lib-ios -lipo -create lib-armv7/libwallet_merged.a lib-arm64/libwallet_merged.a -output lib-ios/libwallet_merged.a -lipo -create lib-armv7/libunbound.a lib-arm64/libunbound.a -output lib-ios/libunbound.a -lipo -create lib-armv7/libepee.a lib-arm64/libepee.a -output lib-ios/libepee.a -popd \ No newline at end of file diff --git a/linuxdeploy_helper.sh b/linuxdeploy_helper.sh deleted file mode 100755 index 59c1873c..00000000 --- a/linuxdeploy_helper.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -source $ROOT_DIR/utils.sh - -TARGET=$1 - -GUI_EXEC=$2 - -platform=$(get_platform) - -if [[ "$platform" == "linux64" ]]; then - PLAT_DIR="/usr/lib/x86_64-linux-gnu" -elif [[ "$platform" == "linux32" ]]; then - PLAT_DIR="/usr/lib/i386-linux-gnu" -elif [[ "$platform" == "linuxarmv7" ]]; then - PLAT_DIR="/usr/lib/arm-linux-gnueabihf" -elif [[ "$platform" == "linuxarmv8" ]]; then - PLAT_DIR="/usr/lib/aarch64-linux-gnu" -else - PLAT_DIR="/usr/lib" -fi - -if [ -z "$QT_DIR" ]; then - QT_DIR=$PLAT_DIR/qt5 -fi - -if [ -z "$QTXML_DIR" ]; then - QTXML_DIR=$PLAT_DIR -fi - -# Copy dependencies -EXCLUDE='libstdc++|libgcc_s.so|libc.so|libpthread' -INCLUDE='libunbound' -cp -rv $QT_DIR/qml $TARGET || exit -cp -rv $QT_DIR/plugins $TARGET || exit -mkdir -p $TARGET/libs || exit -#ldd $TARGET/$GUI_EXEC | grep "=> /" | awk '{print $3}' | grep $INCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit -#ldd $TARGET/$GUI_EXEC | grep "=> /" | awk '{print $3}' | grep -Ev $EXCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit -#ldd $TARGET/plugins/platforms/libqxcb.so| grep "=> /" | awk '{print $3}' | grep -Ev $EXCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit -#cp -v $QTXML_DIR/libQt5XmlPatterns.so.5 $TARGET/libs || exit - -# Create start script -cat > $TARGET/start-gui.sh < $TARGET/start-tails.AppImage <