Skip to content

Commit

Permalink
Various Improvements to Text
Browse files Browse the repository at this point in the history
  • Loading branch information
CoiningPress committed Sep 29, 2017
1 parent be60f75 commit 9d82552
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion doc/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Datacoin 0.1.2 BETA
Datacoin 0.1.2.0
===================

Copyright (c) 2013-2017 Datacoin Developers
Expand Down
2 changes: 1 addition & 1 deletion doc/README_windows.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Datacoin 0.1.2 BETA
Datacoin 0.1.2.0
===================

Copyright (c) 2013-2017 Datacoin Developers
Expand Down
4 changes: 2 additions & 2 deletions doc/Tor.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ your datacoind's P2P listen port (4777 by default).

In a typical situation, where you're only reachable via Tor, this should suffice:

./datacoind -proxy=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -listen
./datacoind -proxy=127.0.0.1:9050 -externalip=mha2xxyfrj7x3dgj.onion -listen

(obviously, replace the Onion address with your own). If you don't care too much
about hiding your node, and want to be reachable on IPv4 as well, additionally
Expand All @@ -88,5 +88,5 @@ and open port 4777 on your firewall (or use -upnp).
If you only want to use Tor to reach onion addresses, but not use it as a proxy
for normal IPv4/IPv6 communication, use:

./datacoin -tor=127.0.0.1:9050 -externalip=(not-yet-declared).onion -discover
./datacoin -tor=127.0.0.1:9050 -externalip=mha2xxyfrj7x3dgj.onion -discover

34 changes: 17 additions & 17 deletions doc/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ Release Process

###tag version in git

git tag -a v0.8.0
git tag -a v0.8.6.0

###write release notes. git shortlog helps a lot, for example:

git shortlog --no-merges v0.7.2..v0.8.0
git shortlog --no-merges v0.8.5.0..v0.8.6.0

* * *

Expand All @@ -30,27 +30,27 @@ Release Process
From a directory containing the datacoin source, gitian-builder and gitian.sigs

export SIGNER=(your gitian key, ie bluematt, sipa, etc)
export VERSION=0.8.0
export VERSION=0.8.6.0
pushd ./gitian-builder

Fetch and build inputs: (first time, or when dependency versions change)

mkdir -p inputs; cd inputs/
wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz
wget 'http://www.openssl.org/source/openssl-1.0.1g.tar.gz'
wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
wget 'http://zlib.net/zlib-1.2.6.tar.gz'
wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz'
wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
wget 'http://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2'
wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz'
wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-2.0.20170509.tar.gz' -O miniupnpc-2.0.20170509.tar.gz'
wget 'https://www.openssl.org/source/openssl-1.0.2l.tar.gz'
wget 'http://download.oracle.com/berkeley-db/db-5.3.28.NC.tar.gz'
wget 'http://zlib.net/zlib-1.2.11.tar.gz'
wget 'http://download.sourceforge.net/libpng/libpng-1.6.30.tar.gz'
wget 'http://fukuchi.org/works/qrencode/qrencode-3.4.4.tar.bz2'
wget 'http://downloads.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2'
wget 'http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz'
cd ..
./bin/gbuild ../datacoin/contrib/gitian-descriptors/boost-win32.yml
mv build/out/boost-win32-1.50.0-gitian2.zip inputs/
./bin/gbuild ../datacoin/contrib/gitian-descriptors/qt-win32.yml
mv build/out/qt-win32-4.8.3-gitian-r1.zip inputs/
mv build/out/boost-win32-1.55.0-gitian.zip inputs/
./bin/gbuild ../datacoin/contrib/gitian-descriptors/deps-win32.yml
mv build/out/datacoin-deps-0.0.5.zip inputs/
mv build/out/datacoin-deps-win32-gitian.zip inputs/
./bin/gbuild ../datacoin/contrib/gitian-descriptors/qt-win32.yml
mv build/out/qt-win32-4.8.7-gitian.zip inputs/

Build datacoind and datacoin-qt on Linux32, Linux64, and Win32:

Expand Down Expand Up @@ -91,11 +91,11 @@ repackage gitian builds for release as stand-alone zip/tar/installer exe

**Perform Mac build:**

OSX binaries are created by Gavin Andresen on a 32-bit, OSX 10.6 machine.
OSX binaries are created by CoiningPress on a 64-bit, OSX 10.12 machine.

qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 datacoin-qt.pro
make
export QTDIR=/opt/local/share/qt4 # needed to find translations/qt_*.qm files
export QTDIR=/opt/local/libexec/qt5 # needed to find translations/qt_*.qm files
T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale)
python2.7 share/qt/clean_mac_info_plist.py
python2.7 contrib/macdeploy/macdeployqtplus Datacoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist
Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/aboutdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<string notr="true">0.3.666-beta</string>
<string notr="true">0.1.2.0</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
Expand Down
4 changes: 2 additions & 2 deletions src/test/netbase_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ BOOST_AUTO_TEST_CASE(netbase_lookupnumeric)
BOOST_AUTO_TEST_CASE(onioncat_test)
{
// values from http://www.cypherpunk.at/onioncat/wiki/OnionCat
CNetAddr addr1("5wyqrzbvrdsumnok.onion");
CNetAddr addr1("mha2xxyfrj7x3dgj.onion");
CNetAddr addr2("FD87:D87E:EB43:edb1:8e4:3588:e546:35ca");
BOOST_CHECK(addr1 == addr2);
BOOST_CHECK(addr1.IsTor());
BOOST_CHECK(addr1.ToStringIP() == "5wyqrzbvrdsumnok.onion");
BOOST_CHECK(addr1.ToStringIP() == "mha2xxyfrj7x3dgj.onion");
BOOST_CHECK(addr1.IsRoutable());
}

Expand Down
2 changes: 1 addition & 1 deletion src/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
const std::string CLIENT_NAME("Datacoin");

// Client version number
#define CLIENT_VERSION_SUFFIX "-beta"
#define CLIENT_VERSION_SUFFIX ""


// The following part of the code determines the CLIENT_BUILD variable.
Expand Down

0 comments on commit 9d82552

Please sign in to comment.