From e335bc2fafd0ab93968fc0ffd2de58faeb35969a Mon Sep 17 00:00:00 2001 From: ca333 Date: Thu, 19 Oct 2017 00:30:34 +0200 Subject: [PATCH 1/8] use electrum branch --- buildscripts/easydex-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildscripts/easydex-build.sh b/buildscripts/easydex-build.sh index 7b634ed..164e21a 100755 --- a/buildscripts/easydex-build.sh +++ b/buildscripts/easydex-build.sh @@ -9,8 +9,8 @@ echo "Building EasyDEX-GUI" echo "Actual directory is: ${PWD}" echo "Checkout to redux branch." -git checkout redux -git pull origin redux +git checkout electrum +git pull origin electrum [ -d react ] && cd react || echo "!!! I can't find react" echo "Actual directory is: ${PWD}" From 80646dc00732759b5454879cfa5672747bd88b37 Mon Sep 17 00:00:00 2001 From: ca333 Date: Wed, 25 Oct 2017 00:00:12 +0200 Subject: [PATCH 2/8] use legacy libs for OSX --- binary_artifacts.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/binary_artifacts.sh b/binary_artifacts.sh index 772ed88..ec70bea 100755 --- a/binary_artifacts.sh +++ b/binary_artifacts.sh @@ -20,16 +20,17 @@ echo Step: Permission +x for OSX binaries from artifacts to assets/bin/osx/ echo chmod +x assets/artifacts.supernet.org/latest/osx/iguana \ assets/artifacts.supernet.org/latest/osx/komodo* - -#cp -rvf assets/artifacts.supernet.org/latest/osx/* assets/bin/osx/ + mkdir assets/bin -echo Moving OSX bins to assets/bin -wget https://supernetorg.bintray.com/binaries/komodo_OSX_latest.zip -checksum=`shasum -a 256 komodo_OSX_latest.zip | awk '{ print $1 }'` -if [ "$checksum" = "c20a1b7268dd0d9bbc8984a0e76cc868d8b4479af18cd1dde4406f63b7f12255" ]; then +mv assets/artifacts.supernet.org/latest/osx assets/bin/osx + +echo Moving legacy libs to assets/bin +wget https://supernetorg.bintray.com/misc/libs_legacy_osx.zip +checksum=`shasum -a 256 libs_legacy_osx.zip | awk '{ print $1 }'` +if [ "$checksum" = "e9474aa243694a2d4c87fccc443e4b16a9a5172a24da76af9e5ecddd006649bb" ]; then echo "Checksum is correct." - unzip komodo_OSX_latest.zip - mv komodo_OSX_latest assets/bin/osx + unzip libs_legacy_osx.zip + cp -rvf libs_legacy_osx/* assets/bin/osx/. else echo "Checksum is incorrect!" exit 0 From 429ee46e413ab7d168ae8bdbc628bd768558f329 Mon Sep 17 00:00:00 2001 From: ca333 Date: Sun, 29 Oct 2017 13:52:22 +0100 Subject: [PATCH 3/8] clean GUI folder --- buildscripts/electron-build-osx.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildscripts/electron-build-osx.sh b/buildscripts/electron-build-osx.sh index 2a16874..08765cb 100755 --- a/buildscripts/electron-build-osx.sh +++ b/buildscripts/electron-build-osx.sh @@ -14,4 +14,7 @@ electron-packager . --platform=darwin --arch=x64 \ --out=build/ --buildVersion=$AGAMA_VERSION \ --ignore=assets/bin/win64 \ --ignore=assets/bin/linux64 \ + --ignore=react/node_modules \ + --ignore=react/src \ + --ignore=react/www \ --overwrite From 8c6e0ded684553b4474d9aff3404420dc711d350 Mon Sep 17 00:00:00 2001 From: ca333 Date: Sun, 29 Oct 2017 13:53:51 +0100 Subject: [PATCH 4/8] 333 --- buildscripts/electron-build-linux.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildscripts/electron-build-linux.sh b/buildscripts/electron-build-linux.sh index 47e7ed7..f906e50 100755 --- a/buildscripts/electron-build-linux.sh +++ b/buildscripts/electron-build-linux.sh @@ -15,4 +15,7 @@ electron-packager . --platform=linux --arch=x64 \ --buildVersion=$AGAMA_VERSION \ --ignore=assets/bin/win64 \ --ignore=assets/bin/osx \ - --overwrite \ No newline at end of file + --ignore=react/node_modules \ + --ignore=react/src \ + --ignore=react/www \ + --overwrite From 3d1162538b8f5819d8c0ad3ab16ab296ed16bfac Mon Sep 17 00:00:00 2001 From: ca333 Date: Sun, 29 Oct 2017 13:54:15 +0100 Subject: [PATCH 5/8] 333 --- buildscripts/electron-build-windows.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildscripts/electron-build-windows.sh b/buildscripts/electron-build-windows.sh index cb2c1d5..f767aaf 100755 --- a/buildscripts/electron-build-windows.sh +++ b/buildscripts/electron-build-windows.sh @@ -16,10 +16,13 @@ electron-packager . --platform=win32 \ --buildVersion=$AGAMA_VERSION \ --ignore=assets/bin/osx \ --ignore=assets/bin/linux64 \ + --ignore=react/node_modules \ + --ignore=react/src \ + --ignore=react/www \ --overwrite \ --version-string.CompanyName="SuperNET" \ --version-string.FileDescription="Agama" \ --version-string.OriginalFilename="Agama" \ --version-string.ProductName="Agama" \ --version-string.InternalName="Agama" \ - --app-copyright="Copyright (C) 2017 SuperNET. All rights reserved." \ No newline at end of file + --app-copyright="Copyright (C) 2017 SuperNET. All rights reserved." From 4a3ec9295eb837db31f3c87ca0e0d33facd24b84 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Sun, 29 Oct 2017 17:05:12 +0300 Subject: [PATCH 6/8] rm iguana bins from installers --- binary_artifacts.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/binary_artifacts.sh b/binary_artifacts.sh index ec70bea..3faa2b3 100755 --- a/binary_artifacts.sh +++ b/binary_artifacts.sh @@ -18,19 +18,18 @@ pwd echo ========================================= echo Step: Permission +x for OSX binaries from artifacts to assets/bin/osx/ echo -chmod +x assets/artifacts.supernet.org/latest/osx/iguana \ - assets/artifacts.supernet.org/latest/osx/komodo* - -mkdir assets/bin -mv assets/artifacts.supernet.org/latest/osx assets/bin/osx +rm assets/artifacts.supernet.org/latest/osx/iguana +chmod +x assets/artifacts.supernet.org/latest/osx/komodo* -echo Moving legacy libs to assets/bin -wget https://supernetorg.bintray.com/misc/libs_legacy_osx.zip -checksum=`shasum -a 256 libs_legacy_osx.zip | awk '{ print $1 }'` -if [ "$checksum" = "e9474aa243694a2d4c87fccc443e4b16a9a5172a24da76af9e5ecddd006649bb" ]; then +#cp -rvf assets/artifacts.supernet.org/latest/osx/* assets/bin/osx/ +mkdir assets/bin +echo Moving OSX bins to assets/bin +wget https://supernetorg.bintray.com/binaries/komodo_OSX_latest.zip +checksum=`shasum -a 256 komodo_OSX_latest.zip | awk '{ print $1 }'` +if [ "$checksum" = "c20a1b7268dd0d9bbc8984a0e76cc868d8b4479af18cd1dde4406f63b7f12255" ]; then echo "Checksum is correct." - unzip libs_legacy_osx.zip - cp -rvf libs_legacy_osx/* assets/bin/osx/. + unzip komodo_OSX_latest.zip + mv komodo_OSX_latest assets/bin/osx else echo "Checksum is incorrect!" exit 0 @@ -38,13 +37,14 @@ fi echo ========================================= echo Step: Moving Windows binaries from artifacts to assets/bin/win64/ #echo +rm assets/artifacts.supernet.org/latest/windows/iguana mv assets/artifacts.supernet.org/latest/windows assets/bin/win64 echo echo ========================================= echo Step: Permissions +x for linux64 binaries from artifacts to assets/bin/linux64 echo -chmod +x assets/artifacts.supernet.org/latest/linux/iguana \ - assets/artifacts.supernet.org/latest/linux/komodo* +rm assets/artifacts.supernet.org/latest/linux/iguana +chmod +x assets/artifacts.supernet.org/latest/linux/komodo* echo Moving Linux bins to assets/bin mv assets/artifacts.supernet.org/latest/linux assets/bin/linux64/ echo From 01f0a3879c3079bfb1646e10a46291c36f3476c4 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Sun, 29 Oct 2017 17:07:39 +0300 Subject: [PATCH 7/8] rm iguana bins from installers #2 --- binary_artifacts.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/binary_artifacts.sh b/binary_artifacts.sh index 3faa2b3..e1be581 100755 --- a/binary_artifacts.sh +++ b/binary_artifacts.sh @@ -21,15 +21,16 @@ echo rm assets/artifacts.supernet.org/latest/osx/iguana chmod +x assets/artifacts.supernet.org/latest/osx/komodo* -#cp -rvf assets/artifacts.supernet.org/latest/osx/* assets/bin/osx/ mkdir assets/bin -echo Moving OSX bins to assets/bin -wget https://supernetorg.bintray.com/binaries/komodo_OSX_latest.zip -checksum=`shasum -a 256 komodo_OSX_latest.zip | awk '{ print $1 }'` -if [ "$checksum" = "c20a1b7268dd0d9bbc8984a0e76cc868d8b4479af18cd1dde4406f63b7f12255" ]; then +mv assets/artifacts.supernet.org/latest/osx assets/bin/osx + +echo Moving legacy libs to assets/bin +wget https://supernetorg.bintray.com/misc/libs_legacy_osx.zip +checksum=`shasum -a 256 libs_legacy_osx.zip | awk '{ print $1 }'` +if [ "$checksum" = "e9474aa243694a2d4c87fccc443e4b16a9a5172a24da76af9e5ecddd006649bb" ]; then echo "Checksum is correct." - unzip komodo_OSX_latest.zip - mv komodo_OSX_latest assets/bin/osx + unzip libs_legacy_osx.zip + cp -rvf libs_legacy_osx/* assets/bin/osx/. else echo "Checksum is incorrect!" exit 0 @@ -50,4 +51,4 @@ mv assets/artifacts.supernet.org/latest/linux assets/bin/linux64/ echo echo ========================================= echo Step: Finished Updating binaries from artifacts -echo +echo \ No newline at end of file From ff109959b1be9e7be93e3f07a3ffdf780c403f23 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Sun, 12 Nov 2017 01:04:01 +0300 Subject: [PATCH 8/8] build version bump --- version_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_build b/version_build index 9fb4176..f6ff6c1 100644 --- a/version_build +++ b/version_build @@ -1 +1 @@ -0.2.0.23a-beta +0.2.0.24a-beta