Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile: fail immediately if find-meteor-dev-bundle.sh fails. #3385

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Makefile: fail immediately if find-meteor-dev-bundle.sh fails. #3385

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1490cbc
Makefile: fail immediately if find-meteor-dev-bundle.sh fails.
zenhack Jul 5, 2020
b291bcf
Also check for failures when looking for meteor 1.8.2
zenhack Jul 5, 2020
3b22c3f
Merge remote-tracking branch 'origin/master' into fail-fast-meteor-de…
zenhack Nov 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ EKAM=ekam
# (as of Jan 2020), notably Debian Sid, Fedora 30 and Archlinux. We're not
# entirely sure what changed, but this seems like a backwards incompatibility
# in libstdc++. See also issue #3171.
METEOR_DEV_BUNDLE=$(shell ./find-meteor-dev-bundle.sh)
METEOR_DEV_BUNDLE:=$(shell ./find-meteor-dev-bundle.sh)
ifneq '$(.SHELLSTATUS)' '0'
$(error Failed to find meteor dev bundle; have you installed Meteor?)
endif
METEOR_SPK_VERSION=0.5.1
METEOR_SPK=$(PWD)/meteor-spk-$(METEOR_SPK_VERSION)/meteor-spk
NODEJS=$(METEOR_DEV_BUNDLE)/bin/node
Expand Down Expand Up @@ -291,7 +294,10 @@ tmp/.shell-env: tmp/.ekam-run $(IMAGES) shell/imports/client/changelog.html shel
# a broken font file (all icons invisible and zero-width). For now we stick with the old version
# and run it using Meteor 1.8.2's node which is old enough to run it. This means you have to
# install Meteor 1.8.2 in addition to the latest version in order to build Sandstorm. :(
METEOR_DEV_BUNDLE_ICONS=$(shell ./find-meteor-dev-bundle.sh [email protected])
METEOR_DEV_BUNDLE_ICONS:=$(shell ./find-meteor-dev-bundle.sh [email protected])
ifneq '$(.SHELLSTATUS)' '0'
$(error Failed to find meteor dev bundle; have you installed Meteor?)
endif

icons/node_modules: icons/package.json
cd icons && PATH=$(METEOR_DEV_BUNDLE_ICONS)/bin:$$PATH $(METEOR_DEV_BUNDLE_ICONS)/bin/npm install
Expand Down