Skip to content

Commit

Permalink
chore: rename xs-vat-worker Makefile
Browse files Browse the repository at this point in the history
The original name came from the XS build tool convention, but required
annoying `-f` flags every time you use it, and we're only ever building for
linux/unix here.
  • Loading branch information
warner committed Sep 21, 2020
1 parent 91bb892 commit 0396ced
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ ROOT=$(PWD)/../..
.PHONY: all

all:
$(MAKE) -f xs-lin.mk build
$(MAKE) build
@echo "### building XS tools (headless)"
$(MAKE) -f xs-lin.mk $(TOOLS)/mcconfig
$(MAKE) $(TOOLS)/mcconfig
@echo "### building compartmap.json"
$(MAKE) -f xs-lin.mk compartmap.json
$(MAKE) compartmap.json
cat compartmap.json
@echo "### building xs-worker"
$(MAKE) -f xs-lin.mk build/bin/lin/debug/xs-vat-worker
$(MAKE) build/bin/lin/debug/xs-vat-worker


build/bin/lin/debug/xs-vat-worker: build $(TOOLS)/mcconfig moddable/xs/platforms/lin_xs_cli.c compartmap.json manifest.json
Expand All @@ -35,13 +35,13 @@ moddable/xs/platforms/lin_xs.h: /usr/include/glib-2.0/gio/gio.h

.PHONY: install-deps
install-deps:
$(MAKE) -f xs-lin.mk install-gio
$(MAKE) install-gio

.PHONY: install-gio
/usr/include/glib-2.0/gio/gio.h:
@echo "GIO not installed, need root to run apt-get install libglib2.0-dev"
@echo "feel free to stop now and run `make install-gio` directly, then rebuild"
$(MAKE) -f xs-lin.mk install-gio
$(MAKE) install-gio

# ubuntu 'bionic' puts gio in libglib2.0-dev
install-gio:
Expand Down
4 changes: 2 additions & 2 deletions packages/xs-vat-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"main": "src/locate.js",
"module": "src/locate.js",
"scripts": {
"install:xs-lin": "make -f xs-lin.mk install-deps",
"build:xs-lin": "make -f xs-lin.mk",
"install:xs-lin": "make install-deps",
"build:xs-lin": "make",
"test": "ava",
"build": "exit 0",
"lint-fix": "eslint --fix '**/*.{js,jsx}'",
Expand Down

0 comments on commit 0396ced

Please sign in to comment.