From b50198afb5dbbed84e06d72155bed4a080913c83 Mon Sep 17 00:00:00 2001 From: Justin Ramos Date: Sat, 25 Feb 2017 04:43:09 +0000 Subject: [PATCH] changes needed to get current code to run --- .gitignore | 2 ++ setup.py | 17 ++++++++--------- src/__init__.py | 0 src/network/__init__.py | 0 4 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 src/__init__.py create mode 100644 src/network/__init__.py diff --git a/.gitignore b/.gitignore index f3eb161c..7da86d2f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ src/.settings/ src/**/.dll src/**/*.o src/**/*.so +build/lib.* +build/temp.* diff --git a/setup.py b/setup.py index 47516634..cb1658b8 100644 --- a/setup.py +++ b/setup.py @@ -104,8 +104,6 @@ if __name__ == "__main__": here = os.path.abspath(os.path.dirname(__file__)) with open(os.path.join(here, 'README.md')) as f: README = f.read() - with open(os.path.join(here, 'CHANGES.txt')) as f: - CHANGES = f.read() bitmsghash = Extension('bitmsghash.bitmsghash', sources = ['src/bitmsghash/bitmsghash.cpp'], @@ -152,10 +150,11 @@ if __name__ == "__main__": bitmessage = bitmessagemain:Main.start """, ) - with open(os.path.join(dist.command_obj['install_scripts'].install_dir, 'bitmessage'), 'wt') as f: - f.write("#!/bin/sh\n") - f.write(dist.command_obj['build'].executable + " " + \ - os.path.join(dist.command_obj['install'].install_lib, - os.path.basename(dist.command_obj['bdist_egg'].egg_output), - 'bitmessagemain.py') + "\n") - os.chmod(os.path.join(dist.command_obj['install_scripts'].install_dir, 'bitmessage'), 0555) + if (dist.command_obj.get('install_scripts')): + with open(os.path.join(dist.command_obj['install_scripts'].install_dir, 'bitmessage'), 'wt') as f: + f.write("#!/bin/sh\n") + f.write(dist.command_obj['build'].executable + " " + \ + os.path.join(dist.command_obj['install'].install_lib, + os.path.basename(dist.command_obj['bdist_egg'].egg_output), + 'bitmessagemain.py') + "\n") + os.chmod(os.path.join(dist.command_obj['install_scripts'].install_dir, 'bitmessage'), 0555) diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/network/__init__.py b/src/network/__init__.py new file mode 100644 index 00000000..e69de29b