lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Clobbered a change to FixedHash? Sorry if I did - please reapply. 

Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

Conflicts:
	libethereum/Common.h
cl-refactor
Gav Wood 11 years ago
parent
82612a7027 3609d190c2
commit
11677ed034
11 changed files with 7 additions and 213 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      debian/README.Debian
  2. 9
      debian/README.source
  3. 23
      debian/changelog
  4. 1
      debian/compat
  5. 29
      debian/control
  6. 24
      debian/copyright
  7. 3
      debian/docs
  8. 36
      debian/rules
  9. 7
      eth/main.cpp
  10. 8
      package.sh
  11. 74
      release.sh

6
debian/README.Debian
View File

@ -1,6 +0,0 @@
cpp-ethereum for Debian
-----------------------
<possible notes regarding this package - if none, delete this file>
-- Gav <Gav Wood <i@gavwood.com>> Mon, 03 Feb 2014 14:50:20 +0000

9
debian/README.source
View File

@ -1,9 +0,0 @@
cpp-ethereum for Debian
-----------------------
<this file describes information about the source package, see Debian policy
manual section 4.14. You WILL either need to modify or delete this file>

23
debian/changelog
View File

@ -1,23 +0,0 @@
cpp-ethereum (0.1.0-1) saucy; urgency=low
* Various improvements moving towards PoC-2.
-- Ethereum (Ethereum Project) <ethereum@gavwood.com> Fri, 07 Feb 2014 00:48:26 +0000
cpp-ethereum (0.1-3) saucy; urgency=low
* Packaging stuff.
-- Ethereum (Ethereum Project) <ethereum@gavwood.com> Thu, 06 Feb 2014 14:13:00 +0000
cpp-ethereum (0.1-2) saucy; urgency=low
* Fix Qt dep.
-- Gav Wood <ethereum@gavwood.com> Mon, 06 Feb 2014 11:35:20 +0000
cpp-ethereum (0.1-1) saucy; urgency=low
* Initial release.
-- Gav Wood <ethereum@gavwood.com> Mon, 03 Feb 2014 14:50:20 +0000

1
debian/compat
View File

@ -1 +0,0 @@
8

29
debian/control
View File

@ -1,29 +0,0 @@
Source: cpp-ethereum
Section: science
Priority: extra
Maintainer: Ethereum (Ethereum Project) <ethereum@gavwood.com>
Build-Depends: debhelper (>= 8.0.0), cmake, libgmp-dev, libboost-thread-dev, libcryptoppeth-dev, libboost-filesystem-dev, libboost-mpi-dev, libboost-dev, libleveldb-dev, libminiupnpc-dev, qtbase5-dev, qt5-default
Standards-Version: 3.9.4
Homepage: http://ethereum.org
#Vcs-Git: git://git.debian.org/collab-maint/cpp-ethereum.git
#Vcs-Browser: http://git.debian.org/?p=collab-maint/cpp-ethereum.git;a=summary
Package: libethereum
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: The future of computational social contracts.
A long description of libethereum.
Package: libethereum-dev
Section: libdevel
Architecture: any
Depends: libethereum (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: The future of computational social contracts. Dev Files.
A long description of libethereum. Dev Files.
Package: alethzero
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libethereum (= ${binary:Version})
Description: The Qt-based Ethereum GUI.
A long description of alethzero.

24
debian/copyright
View File

@ -1,24 +0,0 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: cpp-ethereum
Source: github.com/ethereum/cpp-ethereum
Files: *
Copyright: 2014 Gav Wood <i@gavwood.com>
License: MIT
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

3
debian/docs
View File

@ -1,3 +0,0 @@
CodingStandards.txt
README.md
TODO

36
debian/rules
View File

@ -1,36 +0,0 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
#
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
#
# Modified to make a template file for a multi-binary package with separated
# build-arch and build-indep targets by Bill Allombert 2001
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
# This has to be exported to make some magic below work.
export DH_OPTIONS
%:
dh $@
override_dh_auto_configure:
cmake -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/libethereum-dev/usr .
override_dh_auto_build:
$(MAKE) -j8
override_dh_auto_install:
$(MAKE) install
# Move the libs over to the non-dev package.
mkdir -p $(CURDIR)/debian/libethereum/usr
mv $(CURDIR)/debian/libethereum-dev/usr/lib $(CURDIR)/debian/libethereum/usr/lib
mkdir -p $(CURDIR)/debian/alethzero/usr/bin
mv $(CURDIR)/debian/libethereum-dev/usr/bin/alethzero $(CURDIR)/debian/alethzero/usr/bin

7
eth/main.cpp
View File

@ -237,6 +237,13 @@ int main(int argc, char** argv)
cout << "Current secret: " + toHex(us.secret().asArray()) << endl;
cout << "===" << endl;
}
else if (cmd == "block")
{
eth::uint n = c.blockChain().details().number;
cout << endl;
cout << "Current block # " << n << endl;
cout << "===" << endl;
}
else if (cmd == "balance")
{
u256 balance = c.state().balance(us.address());

8
package.sh
View File

@ -1,8 +0,0 @@
#!/bin/bash
set -e
rm -f ../cpp-ethereum_*_source.changes
debuild -S -sa
cd ..
dput -f ppa:ethereum/ethereum cpp-ethereum_*_source.changes

74
release.sh
View File

@ -1,74 +0,0 @@
#!/bin/bash
dist="saucy"
version=$(grep "define ETH_VERSION" libethereum/Common.h | cut -d ' ' -f 3)
branch="$(git branch | grep \* | cut -c 3-)"
if [[ ! "$1" == "" ]]; then
version=$1
fi
if [[ ! "$3" == "" ]]; then
if [[ ! "$4" == "" ]]; then
dist=$4
fi
if [[ "$2" == "-i" ]]; then
# increment current debian release only
# new version ./release VERSION -i MESSAGE DIST
debchange -i -p "$3" -D "$dist"
git commit -a -m "$3"
else
# new version ./release VERSION DEB-VERSION MESSAGE DIST
debchange -v $version-$2 -p "$3" -D "$dist"
git commit -a -m "$3"
fi
fi
opwd=`pwd`
cd /tmp
echo Checking out...
git clone $opwd
cd cpp-ethereum
git checkout "$branch"
archdir="cpp-ethereum-$version"
archfile="$archdir.tar.bz2"
echo Making BuildInfo...
mkdir build
cd build
cmake ..
cd ..
cp build/BuildInfo.h .
rm -rf build
echo Cleaning backup files...
find . | grep \~ | xargs rm -f
echo Cleaning others...
rm release.sh
echo Cleaning versioning...
rm -rf .git .gitignore
echo Renaming directory...
cd ..
rm -rf $archdir
mv cpp-ethereum $archdir
echo Creating archive...
tar c $archdir | bzip2 -- > $archfile
shasum $archfile
[[ ! "$version" == "" ]] && ln -sf $archfile "cpp-ethereum_$version.orig.tar.bz2"
echo Packaging...
cd "$archdir"
./package.sh
echo Cleaning up...
rm -rf /tmp/$archdir
mv /tmp/$archfile ~
echo Done.
Write Preview
Loading…
Cancel
Save