Skip to content

Commit

Permalink
python: drop cockpit-bridge.pyz target
Browse files Browse the repository at this point in the history
The official way to invoke the python bridge is now via python3 -m.

We'll bring back a .pyz as an implementation detail of our remote
injection system in the near future.
  • Loading branch information
allisonkarlitskaya committed Nov 15, 2022
1 parent 79f378d commit e218b37
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
5 changes: 0 additions & 5 deletions HACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,6 @@ various bits of the new bridge code. You can run those with `make pytest` or
`systemd_ctypes` submodule is checked out before running `pytest` from the
source directory.

It's also possible to manually build the bridge with `make cockpit-bridge.pyz`.
You can copy the created file into the `$PATH` as `cockpit-bridge`. It should
then be possible to get a limited Cockpit session running (for example, by
specifying `localhost` to Cockpit Client).

## Running eslint

Cockpit uses [ESLint](https://eslint.org/) to automatically check JavaScript
Expand Down
14 changes: 0 additions & 14 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,6 @@ SYSTEMD_CTYPES_STAMP = src/systemd_ctypes/__init__.py
$(SYSTEMD_CTYPES_STAMP):
$(srcdir)/tools/systemd_ctypes

CLEANFILES += cockpit-bridge.pyz
cockpit-bridge.pyz: $(MANIFESTS) $(PYTHON_BRIDGE_FILES) $(SYSTEMD_CTYPES_STAMP)
@rm -rf tmp/pyz
@mkdir -p tmp/pyz
@cp -r $(srcdir)/dist $(srcdir)/src/cockpit $(srcdir)/src/systemd_ctypes/ tmp/pyz
$(AM_V_GEN) python3 -m zipapp --python /usr/bin/python3 --output $@ --main cockpit.bridge:main tmp/pyz
@chmod a+x $@

.PHONY: pcc
# Python Cockpit Client testing target
pcc: cockpit-bridge.pyz
ln -vsf "$(realpath $<)" ~/.local/bin/cockpit-bridge
gapplication action org.cockpit_project.CockpitClient open-path '"=localhost"'

# -----------------------------------------------------------------------------
# C

Expand Down

0 comments on commit e218b37

Please sign in to comment.