From 82746c20fb667fb0f8aed4aaa07a45e9e8248f8d Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Sun, 25 Jan 2015 08:14:25 +0100
Subject: [PATCH] update packaging scripts

---
 make_packages => contrib/make_android | 32 +++++----------------
 contrib/make_packages                 | 40 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 25 deletions(-)
 rename make_packages => contrib/make_android (50%)
 create mode 100755 contrib/make_packages

diff --git a/make_packages b/contrib/make_android
similarity index 50%
rename from make_packages
rename to contrib/make_android
index 22e01a30c..859300fb0 100755
--- a/make_packages
+++ b/contrib/make_android
@@ -1,23 +1,20 @@
 #!/usr/bin/python
 
-from lib.version import ELECTRUM_VERSION as version
 
 if __name__ == '__main__':
     import sys, re, shutil, os, hashlib
+    import imp
+    os.chdir(os.path.dirname(os.path.realpath(__file__)))
+    os.chdir('..')
+
+    imp.load_module('electrum', *imp.find_module('../lib'))
+    from electrum.version import ELECTRUM_VERSION as version
 
     if not ( os.path.exists('packages')):
         print "The packages directory is missing."
         sys.exit()
 
-    # 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
-
 
-    # android
     os.system('rm -rf dist/e4a-%s'%version)
     os.mkdir('dist/e4a-%s'%version)
     shutil.copyfile("electrum",'dist/e4a-%s/e4a.py'%version)
@@ -37,21 +34,6 @@ if __name__ == '__main__':
     e4a_name = "e4a-%s.zip"%version
     e4a_name2 = e4a_name.replace(".","")
     os.system( "mv %s %s"%(e4a_name, e4a_name2) )
+    print "dist/%s                "%e4a_name2
 
-    import getpass
-    password = getpass.getpass("Password:")
-    for f in os.listdir("."):
-        os.system( "gpg --sign --armor --detach --passphrase \"%s\" %s"%(password, f) )
-
-    md5_tgz = hashlib.md5(file(_tgz, 'r').read()).digest().encode('hex')
-    md5_zip = hashlib.md5(file(_zip, 'r').read()).digest().encode('hex')
-    md5_android = hashlib.md5(file(e4a_name2, 'r').read()).digest().encode('hex')
-    os.chdir("..")
-
-    print ""
-    print "Packages are ready:"
-    print "dist/%s     "%_tgz, md5_tgz
-    print "dist/%s        "%_zip, md5_zip
-    print "dist/%s                "%e4a_name2, md5_android
-    print "To make a release, upload the files to the server, and update the webpages in branch gh-pages"
 
diff --git a/contrib/make_packages b/contrib/make_packages
new file mode 100755
index 000000000..5660454fb
--- /dev/null
+++ b/contrib/make_packages
@@ -0,0 +1,40 @@
+#!/usr/bin/python
+
+import sys, re, shutil, os, hashlib
+import imp
+import getpass
+
+if __name__ == '__main__':
+
+    os.chdir(os.path.dirname(os.path.realpath(__file__)))
+    os.chdir('..')
+
+    imp.load_module('electrum', *imp.find_module('../lib'))
+    from electrum.version import ELECTRUM_VERSION as version
+
+    if not ( os.path.exists('packages')):
+        print "The packages directory is missing."
+        sys.exit()
+
+    # 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
+
+    os.chdir("dist")
+    password = getpass.getpass("Password:")
+    for f in os.listdir("."):
+        os.system( "gpg --sign --armor --detach --passphrase \"%s\" %s"%(password, f) )
+
+    md5_tgz = hashlib.md5(file(_tgz, 'r').read()).digest().encode('hex')
+    md5_zip = hashlib.md5(file(_zip, 'r').read()).digest().encode('hex')
+    os.chdir("..")
+
+    print ""
+    print "Packages are ready:"
+    print "dist/%s     "%_tgz, md5_tgz
+    print "dist/%s        "%_zip, md5_zip
+    print "To make a release, upload the files to the server, and update the webpages in branch gh-pages"
+