do not open console windows for GUI applications on Windows

This commit is contained in:
Sebastien Bourdeauducq 2016-04-10 16:28:25 +08:00
parent 62eae5eb34
commit 3a0c2066a9
2 changed files with 18 additions and 4 deletions

View File

@ -15,11 +15,21 @@ unreleased [2.x]
patterns = pyon.load_file("influxdb_patterns.pyon") patterns = pyon.load_file("influxdb_patterns.pyon")
for p in patterns: for p in patterns:
print(p) print(p)
* The "GUI" has been renamed the "dashboard". * The "GUI" has been renamed the "dashboard".
* When flashing NIST boards, use "-m nist_qcX" or "-m nist_clock" instead of * When flashing NIST boards, use "-m nist_qcX" or "-m nist_clock" instead of
just "-m qcX" or "-m clock" (#290). just "-m qcX" or "-m clock" (#290).
* Applet command lines now use templates (e.g. $python) instead of formats * Applet command lines now use templates (e.g. $python) instead of formats
(e.g. {python}). (e.g. {python}).
* On Windows, GUI applications no longer open a console. For debugging
purposes, the console messages can still be displayed by running the GUI
applications this way::
python3.5 -m artiq.frontend.artiq_browser
python3.5 -m artiq.frontend.artiq_dashboard
(you may need to replace python3.5 with python)
Please always include the console output when reporting a GUI crash.
unreleased [1.0rc3] unreleased [1.0rc3]

View File

@ -19,15 +19,13 @@ requirements = [
"lit", "OutputCheck", "lit", "OutputCheck",
] ]
scripts = [ console_scripts = [
"artiq_browser=artiq.frontend.artiq_browser:main",
"artiq_client=artiq.frontend.artiq_client:main", "artiq_client=artiq.frontend.artiq_client:main",
"artiq_compile=artiq.frontend.artiq_compile:main", "artiq_compile=artiq.frontend.artiq_compile:main",
"artiq_coreanalyzer=artiq.frontend.artiq_coreanalyzer:main", "artiq_coreanalyzer=artiq.frontend.artiq_coreanalyzer:main",
"artiq_coreconfig=artiq.frontend.artiq_coreconfig:main", "artiq_coreconfig=artiq.frontend.artiq_coreconfig:main",
"artiq_corelog=artiq.frontend.artiq_corelog:main", "artiq_corelog=artiq.frontend.artiq_corelog:main",
"artiq_ctlmgr=artiq.frontend.artiq_ctlmgr:main", "artiq_ctlmgr=artiq.frontend.artiq_ctlmgr:main",
"artiq_dashboard=artiq.frontend.artiq_dashboard:main",
"artiq_influxdb=artiq.frontend.artiq_influxdb:main", "artiq_influxdb=artiq.frontend.artiq_influxdb:main",
"artiq_master=artiq.frontend.artiq_master:main", "artiq_master=artiq.frontend.artiq_master:main",
"artiq_mkfs=artiq.frontend.artiq_mkfs:main", "artiq_mkfs=artiq.frontend.artiq_mkfs:main",
@ -41,6 +39,11 @@ scripts = [
"thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main", "thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main",
] ]
gui_scripts = [
"artiq_browser=artiq.frontend.artiq_browser:main",
"artiq_dashboard=artiq.frontend.artiq_dashboard:main",
]
setup( setup(
name="artiq", name="artiq",
version=versioneer.get_version(), version=versioneer.get_version(),
@ -62,6 +65,7 @@ setup(
include_package_data=True, include_package_data=True,
ext_modules=[], ext_modules=[],
entry_points={ entry_points={
"console_scripts": scripts, "console_scripts": console_scripts,
"gui_scripts": gui_scripts,
} }
) )