srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

minor cleanups

This commit is contained in:
Sebastien Bourdeauducq 2015-04-22 10:00:56 +08:00
parent 979cd14547
commit 5413242587
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conda/artiq/meta.yaml
View File

@ -19,8 +19,8 @@ build:
- novatech409b_controller = artiq.frontend.novatech409b_controller:main - novatech409b_controller = artiq.frontend.novatech409b_controller:main
- pdq2_client = artiq.frontend.pdq2_client:main - pdq2_client = artiq.frontend.pdq2_client:main
- pdq2_controller = artiq.frontend.pdq2_controller:main - pdq2_controller = artiq.frontend.pdq2_controller:main
- thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_controller:main
- pxi6733_controller = artiq.frontend.pxi6733_controller:main - pxi6733_controller = artiq.frontend.pxi6733_controller:main
- thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_controller:main
- artiq_gui = artiq.frontend.artiq_gui:main # [not win] - artiq_gui = artiq.frontend.artiq_gui:main # [not win]
requirements: requirements:

2
conda/pydaqmx/bld.bat
View File

@ -1,2 +1,2 @@
"%PYTHON%" setup.py build "%PYTHON%" setup.py build
"%PYTHON%" setup.py install "%PYTHON%" setup.py install

2
conda/pydaqmx/build.sh
View File

@ -1,2 +1,2 @@
$PYTHON setup.py build $PYTHON setup.py build
$PYTHON setup.py install $PYTHON setup.py install

2
setup.py
View File

@ -20,8 +20,8 @@ scripts = [
"novatech409b_controller=artiq.frontend.novatech409b_controller:main", "novatech409b_controller=artiq.frontend.novatech409b_controller:main",
"pdq2_client=artiq.frontend.pdq2_client:main", "pdq2_client=artiq.frontend.pdq2_client:main",
"pdq2_controller=artiq.frontend.pdq2_controller:main", "pdq2_controller=artiq.frontend.pdq2_controller:main",
"thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main",
"pxi6733_controller=artiq.frontend.pxi6733_controller:main" "pxi6733_controller=artiq.frontend.pxi6733_controller:main"
"thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main",
] ]
if os.getenv("ARTIQ_GUI") == "1": if os.getenv("ARTIQ_GUI") == "1":