build: Move to a webpack module
Cockpit recently changed to an ESM build system [1]. Bump COCKPIT_REPO_COMMIT to that and follow suit. This does not work with old node.js 10 any more which is still the default in RHEL 8. Install the newer version 16 instead. [1] https://github.com/cockpit-project/cockpit/pull/18366
This commit is contained in:
parent
1f4e0fac24
commit
4990d6a103
4 changed files with 31 additions and 23 deletions
6
Makefile
6
Makefile
|
|
@ -34,7 +34,7 @@ COCKPIT_REPO_FILES = \
|
|||
$(NULL)
|
||||
|
||||
COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
|
||||
COCKPIT_REPO_COMMIT = 173bb62c36044f23092fbe1d30f6b21177a74980 # 285 + 173bb62c36044f23092fbe1d30f6b21177a74980
|
||||
COCKPIT_REPO_COMMIT = 54f2fd58a3645c4a222e2b1b9b5f1b9321bed998 # 285 + Move to a webpack module
|
||||
|
||||
$(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
|
||||
COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
|
||||
|
|
@ -59,10 +59,10 @@ po/$(PACKAGE_NAME).js.pot:
|
|||
--from-code=UTF-8 $$(find src/ -name '*.js' -o -name '*.jsx')
|
||||
|
||||
po/$(PACKAGE_NAME).html.pot: $(NODE_MODULES_TEST) $(COCKPIT_REPO_STAMP)
|
||||
pkg/lib/html2po -o $@ $$(find src -name '*.html')
|
||||
pkg/lib/html2po.js -o $@ $$(find src -name '*.html')
|
||||
|
||||
po/$(PACKAGE_NAME).manifest.pot: $(NODE_MODULES_TEST) $(COCKPIT_REPO_STAMP)
|
||||
pkg/lib/manifest2po src/manifest.json -o $@
|
||||
pkg/lib/manifest2po.js src/manifest.json -o $@
|
||||
|
||||
po/$(PACKAGE_NAME).metainfo.pot: $(APPSTREAMFILE)
|
||||
xgettext --default-domain=$(PACKAGE_NAME) --output=$@ $<
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue