diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index b3f8b08..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -recursive-include comictagger * diff --git a/comictagger.py b/comictagger.py index 078f515..c12363c 100755 --- a/comictagger.py +++ b/comictagger.py @@ -1,4 +1,4 @@ #!/usr/bin/python -from comictagger.main import ctmain +from comictaggerlib.main import ctmain ctmain() diff --git a/setup.py b/setup.py index 1faf978..539e131 100644 --- a/setup.py +++ b/setup.py @@ -2,14 +2,14 @@ from distutils.core import setup import distutils.command.install_scripts -import os -import shutil +#import os +#import shutil # Things are weird if the script has a py. Will this break things for windows??? -if not os.path.exists('scripts/comictagger'): - if not os.path.exists('scripts'): - os.makedirs('scripts') - shutil.copyfile('comictagger.py', 'scripts/comictagger') +#if not os.path.exists('scripts/comictagger'): +# if not os.path.exists('scripts'): +# os.makedirs('scripts') +# shutil.copyfile('comictagger.py', 'scripts/comictagger') setup(name = "comictagger", @@ -18,11 +18,12 @@ setup(name = "comictagger", author = "Anthony Beville", author_email = "comictagger@gmail.com", url = "http://code.google.com/p/comictagger/", - packages = [ "comictagger", "comictagger/UnRAR2" ] , + packages = [ "comictaggerlib", "comictaggerlib/UnRAR2" ] , package_data = { - 'comictagger': ['ui/*.ui', 'graphics/*'] , + 'comictaggerlib': ['ui/*.ui', 'graphics/*'] , + 'comictaggerlib/UnRAR2': ['UnRARDLL/*.*', 'UnRARDLL/x64/*.*'] , }, - scripts = ["scripts/comictagger"], + scripts = ["comictagger.py"], long_description = """ ComicTagger is a multi-platform app for writing metadata to comic archives, written in Python and PyQt.