Skip to content

Commit

Permalink
Merge pull request truthcoin#2 from CryptAxe/master
Browse files Browse the repository at this point in the history
Merging work done so far on method 6 and bug fixes. Working with gitian builder now.
  • Loading branch information
psztorc committed Nov 17, 2015
2 parents accd5f5 + 6468a56 commit 91864ee
Show file tree
Hide file tree
Showing 32 changed files with 948 additions and 44,937 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ Makefile
hivemind-qt
Hivemind-Qt.app

# build-aux folders
src/fdlibm/build-aux/*
src/secp256k1/build-aux/*
src/linalg/build-aux/*

# Unit-tests
Makefile.test
hivemind-qt_test
Expand Down Expand Up @@ -113,3 +118,5 @@ qa/pull-tester/test.*/*
/doc/doxygen/

libhivemindconsensus.pc
src/fdlibm/libfdlibm.pc
src/linalg/liblinalg.pc
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
Hivemind Core integration/staging tree
=====================================

[![Build Status](https://travis-ci.org/hivemind/hivemind.svg?branch=master)](https://travis-ci.org/hivemind/hivemind)

[http://www.hivemind.info](http://www.hivemind.info)
[http://www.bitcoinhivemind.com](http://www.bitcoinhivemind.com)

What is Hivemind?
----------------
Expand All @@ -14,7 +12,7 @@ Although substantially more complex, Hivemind offers correspondingly substantial

Hivemind includes two types of value-token. One, "Bitcoin", is used for storing value, buying/selling in markets and paying transaction fees to miners. This coin will resemble Bitcoin-testnet-money (an "Altcoin") for the duration of pre-release testing, and will then be a [sidechain](http://www.blockstream.com/) of Bitcoin. Therefore, the network will "accept" Bitcoin (indeed, this will be the only currency the network accepts). The second (less important) token, "VoteCoin", is used to track a smaller group of special users and reward them for providing reports to the blockchain on the status of the bet-upon events.

For an immediately useable, binary version of the Hivemind Core software, see [http://www.hivemind.info/software/](http://www.hivemind.info/software/).
For an immediately useable, binary version of the Hivemind Core software, see [https://github.com/bitcoin-hivemind/hivemind-binaries](https://github.com/bitcoin-hivemind/hivemind-binaries).

License
-------
Expand Down
8 changes: 4 additions & 4 deletions contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ packages:
- "binutils-gold"
reference_datetime: "2013-06-01 00:00:00"
remotes:
- "url": "https://github.com/hivemind/hivemind.git"
- "url": "https://github.com/bitcoin-hivemind/hivemind.git"
"dir": "hivemind"
files: []
script: |
Expand Down Expand Up @@ -66,13 +66,13 @@ script: |
BASEPREFIX=`pwd`/depends
# Build dependencies for each host
for i in $HOSTS; do
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
make -j 3 ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
done
# Create the release tarball using (arbitrarily) the first host
./autogen.sh
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
make dist
make -j 3 dist
SOURCEDIST=`echo hivemind-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
Expand All @@ -93,7 +93,7 @@ script: |
tar --strip-components=1 -xf ../$SOURCEDIST
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
make ${MAKEOPTS}
make -j 3 ${MAKEOPTS}
make install-strip
cd installed
find . -name "lib*.la" -delete
Expand Down
12 changes: 6 additions & 6 deletions contrib/gitian-descriptors/gitian-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ packages:
- "zip"
reference_datetime: "2013-06-01 00:00:00"
remotes:
- "url": "https://github.com/psztorc/truthcoin-cpp"
"dir": "truthcoin-cpp"
- "url": "https://github.com/bitcoin-hivemind/hivemind"
"dir": "hivemind"
files: []
script: |
WRAP_DIR=$HOME/wrapped
Expand Down Expand Up @@ -65,17 +65,17 @@ script: |
done
export PATH=${WRAP_DIR}:${PATH}
cd truthcoin-cpp
cd hivemind
BASEPREFIX=`pwd`/depends
# Build dependencies for each host
for i in $HOSTS; do
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
make -j 3 ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
done
# Create the release tarball using (arbitrarily) the first host
./autogen.sh
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
make dist
make -j 3 dist
SOURCEDIST=`echo hivemind-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
Expand All @@ -97,7 +97,7 @@ script: |
tar --strip-components=1 -xf ../$SOURCEDIST
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
make ${MAKEOPTS}
make -j 3 ${MAKEOPTS}
make deploy
make install-strip
cp -f hivemind-*setup*.exe $OUTDIR/
Expand Down

0 comments on commit 91864ee

Please sign in to comment.