Skip to content

Commit

Permalink
[Build system][GUI][docs] - refactor build process for snap, dpkg (da…
Browse files Browse the repository at this point in the history
…shpay#151)

update snapcraft and dpkg build process

### GUI
- [x] gui - update qt images, add new splash, replace banner (5456831)
- [x] gui - qt, replace regtest and testnet icons with new (455518c)
- [x] gui - update pixmaps from share folder (740dec0)

#### New artworks
- new QT icons
  ![ion_testnet](https://user-images.githubusercontent.com/24996551/56173836-bfba7080-5fef-11e9-9ec6-584ce0a64699.png) ![ion_regtest](https://user-images.githubusercontent.com/24996551/56173847-c943d880-5fef-11e9-9e41-d1f7af6b545d.png)
- new Daemon icons
  ![iond256](https://user-images.githubusercontent.com/24996551/56173867-e5e01080-5fef-11e9-8831-e1d20d705e0c.png) ![iond_testnet256](https://user-images.githubusercontent.com/24996551/56173888-f55f5980-5fef-11e9-95e4-402ae64f8bb8.png) ![iond_regtest256](https://user-images.githubusercontent.com/24996551/56173879-eed0e200-5fef-11e9-95d4-8288b32e856e.png)
- new splash screens for normal builds and snapcraft
  - new main splash
    ![splash](https://user-images.githubusercontent.com/24996551/56173909-1627af00-5ff0-11e9-9895-7f68d9f792f1.png) ![splash_snap](https://user-images.githubusercontent.com/24996551/56173911-1a53cc80-5ff0-11e9-9b75-b963a0811c1d.png)
  - new testnet splash
    ![splash_testnet](https://user-images.githubusercontent.com/24996551/56173937-37889b00-5ff0-11e9-9741-c93112ec40e1.png) ![splash_testnet_snap](https://user-images.githubusercontent.com/24996551/56173942-3c4d4f00-5ff0-11e9-93a9-f207bb289c8e.png)
  - new regtest splash
    ![splash_regtest](https://user-images.githubusercontent.com/24996551/56173945-43745d00-5ff0-11e9-891e-576dd40d14b5.png) ![splash_regtest_snap](https://user-images.githubusercontent.com/24996551/56173948-4a02d480-5ff0-11e9-80b3-6815577337ab.png)
- new SVG  sources for splash screens
  - add metadata and license info to new and some ionomy sources
    - **TODO** ***add license and author info to all available old resources, if info not available, replace it***
### Build System
- [x] build - snap, remove snap files from share folder (6e52766)
- [x] build - snap, refactor snap (efa1af8)
- [x] build - debian, update debian building (e392659)
- [x] build - snap, remove desktop-qt5 as it is not available with core18 (a1b16b1)

### Docs
- [x] docs - snap, create snap readme in doc folder (be5674d)
-

### Protocol
- [x] set min protocol version to current (1d5f0b0)
 
## squashed commits
* gui - artworks, update SVG sources and cleanup

- remove obsolete xcf images
- rename ion-ionlogowhite.svg to ion_logo_white.svg
- recreate new daemon icon vector graphics

* gui - update qt images, add new splash, replace banner

- replace ion_logo_horizontal.png
- replace all splash screens
- add new snapcraft splash screens

* gui - qt, replace regtest and testnet icons with new

* build - snap, remove snap files from share folder

* build - snap, refactor snap

- cleanup comments
- restructure
- add more info in log
- added list variables at the end of the job
- replace splash by snapcrafts splash
- move priming data to snap/desktop
- move priming patches to snap/patches
  (_is not required as all current patches are only applied during compilation_)

* gui - update pixmaps from share folder

- create new icons
- create new pngs
- use naming scheme ion_NETWORK
- added *48.xpm
- added testnet and regtest icons

* docs - snap, create snap readme in doc folder

* build - debian, update debian building

- update control file, add missing build libs
- create new icons
- use naming scheme ion_NETWORK
- update *.desktop files
- minor fixes in *.desktop files
- create daemon icons for main, testnet and regtest
- update installation configs

* set min protocol version to current

* build - snap, remove desktop-qt5 as it is not available with core18

* travis - add snapcraft.yaml to lint-whitespace whitelist, remove build-dpkd.sh

* network - update hardcoded seeds
  • Loading branch information
Cevap Master committed Feb 6, 2021
1 parent 2154940 commit 8eb0f4a
Show file tree
Hide file tree
Showing 145 changed files with 77,454 additions and 14,575 deletions.
4 changes: 2 additions & 2 deletions contrib/devtools/lint-whitespace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ if [ -z "${TRAVIS_COMMIT_RANGE}" ]; then
fi

showdiff() {
if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- "." ":(exclude)depends/patches/" ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)debian/control" ":(exclude)contrib/debian/build-dpkg.sh"; then
if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- "." ":(exclude)depends/patches/" ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)debian/control" ":(exclude)/snap/snapcraft.yaml"; then
echo "Failed to get a diff"
exit 1
fi
}

showcodediff() {
if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- *.cpp *.h *.md *.py *.sh ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)debian/control" ":(exclude)contrib/debian/build-dpkg.sh"; then
if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- *.cpp *.h *.md *.py *.sh ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)debian/control" ":(exclude)/snap/snapcraft.yaml"; then
echo "Failed to get a diff"
exit 1
fi
Expand Down
22 changes: 9 additions & 13 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ Build-Depends: debhelper,
libprotobuf-dev, protobuf-compiler,
libevent-dev,
libzmq3-dev,
locales-all
locales-all,
help2man,
doxygen
Standards-Version: 4.3.0
Homepage: http://www.ionomy.com
Vcs-Git: git://github.com/ioncoincore/ion.git
Expand All @@ -63,8 +65,7 @@ Description: gaming related peer-to-peer network based digital currency daemon
- Wiki (Ion Core CE): https://github.com/cevap/ion/wiki
- Technical documentation: https://techdoc.ioncoin.org
- Whitepaper: https://ionomy.com/en/whitepaper
- Technical whitepaper:
https://github.com/ionomy/ion/wiki/ION-Technical-Whitepaper
- Technical whitepaper: https://tinyurl.com/y3st8jfb
.
Get source code from Github: https://github.com/ioncoincore/ion.git
Get CE source code from Github: https://github.com/cevap/ion.git
Expand Down Expand Up @@ -104,8 +105,7 @@ Description: gaming related peer-to-peer network based digital currency CLI
- Wiki (Ion Core CE): https://github.com/cevap/ion/wiki
- Technical documentation: https://techdoc.ioncoin.org
- Whitepaper: https://ionomy.com/en/whitepaper
- Technical whitepaper:
https://github.com/ionomy/ion/wiki/ION-Technical-Whitepaper
- Technical whitepaper: https://tinyurl.com/y3st8jfb
.
Get source code from Github: https://github.com/ioncoincore/ion.git
Get CE source code from Github: https://github.com/cevap/ion.git
Expand Down Expand Up @@ -145,8 +145,7 @@ Description: gaming related peer-to-peer network based digital currency ION GUI
- Wiki (Ion Core CE): https://github.com/cevap/ion/wiki
- Technical documentation: https://techdoc.ioncoin.org
- Whitepaper: https://ionomy.com/en/whitepaper
- Technical whitepaper:
https://github.com/ionomy/ion/wiki/ION-Technical-Whitepaper
- Technical whitepaper: https://tinyurl.com/y3st8jfb
.
Get source code from Github: https://github.com/ioncoincore/ion.git
Get CE source code from Github: https://github.com/cevap/ion.git
Expand Down Expand Up @@ -186,8 +185,7 @@ Description: gaming related peer-to-peer network based digital currency tx tool
- Wiki (Ion Core CE): https://github.com/cevap/ion/wiki
- Technical documentation: https://techdoc.ioncoin.org
- Whitepaper: https://ionomy.com/en/whitepaper
- Technical whitepaper:
https://github.com/ionomy/ion/wiki/ION-Technical-Whitepaper
- Technical whitepaper: https://tinyurl.com/y3st8jfb
.
Get source code from Github: https://github.com/ioncoincore/ion.git
Get CE source code from Github: https://github.com/cevap/ion.git
Expand Down Expand Up @@ -228,8 +226,7 @@ Description: gaming related peer-to-peer network based digital currency full sui
- Wiki (Ion Core CE): https://github.com/cevap/ion/wiki
- Technical documentation: https://techdoc.ioncoin.org
- Whitepaper: https://ionomy.com/en/whitepaper
- Technical whitepaper:
https://github.com/ionomy/ion/wiki/ION-Technical-Whitepaper
- Technical whitepaper: https://tinyurl.com/y3st8jfb
.
Get source code from Github: https://github.com/ioncoincore/ion.git
Get CE source code from Github: https://github.com/cevap/ion.git
Expand Down Expand Up @@ -270,8 +267,7 @@ Description: gaming related peer-to-peer network based digital currency dev pack
- Wiki (Ion Core CE): https://github.com/cevap/ion/wiki
- Technical documentation: https://techdoc.ioncoin.org
- Whitepaper: https://ionomy.com/en/whitepaper
- Technical whitepaper:
https://github.com/ionomy/ion/wiki/ION-Technical-Whitepaper
- Technical whitepaper: https://tinyurl.com/y3st8jfb
.
Get source code from Github: https://github.com/ioncoincore/ion.git
Get CE source code from Github: https://github.com/cevap/ion.git
Expand Down
42 changes: 32 additions & 10 deletions debian/ion-dev.install
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,44 @@ usr/local/bin/ion-qt usr/bin
share/pixmaps/ion32.xpm usr/share/pixmaps
share/pixmaps/ion16.xpm usr/share/pixmaps
share/pixmaps/ion128.png usr/share/pixmaps
share/pixmaps/iontestnet32.xpm usr/share/pixmaps
share/pixmaps/iontestnet16.xpm usr/share/pixmaps
share/pixmaps/iontestnet128.png usr/share/pixmaps
share/pixmaps/ionregtest32.xpm usr/share/pixmaps
share/pixmaps/ionregtest16.xpm usr/share/pixmaps
share/pixmaps/ionregtest128.png usr/share/pixmaps
share/pixmaps/ion_testnet32.xpm usr/share/pixmaps
share/pixmaps/ion_testnet16.xpm usr/share/pixmaps
share/pixmaps/ion_testnet128.png usr/share/pixmaps
share/pixmaps/ion_regtest32.xpm usr/share/pixmaps
share/pixmaps/ion_regtest16.xpm usr/share/pixmaps
share/pixmaps/ion_regtest128.png usr/share/pixmaps
share/pixmaps/iond16.xpm usr/share/pixmaps
share/pixmaps/iond32.xpm usr/share/pixmaps
share/pixmaps/iond48.xpm usr/share/pixmaps
share/pixmaps/iond64.xpm usr/share/pixmaps
share/pixmaps/iond128.png usr/share/pixmaps
share/pixmaps/iond256.xpm usr/share/pixmaps
share/pixmaps/iond_testnet16.xpm usr/share/pixmaps
share/pixmaps/iond_testnet32.xpm usr/share/pixmaps
share/pixmaps/iond_testnet48.xpm usr/share/pixmaps
share/pixmaps/iond_testnet64.xpm usr/share/pixmaps
share/pixmaps/iond_testnet128.png usr/share/pixmaps
share/pixmaps/iond_testnet256.xpm usr/share/pixmaps
share/pixmaps/iond_regtest16.xpm usr/share/pixmaps
share/pixmaps/iond_regtest32.xpm usr/share/pixmaps
share/pixmaps/iond_regtest48.xpm usr/share/pixmaps
share/pixmaps/iond_regtest64.xpm usr/share/pixmaps
share/pixmaps/iond_regtest128.png usr/share/pixmaps
share/pixmaps/iond_regtest256.xpm usr/share/pixmaps
debian/ion-qt.desktop usr/share/applications
debian/ion-qt-testnet.desktop usr/share/applications
debian/ion-qt-regtest.desktop usr/share/applications
debian/ion-qt_testnet.desktop usr/share/applications
debian/ion-qt_regtest.desktop usr/share/applications
debian/ion-qt.protocol usr/share/kde4/services/
debian/ion-qt-testnet.protocol usr/share/kde4/services/
debian/ion-qt-regtest.protocol usr/share/kde4/services/
debian/ion-qt_testnet.protocol usr/share/kde4/services/
debian/ion-qt_regtest.protocol usr/share/kde4/services/
usr/local/bin/iond usr/bin
usr/local/bin/ion-cli usr/bin
usr/local/bin/ion-tx usr/bin
usr/local/bin/test_ion usr/bin
usr/local/bin/test_ion-qt usr/bin
debian/iond.desktop usr/share/applications
debian/iond.protocol usr/share/kde4/services/
debian/iond_testnet.desktop usr/share/applications
debian/iond_testnet.protocol usr/share/kde4/services/
debian/iond_regtest.desktop usr/share/applications
debian/iond_regtest.protocol usr/share/kde4/services/
42 changes: 32 additions & 10 deletions debian/ion-full.install
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,42 @@ usr/local/bin/ion-qt usr/bin
share/pixmaps/ion32.xpm usr/share/pixmaps
share/pixmaps/ion16.xpm usr/share/pixmaps
share/pixmaps/ion128.png usr/share/pixmaps
share/pixmaps/iontestnet32.xpm usr/share/pixmaps
share/pixmaps/iontestnet16.xpm usr/share/pixmaps
share/pixmaps/iontestnet128.png usr/share/pixmaps
share/pixmaps/ionregtest32.xpm usr/share/pixmaps
share/pixmaps/ionregtest16.xpm usr/share/pixmaps
share/pixmaps/ionregtest128.png usr/share/pixmaps
share/pixmaps/ion_testnet32.xpm usr/share/pixmaps
share/pixmaps/ion_testnet16.xpm usr/share/pixmaps
share/pixmaps/ion_testnet128.png usr/share/pixmaps
share/pixmaps/ion_regtest32.xpm usr/share/pixmaps
share/pixmaps/ion_regtest16.xpm usr/share/pixmaps
share/pixmaps/ion_regtest128.png usr/share/pixmaps
share/pixmaps/iond16.xpm usr/share/pixmaps
share/pixmaps/iond32.xpm usr/share/pixmaps
share/pixmaps/iond48.xpm usr/share/pixmaps
share/pixmaps/iond64.xpm usr/share/pixmaps
share/pixmaps/iond128.png usr/share/pixmaps
share/pixmaps/iond256.xpm usr/share/pixmaps
share/pixmaps/iond_testnet16.xpm usr/share/pixmaps
share/pixmaps/iond_testnet32.xpm usr/share/pixmaps
share/pixmaps/iond_testnet48.xpm usr/share/pixmaps
share/pixmaps/iond_testnet64.xpm usr/share/pixmaps
share/pixmaps/iond_testnet128.png usr/share/pixmaps
share/pixmaps/iond_testnet256.xpm usr/share/pixmaps
share/pixmaps/iond_regtest16.xpm usr/share/pixmaps
share/pixmaps/iond_regtest32.xpm usr/share/pixmaps
share/pixmaps/iond_regtest48.xpm usr/share/pixmaps
share/pixmaps/iond_regtest64.xpm usr/share/pixmaps
share/pixmaps/iond_regtest128.png usr/share/pixmaps
share/pixmaps/iond_regtest256.xpm usr/share/pixmaps
debian/ion-qt.desktop usr/share/applications
debian/ion-qt-testnet.desktop usr/share/applications
debian/ion-qt-regtest.desktop usr/share/applications
debian/ion-qt_testnet.desktop usr/share/applications
debian/ion-qt_regtest.desktop usr/share/applications
debian/ion-qt.protocol usr/share/kde4/services/
debian/ion-qt-testnet.protocol usr/share/kde4/services/
debian/ion-qt-regtest.protocol usr/share/kde4/services/
debian/ion-qt_testnet.protocol usr/share/kde4/services/
debian/ion-qt_regtest.protocol usr/share/kde4/services/
usr/local/bin/iond usr/bin
usr/local/bin/ion-cli usr/bin
usr/local/bin/ion-tx usr/bin
debian/iond.desktop usr/share/applications
debian/iond.protocol usr/share/kde4/services/
debian/iond_testnet.desktop usr/share/applications
debian/iond_testnet.protocol usr/share/kde4/services/
debian/iond_regtest.desktop usr/share/applications
debian/iond_regtest.protocol usr/share/kde4/services/
14 changes: 0 additions & 14 deletions debian/ion-qt-regtest.desktop

This file was deleted.

14 changes: 0 additions & 14 deletions debian/ion-qt-testnet.desktop

This file was deleted.

2 changes: 1 addition & 1 deletion debian/ion-qt.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[Desktop Entry]
Encoding=UTF-8
Name=ION Core
Name=Ion Core
Comment=main
GenericName=Ion Digital Currency QT client main network
Exec=ion-qt %u
Expand Down
31 changes: 20 additions & 11 deletions debian/ion-qt.install
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
usr/local/bin/ion-qt usr/bin
share/pixmaps/ion32.xpm usr/share/pixmaps
share/pixmaps/ion16.xpm usr/share/pixmaps
share/pixmaps/ion32.xpm usr/share/pixmaps
share/pixmaps/ion48.xpm usr/share/pixmaps
share/pixmaps/ion64.xpm usr/share/pixmaps
share/pixmaps/ion128.png usr/share/pixmaps
share/pixmaps/iontestnet32.xpm usr/share/pixmaps
share/pixmaps/iontestnet16.xpm usr/share/pixmaps
share/pixmaps/iontestnet128.png usr/share/pixmaps
share/pixmaps/ionregtest32.xpm usr/share/pixmaps
share/pixmaps/ionregtest16.xpm usr/share/pixmaps
share/pixmaps/ionregtest128.png usr/share/pixmaps
share/pixmaps/ion256.xpm usr/share/pixmaps
share/pixmaps/ion_testnet16.xpm usr/share/pixmaps
share/pixmaps/ion_testnet32.xpm usr/share/pixmaps
share/pixmaps/ion_testnet48.xpm usr/share/pixmaps
share/pixmaps/ion_testnet64.xpm usr/share/pixmaps
share/pixmaps/ion_testnet128.png usr/share/pixmaps
share/pixmaps/ion_testnet256.xpm usr/share/pixmaps
share/pixmaps/ion_regtest16.xpm usr/share/pixmaps
share/pixmaps/ion_regtest32.xpm usr/share/pixmaps
share/pixmaps/ion_regtest48.xpm usr/share/pixmaps
share/pixmaps/ion_regtest64.xpm usr/share/pixmaps
share/pixmaps/ion_regtest128.png usr/share/pixmaps
share/pixmaps/ion_regtest256.xpm usr/share/pixmaps
debian/ion-qt.desktop usr/share/applications
debian/ion-qt-testnet.desktop usr/share/applications
debian/ion-qt-regtest.desktop usr/share/applications
debian/ion-qt_testnet.desktop usr/share/applications
debian/ion-qt_regtest.desktop usr/share/applications
debian/ion-qt.protocol usr/share/kde4/services/
debian/ion-qt-testnet.protocol usr/share/kde4/services/
debian/ion-qt-regtest.protocol usr/share/kde4/services/
debian/ion-qt_testnet.protocol usr/share/kde4/services/
debian/ion-qt_regtest.protocol usr/share/kde4/services/
18 changes: 18 additions & 0 deletions debian/iond.install
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
share/pixmaps/iond16.xpm usr/share/pixmaps
share/pixmaps/iond32.xpm usr/share/pixmaps
share/pixmaps/iond48.xpm usr/share/pixmaps
share/pixmaps/iond64.xpm usr/share/pixmaps
share/pixmaps/iond128.png usr/share/pixmaps
share/pixmaps/iond256.xpm usr/share/pixmaps
share/pixmaps/iond_testnet16.xpm usr/share/pixmaps
share/pixmaps/iond_testnet32.xpm usr/share/pixmaps
share/pixmaps/iond_testnet48.xpm usr/share/pixmaps
share/pixmaps/iond_testnet64.xpm usr/share/pixmaps
share/pixmaps/iond_testnet128.png usr/share/pixmaps
share/pixmaps/iond_testnet256.xpm usr/share/pixmaps
share/pixmaps/iond_regtest16.xpm usr/share/pixmaps
share/pixmaps/iond_regtest32.xpm usr/share/pixmaps
share/pixmaps/iond_regtest48.xpm usr/share/pixmaps
share/pixmaps/iond_regtest64.xpm usr/share/pixmaps
share/pixmaps/iond_regtest128.png usr/share/pixmaps
share/pixmaps/iond_regtest256.xpm usr/share/pixmaps
usr/local/bin/iond usr/bin
usr/local/bin/ion-cli usr/bin
usr/local/bin/ion-tx usr/bin
Expand Down
Binary file modified share/pixmaps/ion-bc.ico
Binary file not shown.
Binary file added share/pixmaps/ion_regtest128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8eb0f4a

Please sign in to comment.