fix for issue 184

[electrum-nvc.git] / make_packages

diff --git a/make_packages b/make_packages
index a790c87..4863de7 100755 (executable)
--- a/make_packages
+++ b/make_packages
@@ -10,7 +10,7 @@ if __name__ == '__main__':
         sys.exit()
 
     os.system("python mki18n.py")
-    os.system("pyrcc4 icons.qrc -o lib/icons_rc.py")
+    os.system("pyrcc4 icons.qrc -o gui/icons_rc.py")
     os.system("python setup.py sdist --format=zip,gztar")
     
     _tgz="Electrum-%s.tar.gz"%version
@@ -20,19 +20,24 @@ if __name__ == '__main__':
     # android
     os.system('rm -rf dist/e4a-%s'%version)
     os.mkdir('dist/e4a-%s'%version)
-    shutil.copyfile("electrum",'dist/e4a-%s/electrum.py'%version)
+    shutil.copyfile("electrum",'dist/e4a-%s/e4a.py'%version)
     shutil.copytree("ecdsa",'dist/e4a-%s/ecdsa'%version)
     shutil.copytree("aes",'dist/e4a-%s/aes'%version)
-    shutil.copytree("lib",'dist/e4a-%s/electrum'%version)
+    shutil.copytree("lib",'dist/e4a-%s/lib'%version)
+    os.mkdir('dist/e4a-%s/gui'%version)
+    for n in ['gui_android.py', 'pyqrnative.py', 'bmp.py']:
+        shutil.copy("gui/%s"%n,'dist/e4a-%s/gui'%version)
+    open('dist/e4a-%s/gui/__init__.py'%version,'w').close()
 
     os.chdir("dist")
     # create the zip file
     os.system( "zip -r e4a-%s.zip e4a-%s"%(version, version) )
+    os.system( "rm -rf e4a-%s"%(version) )
 
     # change filename because some 3G carriers do not allow users to download a zip file...
     e4a_name = "e4a-%s.zip"%version
     e4a_name2 = e4a_name.replace(".","")
-    os.system( "cp %s %s"%(e4a_name, e4a_name2) )
+    os.system( "mv %s %s"%(e4a_name, e4a_name2) )
     os.chdir("..")
 
     md5_tgz = hashlib.md5(file('dist/'+_tgz, 'r').read()).digest().encode('hex')
@@ -43,6 +48,6 @@ if __name__ == '__main__':
     print "Packages are ready:"
     print "dist/%s     "%_tgz, md5_tgz
     print "dist/%s        "%_zip, md5_zip
-    print "dist/e4a                       ", md5_android
+    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"