Skip to content

Commit

Permalink
New User Interface and new Features (#71)
Browse files Browse the repository at this point in the history
* CSS margin for pages, sendcoins relocated structure, code cleaning

* CSS sendcoins dialog form modified and bug fixed with purging overview

CSS sendcoins dialog form modified
removing a label from overview which is now in private

* Bug fixed

a not found font was being referenced

* Removing unused code

* Loading arrows and Fix for earlier versions of QT

* CSS sendcoins dialog and entry modified

* CSS sendcoinsdialog, sendcoinsentry, receivecoins and QDialog styles

backgrounds dark color and transparencies

* Styles changed for overview and statubar

Unit display color on status bar
Overview page: layout and USD labels

* Private view layout and some style

* Header section for socket message ui, testing

Still testing ui
overview css class implemented

* Info icon on Private and Overview

* Combo box style

* Styles of combo box and gitignore updated

Combo box not invading the tables, and disable mode

* Header bar for socket message and testing ui for button

* CSS header profile picture, still testing

* SpinBox style and Table style

* CSS recent transactions and dynamic text colors depending on theme

If pac theme is set the white color will be the default for text. other wise it will be a dark text

* Transaction bar at top of the tables

* Personalized fonts and CSS

Personalized fonts added and text colors for tables and lists

* Private (background, button style), Send coins page (alignment).

* CSS receivecoinsdialog positions and styles modified

also tableview text color is now set as white

* Send Coins page layout 90%

* New customized fonts

VolteRounded font for PAC

* Bug fixed: Mistake writing qrc fixed

* Send coins choose transaction fee moved and added a scroll area

* Typography implemented on the code

Volte Rounded

* Default typography changed and new header bar

Header bar for messages and profile picture implemented
CSS, images, and elements ready to be programmed
Application typography Volte Rounded is now the default for the wallet

* Layout alignment

* UI modifications

Specific details

* Receive Page background

* Layout for bigger screens, checkbox added

* Toolbar and headerbar Size modifed, CSS

CSS of QToolButtons:
 - background when selected has changed
 - height and width
QToolBar width
Main Pac Icon modified and centered
HeaderBar spacer added and select image changed

* Proposal table layouts, private button and layout

* custom ScrollBar implemented

* Spinbox arrows layout, controls colors.

* Global Button style fixed

Border now transparent

* Private colors and shadow, send margin

* Receive coins 

link buttons and layout modifed
spaces and margins

* Background of dialog when closing app

* Private_Overview functionality fix

* Adding commas to make more easy to read large numbers

* Re sorting buttons of tool bar menu and fixing disabled push button

* Progress, unfinished components

masternodes tab navigation 
label of masternodes 
addressbookpage table columns to be tested

* remove border of Disabled link buttons

* Private (info button, and sizes), SendPage (balance working)

* Commas instead of spaces on bitcoinunits fixed bug

there was a bug in where the negative quantities where not being converted properly

* AddressBookPage and EditAddressDialog styles

table styles modified
inputs to fit with UI design

* Receive layout and tables headers color

* Masternodes and other css style

* Table separations and overview layout test

* No longer posible to set old theme "light" with GUI

* Overview icon spacing, masternode lineedit style

* new typography implemented gotham and Volte rounded

Volte rounded: light, medium, semibold and bold
gotham: medium and bold.

* merge

* style fixed with Gotham Medium typography

family font was wrong

* clocks and eyes icons

* Overview info button

* Checkbox and Radio button disable icon

* Backend for the balance on the receive page

* fix toolbar button height

* Receive coins re-formulated

* Image Picker beta 1

still testing

* Receive page front end balance, and responsive layout

* Combobox fix, overlay style, possible fix on receive send page

* Merging headers on bitcoingui

* Image picker now storage the image inside Paccoincore folder

depending in each plataform the program will copy and paste the image selected, overwrite it if it exist and then each time the wallet loads it will choose the image from that path. 

The image will be copied where the .conf is located without file extention.

Only allowed .xmp and .jpg images since .png files can't be loaded (QT bug apparently)

* Bug fixed: img picker when cancelling button clicked

if you were about to select an image from the file picker and decided to not select anything. When clicking cancel button the button would set the image as black. Now it keeps the last image.

* Fix to the Private and overview displays

* Amount on receive and send rearrange

* New background, fix to info doubleclicked

* Bug Fixed: AccentButton lost shape with small screens

Sending coins page

* Icons replaced

accurate style and color correction

* CSS Code optimization and combobox color fixed

removing innecesary code and code that was being repeated 

CSS:
- table header height fixed
- arrow for sorting customized

* Socket news connected only the half

* Socket news working

* Replaced icon editpaste

* css header table

* Getting the PAC USD value

* QRC header file fix

* Overview message info and PAC value send to the wallet frame

* PAC value send to walletview

* UI Fixes for small screens (send and receive page)

* Unused code

* PAC value using QSettings

* QRCode implementation and restyle

* Code mistake fixed

forgot to delete it

* QRCode on receivecoins size fixed

* Show the USD value of your PACs

* Overview message updated

* USD PAC conversion validated

* UI receive page minor fix for small screens

* Wallet without sockets

* QRC fix

* make include FIX

* Bitcoin amount field FIX

Not working with commas.

* update-deps

* add patches

* PACtoUSD removal

* BugFixed with BitcoinAmountField comma

the spinner was not detecting the amount with the comma. It was removed from this control

* Amperson removed from ui

* RCC was not finding the icons and assets

It should work now

* completion

* Add dmg background

* macdeploy missing files

* Change tar.gz name

* update-deps

* add patches

* completion

* Add dmg background

* macdeploy missing files

* Change tar.gz name

* Migrate macdeploy to python3

* Change tar.gz name on gitian descriptors.

* Auto stash before merge of "socket_semoval" and "origin/socket_semoval"

* Change windows setup filename

* asset correction

removed unused image.
Replaced format jpg to png on background

* UI BugFixed 

Style now is default.
Removed unused code. 
Button icons removed from linux and windows.

* jpg to png background fix

* profile img removed from make.qt.include

* Auto stash before merge of "socket_semoval" and "origin/socket_semoval"

* asset correction

removed unused image.
Replaced format jpg to png on background

* UI BugFixed 

Style now is default.
Removed unused code. 
Button icons removed from linux and windows.

* jpg to png background fix

* profile img removed from make.qt.include

* News message deleted

* Icons on Windows deleted

* Scrollbar horizontal ui fixed

* BugFixed

a comma unwanted

* restoring cross platform functionality of icons on buttons

was already disabled

* Overview info updated and dialog URI background changed

* MyMasternodes table style fix

* GCC-7 and glibc-2.27 compat code

* Add stdin, stdout, stderr to ignored export list

* Backport move to Ubuntu Bionic and GCC7 in Gitian builds (dashpay#2225)

* Add stdin, stdout, stderr to ignored export list

* Merge bitcoin#13171: Change gitian-descriptors to use bionic instead

c1afe32 Change gitian-descriptors to use bionic instead (Chun Kuan Lee)

Pull request description:

  I have tested this with Ubuntu Bionic host with lxc 3.0.0, the gitian-build for Windows and MacOSX work fine, but there is an issue about it for Linux. Failed at check-symbol:
  ```
  test/test_bitcoin: symbol __divmoddi4 from unsupported version GCC_7.0.0
  test/test_bitcoin: symbol log2f from unsupported version GLIBC_2.27
  qt/bitcoin-qt: symbol __divmoddi4 from unsupported version GCC_7.0.0
  qt/bitcoin-qt: symbol log2f from unsupported version GLIBC_2.27
  ```
  I think this should be fixed in `./configure --enable-glibc-back-compat`

  Should not be merged before bitcoin#13177 devrandom/gitian-builder#178

  Close bitcoin#12511

Tree-SHA512: 257d75d5b6864e105279f7a7b992fbbd7903cdbe3300b66dacec0a783d267707d9dbbfe0e64a36983ca1eca50a2a5e1cdb222b6d3745ccc3e5fc5636c88b581f

* Use IN6ADDR_ANY_INIT instead of in6addr_any

This is the same fix as bitcoin@fc6a9f2
Couldn't backport the original commit as we are missing some refactorings.

* BugFixed: Table borders on windows and linux now transparent

border:none;

* Private page tool tip fix

* BugFixed UI send and receive coins

When coins control dialog open.  right colum was getting small.

Sendcoins page: coins control re located.

Table of history requested coins was too small in height.

QRCode address otput implementation (pending to finish)

* Sign/Verify message, base for news with an API

* CSS Qtooltip custom style

* CSS QProgressBar and QuickButton class

rounded corners.

* Receive coins Address 

hidden for default, visible after requesting payment.
Copy to clipboard button.

* BugFixed: Toolbar can't be hide now

It was able to be hide without being able to show it again

* proposal table> Fixing width of the tables 

width of first column of tables was too small.

* BugFixed: href color changed to easy read

* Animated QRCode and Address UX

in order to make the user able to notice when is changing.

Tableview row will be focused too

* Syncing with master branch (#1)

* Delayed block penalization and new reward percentages (#66)

* Delayed block penalization (#62)

- Delayed block penalization
- Reset regtest
- Change protocol version
- Update blockdelay RPC test.
- Fix min chain work on regtest chain params.
- Add chain penalization field to getchaintips method.
- Fix log formating

* New reward percentages 70215 (#63)

Changing the reward percentages, miners now get 15% and masternodes get 65%.

* Change activation block height for new rewards

* Bump min protocol and new checkpoint (#65)

- Min protocol version is now 70215
- Bumped the version on the masternode update scripts.
- Added a checkpoint, block `#216000`.

* Update README.md, adding the PacNodesUpdater instructions (#67)

* Update README.md

* Added PacNodesUpdater script

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update PAC_update.sh (#68)

Changed the update complete text to get people to start from cold wallet.

* Update pac-update.sh (#69)

* CSS UI BugFixed

Buttons width larger to fit content text, LineEdit for pac address larger for easy to read (on requesting coins).

* UI send and receive coins

spacer for the hidden fees features so it fits the scrollarea.

Buttons size and margins

LineEdit class changed

* Fixes and News/pac-usd

-Update news
-Update pac-usd value (only overview)
-info on overview updated of where we get the pac-usd value
-Copy news button
-Unused code deleted

* UI fixed

* Update send and receive labels for USD

* Options dialog label warning fixed size

* html <a> href style from blue to yellow

* News pointing to the right API

* Tooltips for copy and refresh news

* Background and selection bar colors

* General backgrounds and text inputs colors changed

To have a better contrast on the elements and text.

* CSS send coins, progressbar, check and radiobutton merging

branches v1.2 to 1.3
radiobutton, checkbutton with spaces 
layouts modified

* Top bar color darker

* Qslider customized and sendcoinsdialog

* Fix typo

* "Pay to" recipient separator

* new mined icon

* Tables have more colors to make it prettier

* Qslider css,  recent transactions font size, pac to usd width

* Optimizing CSS, layouts fixed

removing btnCopyNews and btnRefreshNews styles, using QuickButton instead.

Replaced QPushButton to QToolButton

* Unnecessary code

* Masternode table white text

* Master nodes Table not enabled text to red

* Pixel Size font 

trying to fix windows dpi font issues

* CSS and layout fixing

QRCode and other forms layout now fixed sizes in order to fit properly

* Button to copy the conversion of USD-PAC

* AddressBookPage table fix text color

* Private page advance mode ui fixes

Red color to bright, buttons not align and progress bar not center.

* Masternodes Page tabs color and size change

* Coin control dialog UI fixes

Style of the table, white borders, and cut labels.

* Translations fix German and Spanish

* SendCoins CoinControl scrollbar and better displaying

* Possible fix for windows

On preferences the tabs go out on the left

* User can now select typography 

cuz it was hurting users eyes

* Custom Font Typo 

Now the user can select any typography installed on the system. In addition to the default ones for the UI

* News feed can show a longer text

* Radio button color change

* Some documentation for the code

* Code reorganization and comments

* Merge, QFont, QRCode

QRcode will resize on small and big screens

* QRCode BugFixed

it was stretching a lot. Now it will respect the layout

* QRCode resized fixed

When the button was clicked it was not setting the window. height

* Light theme start of typo and backgrounds.

* CSS and UI Bug fixed

- Background Image now resize keeping aspect ratio.
- Profile Image button now is capable of restoring original pac logo/changing the current image. 
- purging code (removing std::cout debbugers)
- BugFixed: sendcoinsentry address typography was different, now it takes the selected font for the wallet.
- BugFixed: receive coins page, the form was being cropped on small screens, changed the layouts and min height.
-

* Test

* Private Page message corrupting the view on small devices.

* Modal Overlay UI modification

* margin on private page label

* profile img button

bug fixed it was starting blank (attempting)

* Tab bar and color palette changed

* Trying to fix Font problems

default pac font to be selected automatically

* Font size now medium

in order to make it more readable

* Fix of my failed merge

* trying to fix font default

* Custom Font Bug Fixed

Now the font will be medium. Code optimized.

* Using alias and CSS Black and grey

* Bug Fixed> The checkboxes on receive coins page were squeezing

* Fixing contrast of ui elements 

including the toolbar selected button and the inputs

* SendCoins page "Fee" fix decimals

* Micro sign on Overview fix

* Micro sign on Private Page fix

* bitcoinamount field changed

in order to be fixed on height

* separator implemented

On send coins page -> the text inputs were too close. A separator should fix this issue presented only on windows.

* ui fixed

* Typography fixing

* Fig compilation error

due to qt version this property can not be compiled

* New icon colors, images added on css now and table colors change

* UI enhancement

* CSS Light theme changes

* Revert "Merge branch 'new-ui_v1.5white' into new-ui_v1.4"

This reverts commit 2e2c5de.
  • Loading branch information
Ciip1996 authored and alejandromgk committed Apr 3, 2019
1 parent 744f65c commit 7aea08a
Show file tree
Hide file tree
Showing 277 changed files with 11,743 additions and 3,610 deletions.
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,18 @@ paccoin-cli
paccoind
paccoin-qt
make

#Custom build
generate-mac-wallet.sh
kill_PAC.sh
paccoin-qt.config
paccoin-qt.creator
paccoin-qt.creator.user
paccoin-qt.files
paccoin-qt.includes
contrib/dash-qt.pro.user
src/qt/paccoin-qt.config
src/qt/paccoin-qt.file
src/qt/paccoin-qt.includes
src/qt/paccoin-qt.creator
src/qt/paccoin-qt.creator.user
83 changes: 83 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
# This CMakeLists.txt is not meant to actually work!
# It only serves as a dummy project to make CLion work properly when it comes to symbol resolution and all the nice
# features dependent on that. Building must still be done on the command line using the automake build chain
# If you load this project in CLion and would like to run/debug executables, make sure to remove the "Build" entry from
# the run/debug configuration as otherwise CLion will try to build this project with cmake, failing horribly.
# You'll also have to manually change the executable in the configuration to the correct path of the already built executable

cmake_minimum_required(VERSION 3.7)
project(paccoin)

set(CMAKE_CXX_STANDARD 14)

include_directories(
src
src/qt/forms
src/leveldb/include
src/univalue/include
)

if(UNIX AND NOT APPLE)
set(DEPENDS_PREFIX depends/x86_64-pc-linux-gnu)
elseif(APPLE)
set(DEPENDS_PREFIX depends/x86_64-apple-darwin11)
elseif(WIN32)
set(DEPENDS_PREFIX depends/x86_64-w64-mingw32)
endif()

message(STATUS "DEPENDS_PREFIX: ${DEPENDS_PREFIX}")

if(DEFINED DEPENDS_PREFIX)
include_directories(${DEPENDS_PREFIX}/include)
include_directories(${DEPENDS_PREFIX}/include/QtWidgets)
endif()

add_definitions(
-DENABLE_WALLET=1
)

file(GLOB SOURCE_FILES
src/bench/*.cpp
src/bench/*.h
src/compat/*.cpp
src/compat/*.h
src/consensus/*.h
src/consensus/*.cpp
src/crypto/*.c
src/crypto/*.h
src/crypto/*.cpp
src/leveldb/db/*.cc
src/leveldb/db/*.h
src/leveldb/include/*.h
src/policy/*.cpp
src/policy/*.h
src/primitives/*.cpp
src/primitives/*.h
src/qt/test/*.cpp
src/qt/test/*.h
src/qt/*.cpp
src/qt/*.h
src/script/*.cpp
src/script/*.h
src/secp256k1/include/*.h
src/test/*.cpp
src/test/*.h
src/univalue/include/*.h
src/univalue/lib/*.cpp
src/univalue/lib/*.h
src/wallet/test/*.cpp
src/wallet/*.cpp
src/wallet/*.h
src/zmq/*.cpp
src/zmq/*.h
src/*.cpp
src/*.h
src/evo/*.h
src/evo/*.cpp
src/llmq/*.h
src/llmq/*.cpp
src/rpc/*.cpp
src/rpc/*.h
)

add_executable(paccoin ${SOURCE_FILES})
119 changes: 64 additions & 55 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,30 +1,50 @@
# Copyright (c) 2013-2016 The Bitcoin Core developers
# Copyright (c) 2014-2018 The Paccoin Core developers
# Copyright (c) 2018-2019 The Paccoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.

ACLOCAL_AMFLAGS = -I build-aux/m4
SUBDIRS = src
if ENABLE_MAN
SUBDIRS += doc/man
endif
.PHONY: deploy FORCE

GZIP_ENV="-9n"
export PYTHONPATH

if BUILD_BITCOIN_LIBS
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpaccoinconsensus.pc
endif

BITCOIND_BIN=$(top_builddir)/src/paccoind$(EXEEXT)
BITCOIN_QT_BIN=$(top_builddir)/src/qt/paccoin-qt$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/paccoin-cli$(EXEEXT)
BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)

empty :=
space := $(empty) $(empty)

OSX_APP=Paccoin-Qt.app
OSX_DMG=Paccoin-Core.dmg
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
OSX_DMG = $(OSX_VOLNAME).dmg
OSX_BACKGROUND_SVG=background.svg
OSX_BACKGROUND_IMAGE=background.tiff
OSX_BACKGROUND_IMAGE_DPIS=36 72
OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
OSX_BASE_LPROJ_DIR=$(top_srcdir)/contrib/macdeploy/Base.lproj/InfoPlist.strings
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW

DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
DIST_CONTRIB = $(top_srcdir)/contrib/paccoin-cli.bash-completion \
$(top_srcdir)/contrib/paccoin-tx.bash-completion \
$(top_srcdir)/contrib/paccoind.bash-completion \
$(top_srcdir)/contrib/init

BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
$(top_srcdir)/contrib/devtools/security-check.py
Expand All @@ -34,30 +54,20 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
$(top_srcdir)/doc/README_windows.txt

OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) $(OSX_BASE_LPROJ_DIR) \
$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_IMAGE) \
$(top_srcdir)/contrib/macdeploy/DS_Store \
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_SVG) \
$(OSX_DSSTORE_GEN) \
$(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh

COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
COVERAGE_INFO = baseline_filtered_combined.info baseline.info \
leveldb_baseline.info test_paccoin_filtered.info total_coverage.info \
baseline_filtered.info block_test_filtered.info rpc_test.info rpc_test_filtered.info \
baseline_filtered.info rpc_test.info rpc_test_filtered.info \
leveldb_baseline_filtered.info test_paccoin_coverage.info test_paccoin.info

dist-hook:
-$(MAKE) -C $(top_distdir)/src/leveldb clean
-$(MAKE) -C $(top_distdir)/src/secp256k1 distclean
-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -

distcheck-hook:
$(MKDIR_P) $(top_distdir)/_build/src/leveldb
cp -rf $(top_srcdir)/src/leveldb/* $(top_distdir)/_build/src/leveldb/
-$(MAKE) -C $(top_distdir)/_build/src/leveldb clean

distcleancheck:
@:

$(BITCOIN_WIN_INSTALLER): all-recursive
$(MKDIR_P) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
Expand All @@ -67,9 +77,6 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
echo error: could not build $@
@echo built $@

$(if $(findstring src/,$(MAKECMDGOALS)),$(MAKECMDGOALS), none): FORCE
$(MAKE) -C src $(patsubst src/%,%,$@)

$(OSX_APP)/Contents/PkgInfo:
$(MKDIR_P) $(@D)
@echo "APPL????" > $@
Expand All @@ -90,17 +97,27 @@ $(OSX_APP)/Contents/MacOS/Paccoin-Qt: $(BITCOIN_QT_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@

$(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(OSX_BASE_LPROJ_DIR)
$(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@
echo '{ CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@

OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
$(OSX_APP)/Contents/MacOS/Paccoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings

osx_volname:
echo $(OSX_VOLNAME) >$@

if BUILD_DARWIN
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) $(OSX_BACKGROUND_IMAGE)
$(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 -volname $(OSX_VOLNAME)

$(OSX_BACKGROUND_IMAGE).png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 36 -p 36 -o $@
$(OSX_BACKGROUND_IMAGE)@2x.png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 72 -p 72 -o $@
$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE).png $(OSX_BACKGROUND_IMAGE)@2x.png
tiffutil -cathidpicheck $^ -out $@

deploydir: $(OSX_DMG)
else
Expand All @@ -114,16 +131,20 @@ $(APP_DIST_DIR)/Applications:
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Paccoin-Qt

$(OSX_DMG): $(APP_DIST_EXTRAS)
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Paccoin-Core" -no-pad -r -dir-mode 0755 -apple -o $@ dist
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist

$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_IMAGE)
dpi%.$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_SVG)
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d $* -p $* | $(IMAGEMAGICK_CONVERT) - $@
OSX_BACKGROUND_IMAGE_DPIFILES := $(foreach dpi,$(OSX_BACKGROUND_IMAGE_DPIS),dpi$(dpi).$(OSX_BACKGROUND_IMAGE))
$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIFILES)
$(MKDIR_P) $(@D)
$(INSTALL) $< $@
$(APP_DIST_DIR)/.DS_Store: contrib/macdeploy/DS_Store
$(INSTALL) $< $@
$(TIFFCP) -c none $(OSX_BACKGROUND_IMAGE_DPIFILES) $@

$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
$(PYTHON) $< "$@" "$(OSX_VOLNAME)"

$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Paccoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2

deploydir: $(APP_DIST_EXTRAS)
endif
Expand Down Expand Up @@ -171,16 +192,6 @@ test_paccoin.info: baseline_filtered_combined.info
test_paccoin_filtered.info: test_paccoin.info
$(LCOV) -r $< "/usr/include/*" -o $@

block_test.info: test_paccoin_filtered.info
$(MKDIR_P) qa/tmp
-@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS)
$(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@
$(LCOV) -z -d $(abs_builddir)/src
$(LCOV) -z -d $(abs_builddir)/src/leveldb

block_test_filtered.info: block_test.info
$(LCOV) -r $< "/usr/include/*" -o $@

rpc_test.info: test_paccoin_filtered.info
-@TIMEOUT=15 python qa/pull-tester/rpc-tests.py $(EXTENDED_RPC_TESTS)
$(LCOV) -c -d $(abs_builddir)/src --t rpc-tests -o $@
Expand All @@ -193,8 +204,8 @@ rpc_test_filtered.info: rpc_test.info
test_paccoin_coverage.info: baseline_filtered_combined.info test_paccoin_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_paccoin_filtered.info -o $@

total_coverage.info: baseline_filtered_combined.info test_paccoin_filtered.info block_test_filtered.info rpc_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_paccoin_filtered.info -a block_test_filtered.info -a rpc_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
total_coverage.info: baseline_filtered_combined.info test_paccoin_filtered.info rpc_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_paccoin_filtered.info -a rpc_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt

test_paccoin.coverage/.dirstamp: test_paccoin_coverage.info
$(GENHTML) -s $< -o $(@D)
Expand All @@ -208,21 +219,19 @@ cov: test_paccoin.coverage/.dirstamp total.coverage/.dirstamp

endif

# Paccoin: disable the test until upstream switches from convoluted comparison tool
# Ref https://github.com/bitcoin/bitcoin/issues/4545
if USE_COMPARISON_TOOL
check-local:
## $(MKDIR_P) qa/tmp
## @qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) 2>&1
endif

dist_noinst_SCRIPTS = autogen.sh

EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)

CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)

# This file is problematic for out-of-tree builds if it exists.
DISTCLEANFILES = qa/pull-tester/tests_config.pyc

.INTERMEDIATE: $(COVERAGE_INFO)

DISTCHECK_CONFIGURE_FLAGS = --enable-man

clean-local:
rm -rf coverage_percent.txt test_paccoin.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP)
rm -rf qa/pull-tester/__pycache__
6 changes: 6 additions & 0 deletions autogen.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
#!/bin/sh
# Copyright (c) 2013-2016 The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.

set -e
srcdir="$(dirname $0)"
cd "$srcdir"
if [ -z ${LIBTOOLIZE} ] && GLIBTOOLIZE="`which glibtoolize 2>/dev/null`"; then
LIBTOOLIZE="${GLIBTOOLIZE}"
export LIBTOOLIZE
fi
which autoreconf >/dev/null || \
(echo "configuration failed, please install autoconf first" && exit 1)
autoreconf --install --force --warnings=all
18 changes: 14 additions & 4 deletions build-aux/m4/ax_boost_base.m4
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.

#serial 23
#serial 27

AC_DEFUN([AX_BOOST_BASE],
[
Expand Down Expand Up @@ -95,7 +95,7 @@ if test "x$want_boost" = "xyes"; then
x86_64)
libsubdirs="lib64 libx32 lib lib64"
;;
ppc64|s390x|sparc64|aarch64)
ppc64|s390x|sparc64|aarch64|ppc64le)
libsubdirs="lib64 lib lib64"
;;
esac
Expand Down Expand Up @@ -170,7 +170,7 @@ if test "x$want_boost" = "xyes"; then
AC_MSG_RESULT(yes)
succeeded=yes
found_system=yes
],[:
],[
])
AC_LANG_POP([C++])
Expand All @@ -179,6 +179,10 @@ if test "x$want_boost" = "xyes"; then
dnl if we found no boost with system layout we search for boost libraries
dnl built and installed without the --layout=system option or for a staged(not installed) version
if test "x$succeeded" != "xyes"; then
CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
BOOST_CPPFLAGS=
BOOST_LDFLAGS=
_version=0
if test "$ac_boost_path" != ""; then
if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
Expand All @@ -191,6 +195,12 @@ if test "x$want_boost" = "xyes"; then
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
done
dnl if nothing found search for layout used in Windows distributions
if test -z "$BOOST_CPPFLAGS"; then
if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
BOOST_CPPFLAGS="-I$ac_boost_path"
fi
fi
fi
else
if test "$cross_compiling" != yes; then
Expand Down Expand Up @@ -253,7 +263,7 @@ if test "x$want_boost" = "xyes"; then
AC_MSG_RESULT(yes)
succeeded=yes
found_system=yes
],[:
],[
])
AC_LANG_POP([C++])
fi
Expand Down
Loading

0 comments on commit 7aea08a

Please sign in to comment.