Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added missing files. Updated style, icon image,and copyright. #626

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 13 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ reset-files.bash
*.tar.gz

*.exe
src/dash
src/dashd
src/dash-cli
src/dash-tx
src/test/test_dash
src/qt/test/test_dash-qt
src/btx
src/btxd
src/btx-cli
src/btx-tx
src/test/test_btx
src/qt/test/test_btx-qt

# autoreconf
Makefile.in
Expand All @@ -34,8 +34,8 @@ config.log
config.status
configure
libtool
src/config/dash-config.h
src/config/dash-config.h.in
src/config/btx-config.h
src/config/btx-config.h.in
src/config/stamp-h1
share/setup.nsi
share/qt/Info.plist
Expand All @@ -60,7 +60,7 @@ src/qt/test/moc*.cpp
*.o
*.o-*
*.patch
.dash
.btx
*.a
*.pb.cc
*.pb.h
Expand All @@ -79,12 +79,12 @@ src/qt/test/moc*.cpp
# Compilation and Qt preprocessor part
*.qm
Makefile
dash-qt
Dash-Qt.app
btx-qt
BTX-Qt.app

# Unit-tests
Makefile.test
dash-qt_test
btx-qt_test
src/test/buildenv.py

# Resources cpp
Expand All @@ -100,7 +100,7 @@ build
#lcov
*.gcno
/*.info
test_dash.coverage/
test_btx.coverage/
total.coverage/
coverage_percent.txt

Expand Down
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ matrix:
include:
- compiler: ": ARM"
env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat"
- compiler: ": dashd"
- compiler: ": btxd"
env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat CPPFLAGS=-DDEBUG_LOCKORDER"
- compiler: ": No wallet"
env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat"
- compiler: ": 32-bit + dash"
env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat" USE_SHELL="/bin/dash"
- compiler: ": 32-bit + btx"
env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat" USE_SHELL="/bin/btx"
- compiler: ": Cross-Mac"
env: HOST=x86_64-apple-darwin11 PACKAGES="gcc-multilib g++-multilib cmake libcap-dev libz-dev libbz2-dev" OSX_SDK=10.7 GOAL="deploy"
- compiler: ": Win64"
Expand All @@ -55,8 +55,8 @@ script:
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then export CCACHE_READONLY=1; fi
- test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
- ./configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
- make distdir PACKAGE=dash VERSION=$HOST
- cd dash-$HOST
- make distdir PACKAGE=btx VERSION=$HOST
- cd btx-$HOST
- ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
- make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
- export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
Expand Down
8 changes: 4 additions & 4 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com
host = https://www.btxcoin.com

[dash.qt-translation-010x]
file_filter = src/qt/locale/dash_<lang>.ts
source_file = src/qt/locale/dash_en.ts
[btx.qt-translation-010x]
file_filter = src/qt/locale/btx_<lang>.ts
source_file = src/qt/locale/btx_en.ts
source_lang = en
1 change: 1 addition & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Copyright (c) 2009-2015 Bitcoin Developers
Copyright (c) 2014-2015 Dash Developers
Copyright (c) 2015 Dash Developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Building Dash
Building BTX

Use the autogen script to prepare the build environment.

Expand All @@ -7,10 +7,10 @@ Use the autogen script to prepare the build environment.
make

Precompiled binaries are available at github, see
https://github.com/dashproject/dash-binaries
https://github.com/cryptodj/btx

Always verify the signatures and checksums.

See doc/build-*.md for instructions on building dashd,
See doc/build-*.md for instructions on building btxd,
the intended-for-services, no-graphical-interface, reference
implementation of Dash.
implementation of BTX.
46 changes: 23 additions & 23 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ SUBDIRS = src

GZIP_ENV="-9n"

BITCOIND_BIN=$(top_builddir)/src/dashd$(EXEEXT)
BITCOIN_QT_BIN=$(top_builddir)/src/qt/dash-qt$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/dash-cli$(EXEEXT)
BITCOIND_BIN=$(top_builddir)/src/btxd$(EXEEXT)
BITCOIN_QT_BIN=$(top_builddir)/src/qt/btx-qt$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/btx-cli$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)

OSX_APP=Dash-Qt.app
OSX_DMG=Dash-Qt.dmg
OSX_APP=BTX-Qt.app
OSX_DMG=BTX-Qt.dmg
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
Expand All @@ -31,9 +31,9 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh

COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
leveldb_baseline.info test_dash_filtered.info total_coverage.info \
leveldb_baseline.info test_btx_filtered.info total_coverage.info \
baseline_filtered.info block_test_filtered.info \
leveldb_baseline_filtered.info test_dash_coverage.info test_dash.info
leveldb_baseline_filtered.info test_btx_coverage.info test_btx.info

dist-hook:
-$(MAKE) -C $(top_distdir)/src/leveldb clean
Expand Down Expand Up @@ -75,13 +75,13 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/MacOS/Dash-Qt: $(BITCOIN_QT_BIN)
$(OSX_APP)/Contents/MacOS/BTX-Qt: $(BITCOIN_QT_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@

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/Dash-Qt
$(OSX_APP)/Contents/MacOS/BTX-Qt

if BUILD_DARWIN
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
Expand All @@ -96,18 +96,18 @@ $(APP_DIST_DIR)/Applications:
@rm -f $@
@cd $(@D); $(LN_S) /Applications $(@F)

$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Dash-Qt
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/BTX-Qt

$(OSX_DMG): $(APP_DIST_EXTRAS)
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Dash-Qt" -no-pad -r -apple -o $@ dist
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "BTX-Qt" -no-pad -r -apple -o $@ dist

$(APP_DIST_DIR)/.background/background.png:
$(MKDIR_P) $(@D)
$(INSTALL) $(top_srcdir)/contrib/macdeploy/background.png $@
$(APP_DIST_DIR)/.DS_Store:
$(INSTALL) $(top_srcdir)/contrib/macdeploy/DS_Store $@

$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Dash-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/BTX-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

deploydir: $(APP_DIST_EXTRAS)
Expand Down Expand Up @@ -147,16 +147,16 @@ leveldb_baseline_filtered.info: leveldb_baseline.info
baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@

test_dash.info: baseline_filtered_combined.info
test_btx.info: baseline_filtered_combined.info
$(MAKE) -C src/ check
$(LCOV) -c -d $(abs_builddir)/src -t test_dash -o $@
$(LCOV) -c -d $(abs_builddir)/src -t test_btx -o $@
$(LCOV) -z -d $(abs_builddir)/src
$(LCOV) -z -d $(abs_builddir)/src/leveldb

test_dash_filtered.info: test_dash.info
test_btx_filtered.info: test_btx.info
$(LCOV) -r $< "/usr/include/*" -o $@

block_test.info: test_dash_filtered.info
block_test.info: test_btx_filtered.info
$(MKDIR_P) qa/tmp
-@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0
$(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@
Expand All @@ -166,21 +166,21 @@ block_test.info: test_dash_filtered.info
block_test_filtered.info: block_test.info
$(LCOV) -r $< "/usr/include/*" -o $@

test_dash_coverage.info: baseline_filtered_combined.info test_dash_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_dash_filtered.info -o $@
test_btx_coverage.info: baseline_filtered_combined.info test_btx_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_btx_filtered.info -o $@

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

test_dash.coverage/.dirstamp: test_dash_coverage.info
test_btx.coverage/.dirstamp: test_btx_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@

total.coverage/.dirstamp: total_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@

cov: test_dash.coverage/.dirstamp total.coverage/.dirstamp
cov: test_btx.coverage/.dirstamp total.coverage/.dirstamp

endif

Expand All @@ -197,4 +197,4 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
.INTERMEDIATE: $(COVERAGE_INFO)

clean-local:
rm -rf test_dash.coverage/ total.coverage/ $(OSX_APP)
rm -rf test_btx.coverage/ total.coverage/ $(OSX_APP)
35 changes: 18 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
Dash Core staging tree 0.12
BTX Core staging tree 3.0 (InstantX Upgrade)
===============================

https://www.dashpay.io
http://www.btxcoin.com

Copyright (c) 2009-2015 Bitcoin Core Developers

Copyright (c) 2014-2015 Dash Core Developers

Copyright (c) 2015 BTX Core Developers

What is Dash?
What is BTX?
----------------

Dash is an experimental new digital currency that enables anonymous, instant
payments to anyone, anywhere in the world. Dash uses peer-to-peer technology
BTX is an experimental new digital currency that enables anonymous, instant
payments to anyone, anywhere in the world. BTX uses peer-to-peer technology
to operate with no central authority: managing transactions and issuing money
are carried out collectively by the network. Dash Core is the name of open
are carried out collectively by the network. BTX Core is the name of open
source software which enables the use of this currency.

For more information, as well as an immediately useable, binary version of
the Dash Core software, see https://www.dashpay.io/downloads.
the BTX Core software, see https://www.btxcoin.com/downloads.


License
-------

Dash Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
BTX Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
information or see http://opensource.org/licenses/MIT.

Development process
Expand All @@ -33,7 +34,7 @@ Development process
Developers work in their own trees, then submit pull requests when they think
their feature or bug fix is ready.

If it is a simple/trivial/non-controversial change, then one of the Dash
If it is a simple/trivial/non-controversial change, then one of the BTX
development team members simply pulls it.

If it is a *more complicated or potentially controversial* change, then the patch
Expand All @@ -46,8 +47,8 @@ match the project's coding conventions (see [doc/coding.md](doc/coding.md)) or a
controversial.

The `master` branch is regularly built and tested, but is not guaranteed to be
completely stable. [Tags](https://github.com/dashpay/dash/tags) are created
regularly to indicate new official, stable release versions of Dash. ***TODO***
completely stable. [Tags](https://github.com/btxpay/btx/tags) are created
regularly to indicate new official, stable release versions of BTX. ***TODO***

Testing
-------
Expand All @@ -65,28 +66,28 @@ submit new unit tests for old code. Unit tests can be compiled and run (assuming
Every pull request is built for both Windows and Linux on a dedicated server,
and unit and sanity tests are automatically run. The binaries produced may be
used for manual QA testing — a link to them will appear in a comment on the
pull request posted by [DashPullTester](https://github.com/dashpay/PullTester). See https://github.com/TheBlueMatt/test-scripts
pull request posted by [BTXPullTester](https://github.com/btxpay/PullTester). See https://github.com/TheBlueMatt/test-scripts
for the build/test scripts. ***TODO***

### Manual Quality Assurance (QA) Testing

Large changes should have a test plan, and should be tested by somebody other
than the developer who wrote the code.
See https://github.com/dashpay/QA/ for how to create a test plan. ***TODO***
See https://github.com/btxpay/QA/ for how to create a test plan. ***TODO***

Translations
------------

Changes to translations as well as new translations can be submitted to
[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/dash/).
[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/btx/).

Translations are periodically pulled from Transifex and merged into the git repository. See the
[translation process](doc/translation_process.md) for details on how this works.

**Important**: We do not accept translation changes as GitHub pull requests because the next
pull from Transifex would automatically overwrite them again.

Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/dash-translators). ***TODO***
Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/btx-translators). ***TODO***

Development tips and tricks
---------------------------
Expand All @@ -109,7 +110,7 @@ to see it.

**testnet and regtest modes**

Run with the -testnet option to run with "play dash" on the test network, if you
Run with the -testnet option to run with "play btx" on the test network, if you
are testing multi-machine code that needs to operate across the internet.

If you are testing something that can run on one machine, run with the -regtest option.
Expand All @@ -118,7 +119,7 @@ that run in -regtest mode.

**DEBUG_LOCKORDER**

Dash Core is a multithreaded application, and deadlocks or other multithreading bugs
BTX Core is a multithreaded application, and deadlocks or other multithreading bugs
can be very difficult to track down. Compiling with -DDEBUG_LOCKORDER (configure
CXXFLAGS="-DDEBUG_LOCKORDER -g") inserts run-time checks to keep track of which locks
are held, and adds warnings to the debug.log file if inconsistencies are detected.
Loading