Skip to content

Commit

Permalink
Merge pull request #3 from italocoin-project/release
Browse files Browse the repository at this point in the history
upgrade
  • Loading branch information
ilie1988 committed Jan 18, 2020
2 parents c01095a + c64be6a commit 08d1c64
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 7 deletions.
6 changes: 3 additions & 3 deletions get_libwallet_api.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if [ ! -d $MONERO_DIR/src ]; then
fi
git submodule update --remote
git -C $MONERO_DIR fetch
git -C $MONERO_DIR checkout v0.15.0.1
git -C $MONERO_DIR checkout v0.15.0.0

# get italo core tag
pushd $MONERO_DIR
Expand All @@ -32,8 +32,8 @@ git -C $MONERO_DIR checkout -B $VERSIONTAG
# 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 "Italo GUI"
git -C $MONERO_DIR config user.email "gui@italo.local"
git -C $MONERO_DIR config user.name "Italo"
git -C $MONERO_DIR config user.email "info@italo.network"
# 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 italo push request #$PR"
Expand Down
2 changes: 1 addition & 1 deletion italo
Submodule italo updated from c1e8bc to 0579b1
52 changes: 49 additions & 3 deletions windeploy_helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,59 @@ fi

if [[ "$BUILD_TYPE" == "Release" ]]; then
echo "Release build"
ICU_FILES=(libicudt64.dll libicuin64.dll libicuio64.dll libicutu64.dll libicuuc64.dll)
ICU_FILES=(libicudt65.dll libicuin65.dll libicuio65.dll libicutu65.dll libicuuc65.dll)
else
echo "Debug build"
ICU_FILES=(libicudtd64.dll libicuind64.dll libicuiod64.dll libicutud64.dll libicuucd64.dll)
ICU_FILES=(libicudtd65.dll libicuind65.dll libicuiod65.dll libicutud65.dll libicuucd65.dll)
fi

FILES=(libprotobuf.dll libusb-1.0.dll zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll libdouble-conversion.dll)
FILES=(libprotobuf.dll libusb-1.0.dll zlib1.dll libzstd.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll libdouble-conversion.dll)

OPENSSL_FILES=(libssl-1_1 libcrypto-1_1)

platform=$(get_platform)

if [[ "$platform" == "mingw64" ]]; then
PLATFORM_FILES="libgcc_s_seh-1.dll"
OPENSSL_SUFFIX="-x64"
elif [[ "$platform" == "mingw32" ]]; then
PLATFORM_FILES="libgcc_s_dw2-1.dll"
OPENSSL_SUFFIX = ""
fi

for f in "${FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done

for f in "${ICU_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done

for f in "${PLATFORM_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done

for f in "${OPENSSL_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f$OPENSSL_SUFFIX.dll $TARGET || exit 1; done

cp $ROOT_DIR/start-low-graphics-mode.bat $TARGET


OPENSSL_FILES=(libssl-1_1 libcrypto-1_1)

platform=$(get_platform)

if [[ "$platform" == "mingw64" ]]; then
PLATFORM_FILES="libgcc_s_seh-1.dll"
OPENSSL_SUFFIX="-x64"
elif [[ "$platform" == "mingw32" ]]; then
PLATFORM_FILES="libgcc_s_dw2-1.dll"
OPENSSL_SUFFIX = ""
fi

for f in "${FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done

for f in "${ICU_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done

for f in "${PLATFORM_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done

for f in "${OPENSSL_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f$OPENSSL_SUFFIX.dll $TARGET || exit 1; done

cp $ROOT_DIR/start-low-graphics-mode.bat $TARGET


OPENSSL_FILES=(libssl-1_1 libcrypto-1_1)

Expand Down

0 comments on commit 08d1c64

Please sign in to comment.