tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
(HTM) git clone https://git.parazyd.org/electrum
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Submodules
---
(DIR) commit f157a990c7c2712267af387cd19485c8d9142069
(DIR) parent 118052d81597eff3eb636d242eacdd0437dabdd6
(HTM) Author: ThomasV <thomasv@gitorious>
Date: Sat, 27 Jun 2015 15:22:48 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
D README | 54 -------------------------------
A README.rst | 61 +++++++++++++++++++++++++++++++
M contrib/make_packages | 3 +--
3 files changed, 62 insertions(+), 56 deletions(-)
---
(DIR) diff --git a/README b/README
t@@ -1,54 +0,0 @@
-Electrum - lightweight Bitcoin client
-
-Licence: GNU GPL v3
-Author: Thomas Voegtlin
-Language: Python
-Homepage: https://electrum.org/
-
-
-1. GETTING STARTED
-------------------
-
-To run Electrum from this directory, just do:
-
- ./electrum
-
-If you install Electrum on your system, you can run it from any
-directory.
-
-If you have pip, you can do:
-
- python setup.py sdist
- sudo pip install --pre dist/Electrum-2.0.tar.gz
-
-
-If you don't have pip, install with:
-
- python setup.py sdist
- sudo python setup.py install
-
-
-
-To start Electrum from your web browser, see
-http://electrum.org/bitcoin_URIs.html
-
-
-
-2. HOW OFFICIAL PACKAGES ARE CREATED
-------------------------------------
-
-python mki18n.py
-pyrcc4 icons.qrc -o gui/qt/icons_rc.py
-python setup.py sdist --format=zip,gztar
-
-On Mac OS X:
-
- # On port based installs
- sudo python setup-release.py py2app
-
- # On brew installs
- ARCHFLAGS="-arch i386 -arch x86_64" sudo python setup-release.py py2app --includes sip
-
- sudo hdiutil create -fs HFS+ -volname "Electrum" -srcfolder dist/Electrum.app dist/electrum-VERSION-macosx.dmg
-
-
(DIR) diff --git a/README.rst b/README.rst
t@@ -0,0 +1,61 @@
+Electrum - lightweight Bitcoin client
+=====================================
+
+::
+
+ Licence: GNU GPL v3
+ Author: Thomas Voegtlin
+ Language: Python
+ Homepage: https://electrum.org/
+
+
+.. image:: https://travis-ci.org/spesmilo/electrum.svg?branch=master
+ :target: https://travis-ci.org/spesmilo/electrum
+ :alt: Build Status
+
+
+1. GETTING STARTED
+------------------
+
+To run Electrum from this directory, just do::
+
+ ./electrum
+
+If you install Electrum on your system, you can run it from any
+directory.
+
+If you have pip, you can do::
+
+ python setup.py sdist
+ sudo pip install --pre dist/Electrum-2.0.tar.gz
+
+
+If you don't have pip, install with::
+
+ python setup.py sdist
+ sudo python setup.py install
+
+
+
+To start Electrum from your web browser, see
+http://electrum.org/bitcoin_URIs.html
+
+
+
+2. HOW OFFICIAL PACKAGES ARE CREATED
+------------------------------------
+
+On Linux/Windows::
+
+ pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+ python setup.py sdist --format=zip,gztar
+
+On Mac OS X::
+
+ # On port based installs
+ sudo python setup-release.py py2app
+
+ # On brew installs
+ ARCHFLAGS="-arch i386 -arch x86_64" sudo python setup-release.py py2app --includes sip
+
+ sudo hdiutil create -fs HFS+ -volname "Electrum" -srcfolder dist/Electrum.app dist/electrum-VERSION-macosx.dmg
(DIR) diff --git a/contrib/make_packages b/contrib/make_packages
t@@ -44,10 +44,9 @@ if __name__ == '__main__':
if not os.path.exists(n):
os.system("echo \# do not remove>%s"%n)
- # os.system("python mki18n.py")
os.system("pyrcc4 icons.qrc -o gui/qt/icons_rc.py")
os.system("python setup.py sdist --format=zip,gztar")
-
+
_tgz="Electrum-%s.tar.gz"%version
_zip="Electrum-%s.zip"%version