diff --git a/bin/soapy b/bin/soapy index 36a0a65b..26155b08 100755 --- a/bin/soapy +++ b/bin/soapy @@ -70,8 +70,8 @@ if __name__=="__main__": #Define parser and add arguments parser = ArgumentParser() - parser.add_argument("configFile", nargs="?", action="store", - help="The AO config file you wish to simulate. Defaults to conf/sh_8x8.py if none specified.") + parser.add_argument("configFile", nargs="?", action="store", required=True + help="The AO config file you wish to simulate.") parser.add_argument("--gui","-g", action="store_true", dest="gui", help="Starts the AO gui to visualise your simulation") diff --git a/bin/soapy.bat b/bin/soapy.bat new file mode 100644 index 00000000..c208fa62 --- /dev/null +++ b/bin/soapy.bat @@ -0,0 +1 @@ +python.exe %~dp0\soapy %* \ No newline at end of file diff --git a/setup.py b/setup.py index fdd17a86..e5f11696 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ + +import platform from setuptools import setup, find_packages import versioneer @@ -7,7 +9,13 @@ versioneer.versionfile_build = 'soapy/_version.py' versioneer.tag_prefix = '' # tags are like 1.2.0 versioneer.parentdir_prefix = 'soapy-' # dirname like 'myproject-1.2.0' - + + +scripts = ["bin/soapy"] + +if (platform.system() == "Windows"): + scripts.append("bin/soapy.bat") + setup( name='soapy', @@ -16,7 +24,7 @@ author='Andrew P. Reeves', author_email='andrewpaulreeves@gmail.com', packages=find_packages(), - scripts=['bin/soapy'], + scripts=scripts, description='A tomographic astronomical adaptive optics simulation with realistic laser guide star propagation.', long_description=open('README.md').read(), install_requires=[