forked from M-Labs/artiq
1
0
Fork 0

WIP: let GUI be optional at install time

This commit is contained in:
Yann Sionneau 2015-02-06 18:37:35 +01:00 committed by Sebastien Bourdeauducq
parent aba749093b
commit 9420554d2b
4 changed files with 20 additions and 15 deletions

View File

@ -1 +1,2 @@
set ARTIQ_GUI=0
"%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt "%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt

View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
$PYTHON setup.py install --single-version-externally-managed --record=record.txt ARTIQ_GUI=1 $PYTHON setup.py install --single-version-externally-managed --record=record.txt

View File

@ -12,7 +12,7 @@ build:
entry_points: entry_points:
- artiq_client = artiq.frontend.artiq_client:main - artiq_client = artiq.frontend.artiq_client:main
- artiq_ctlid = artiq.frontend.artiq_ctlid:main - artiq_ctlid = artiq.frontend.artiq_ctlid:main
- artiq_gui = artiq.frontend.artiq_gui:main - artiq_gui = artiq.frontend.artiq_gui:main # [not win]
- artiq_master = artiq.frontend.artiq_master:main - artiq_master = artiq.frontend.artiq_master:main
- artiq_run = artiq.frontend.artiq_run:main - artiq_run = artiq.frontend.artiq_run:main
- lda_client = artiq.frontend.lda_client:main - lda_client = artiq.frontend.lda_client:main

View File

@ -8,8 +8,23 @@ requirements = [
"sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy", "sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy",
"python-dateutil", "prettytable", "h5py" "python-dateutil", "prettytable", "h5py"
] ]
if os.name != 'nt': scripts = [
"artiq_client=artiq.frontend.artiq_client:main",
"artiq_ctlid=artiq.frontend.artiq_ctlid:main",
"artiq_ctlmgr=artiq.frontend.artiq_ctlmgr:main",
"artiq_master=artiq.frontend.artiq_master:main",
"artiq_run=artiq.frontend.artiq_run:main",
"lda_client=artiq.frontend.lda_client:main",
"lda_controller=artiq.frontend.lda_controller:main",
"pdq2_client=artiq.frontend.pdq2_client:main",
"pdq2_controller=artiq.frontend.pdq2_controller:main",
]
if os.getenv("ARTIQ_GUI") == "1":
requirements += ["pygobject", "gbulb", "cairoplot"] requirements += ["pygobject", "gbulb", "cairoplot"]
scripts += [
"artiq_gui=artiq.frontend.artiq_gui:main"
]
setup( setup(
@ -33,17 +48,6 @@ setup(
package_data={"artiq": [os.path.join("gui", "icon.png")]}, package_data={"artiq": [os.path.join("gui", "icon.png")]},
ext_modules=[], ext_modules=[],
entry_points={ entry_points={
"console_scripts": [ "console_scripts": scripts,
"artiq_client=artiq.frontend.artiq_client:main",
"artiq_ctlid=artiq.frontend.artiq_ctlid:main",
"artiq_ctlmgr=artiq.frontend.artiq_ctlmgr:main",
"artiq_gui=artiq.frontend.artiq_gui:main",
"artiq_master=artiq.frontend.artiq_master:main",
"artiq_run=artiq.frontend.artiq_run:main",
"lda_client=artiq.frontend.lda_client:main",
"lda_controller=artiq.frontend.lda_controller:main",
"pdq2_client=artiq.frontend.pdq2_client:main",
"pdq2_controller=artiq.frontend.pdq2_controller:main",
],
} }
) )