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

afws_client: update

This commit is contained in:
Sebastien Bourdeauducq 2022-09-19 16:58:41 +08:00
parent 4266beeb9c
commit 1709cf9717
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/frontend/afws_client.py
View File

@ -82,7 +82,7 @@ class Client:
self.send_command("LOGIN", username, password) self.send_command("LOGIN", username, password)
return self.read_reply() == ["HELLO"] return self.read_reply() == ["HELLO"]
def build(self, major_ver, rev, variant, log): def build(self, major_ver, rev, variant, log, experimental_features):
if not variant: if not variant:
variants = self.get_variants() variants = self.get_variants()
if len(variants) != 1: if len(variants) != 1:
@ -94,6 +94,7 @@ class Client:
variant, variant,
"LOG_ENABLE" if log else "LOG_DISABLE", "LOG_ENABLE" if log else "LOG_DISABLE",
major_ver, major_ver,
*experimental_features,
) )
self.send_command("BUILD", *build_args) self.send_command("BUILD", *build_args)
reply = self.read_reply()[0] reply = self.read_reply()[0]
@ -152,6 +153,7 @@ def main():
act_build.add_argument("--major-ver", default=None, help="ARTIQ major version") act_build.add_argument("--major-ver", default=None, help="ARTIQ major version")
act_build.add_argument("--rev", default=None, help="revision to build (default: currently installed ARTIQ revision)") act_build.add_argument("--rev", default=None, help="revision to build (default: currently installed ARTIQ revision)")
act_build.add_argument("--log", action="store_true", help="Display the build log") act_build.add_argument("--log", action="store_true", help="Display the build log")
act_build.add_argument("--experimental", action="append", default=[], help="enable an experimental feature (can be repeatedly specified to enable multiple features)")
act_build.add_argument("directory", help="output directory") act_build.add_argument("directory", help="output directory")
act_build.add_argument("variant", nargs="?", default=None, help="variant to build (can be omitted if user is authorised to build only one)") act_build.add_argument("variant", nargs="?", default=None, help="variant to build (can be omitted if user is authorised to build only one)")
act_passwd = action.add_parser("passwd", help="change password") act_passwd = action.add_parser("passwd", help="change password")
@ -210,7 +212,7 @@ def main():
if rev is None: if rev is None:
print("Unable to determine currently installed ARTIQ revision. Specify manually using --rev.") print("Unable to determine currently installed ARTIQ revision. Specify manually using --rev.")
sys.exit(1) sys.exit(1)
result, contents = client.build(major_ver, rev, args.variant, args.log) result, contents = client.build(major_ver, rev, args.variant, args.log, args.experimental)
if result != "OK": if result != "OK":
if result == "UNAUTHORIZED": if result == "UNAUTHORIZED":
print("You are not authorized to build this variant. Your firmware subscription may have expired. Contact helpdesk\x40m-labs.hk.") print("You are not authorized to build this variant. Your firmware subscription may have expired. Contact helpdesk\x40m-labs.hk.")