Skip to content

Commit

Permalink
do not open console windows for GUI applications on Windows
Browse files Browse the repository at this point in the history
sbourdeauducq committed Apr 10, 2016
1 parent 62eae5e commit 3a0c206
Showing 2 changed files with 18 additions and 4 deletions.
10 changes: 10 additions & 0 deletions RELEASE_NOTES.rst
Original file line number Diff line number Diff line change
@@ -15,11 +15,21 @@ unreleased [2.x]
patterns = pyon.load_file("influxdb_patterns.pyon")
for p in patterns:
print(p)

* The "GUI" has been renamed the "dashboard".
* When flashing NIST boards, use "-m nist_qcX" or "-m nist_clock" instead of
just "-m qcX" or "-m clock" (#290).
* Applet command lines now use templates (e.g. $python) instead of formats
(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]
12 changes: 8 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -19,15 +19,13 @@
"lit", "OutputCheck",
]

scripts = [
"artiq_browser=artiq.frontend.artiq_browser:main",
console_scripts = [
"artiq_client=artiq.frontend.artiq_client:main",
"artiq_compile=artiq.frontend.artiq_compile:main",
"artiq_coreanalyzer=artiq.frontend.artiq_coreanalyzer:main",
"artiq_coreconfig=artiq.frontend.artiq_coreconfig:main",
"artiq_corelog=artiq.frontend.artiq_corelog:main",
"artiq_ctlmgr=artiq.frontend.artiq_ctlmgr:main",
"artiq_dashboard=artiq.frontend.artiq_dashboard:main",
"artiq_influxdb=artiq.frontend.artiq_influxdb:main",
"artiq_master=artiq.frontend.artiq_master:main",
"artiq_mkfs=artiq.frontend.artiq_mkfs:main",
@@ -41,6 +39,11 @@
"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(
name="artiq",
version=versioneer.get_version(),
@@ -62,6 +65,7 @@
include_package_data=True,
ext_modules=[],
entry_points={
"console_scripts": scripts,
"console_scripts": console_scripts,
"gui_scripts": gui_scripts,
}
)

0 comments on commit 3a0c206

Please sign in to comment.