jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-22 18:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: get rid of npx (#1929)

Browse Source 
We can live without it with a simple `PATH` trick at the top of the
Makefile (thanks @lurch!).

Change-Type: patch
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
This commit is contained in:
Juan Cruz Viotti 2017-12-19 16:08:37 -04:00 committed by GitHub
parent abfa44a088
commit c586d9f54c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2697 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Makefile
View File

@ -2,8 +2,6 @@
# Build configuration # Build configuration
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
NPX = ./node_modules/.bin/npx
# This directory will be completely deleted by the `clean` rule # This directory will be completely deleted by the `clean` rule
BUILD_DIRECTORY ?= dist BUILD_DIRECTORY ?= dist
@ -18,6 +16,10 @@ BUILD_TEMPORARY_DIRECTORY = $(BUILD_DIRECTORY)/.tmp
# See https://github.com/electron/spectron/issues/127 # See https://github.com/electron/spectron/issues/127
ETCHER_SPECTRON_ENTRYPOINT ?= $(shell node -e 'console.log(require("electron"))') ETCHER_SPECTRON_ENTRYPOINT ?= $(shell node -e 'console.log(require("electron"))')
# See https://stackoverflow.com/a/13468229/1641422
SHELL := /bin/bash
PATH := $(shell pwd)/node_modules/.bin:$(PATH)
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# Operating system and architecture detection # Operating system and architecture detection
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
@ -231,7 +233,7 @@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(
$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH)-app \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH)-app \
| $(BUILD_DIRECTORY) | $(BUILD_DIRECTORY)
mkdir $@ mkdir $@
cd $< && ../../$(NPX) pkg --output ../../$@/$(ETCHER_CLI_BINARY) -t node6-$(PLATFORM_PKG)-$(TARGET_ARCH) $(ENTRY_POINT_CLI) cd $< && pkg --output ../../$@/$(ETCHER_CLI_BINARY) -t node6-$(PLATFORM_PKG)-$(TARGET_ARCH) $(ENTRY_POINT_CLI)
./scripts/build/dependencies-npm-extract-addons.sh \ ./scripts/build/dependencies-npm-extract-addons.sh \
-d $</node_modules \ -d $</node_modules \
-o $@/node_modules -o $@/node_modules
@ -287,13 +289,13 @@ assets/osx/installer.tiff: assets/osx/installer.png assets/osx/installer@2x.png
$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION).dmg: assets/osx/installer.tiff \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION).dmg: assets/osx/installer.tiff \
| $(BUILD_DIRECTORY) | $(BUILD_DIRECTORY)
TARGET_ARCH=$(TARGET_ARCH) $(NPX) build --mac dmg $(ELECTRON_BUILDER_OPTIONS) \ TARGET_ARCH=$(TARGET_ARCH) build --mac dmg $(ELECTRON_BUILDER_OPTIONS) \
--extraMetadata.version=$(APPLICATION_VERSION) \ --extraMetadata.version=$(APPLICATION_VERSION) \
--extraMetadata.packageType=dmg --extraMetadata.packageType=dmg
$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-mac.zip: assets/osx/installer.tiff \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-mac.zip: assets/osx/installer.tiff \
| $(BUILD_DIRECTORY) | $(BUILD_DIRECTORY)
TARGET_ARCH=$(TARGET_ARCH) $(NPX) build --mac zip $(ELECTRON_BUILDER_OPTIONS) \ TARGET_ARCH=$(TARGET_ARCH) build --mac zip $(ELECTRON_BUILDER_OPTIONS) \
--extraMetadata.version=$(APPLICATION_VERSION) \ --extraMetadata.version=$(APPLICATION_VERSION) \
--extraMetadata.packageType=zip --extraMetadata.packageType=zip
@ -301,7 +303,7 @@ APPLICATION_NAME_ELECTRON = $(APPLICATION_NAME_LOWERCASE)-electron
$(BUILD_DIRECTORY)/$(APPLICATION_NAME_ELECTRON)-$(APPLICATION_VERSION_REDHAT).$(TARGET_ARCH_REDHAT).rpm: \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME_ELECTRON)-$(APPLICATION_VERSION_REDHAT).$(TARGET_ARCH_REDHAT).rpm: \
| $(BUILD_DIRECTORY) | $(BUILD_DIRECTORY)
$(NPX) build --linux rpm $(ELECTRON_BUILDER_OPTIONS) \ build --linux rpm $(ELECTRON_BUILDER_OPTIONS) \
--extraMetadata.name=$(APPLICATION_NAME_ELECTRON) \ --extraMetadata.name=$(APPLICATION_NAME_ELECTRON) \
--extraMetadata.version=$(APPLICATION_VERSION_REDHAT) \ --extraMetadata.version=$(APPLICATION_VERSION_REDHAT) \
--extraMetadata.packageType=rpm \ --extraMetadata.packageType=rpm \
@ -309,7 +311,7 @@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME_ELECTRON)-$(APPLICATION_VERSION_REDHAT).$(
$(BUILD_DIRECTORY)/$(APPLICATION_NAME_ELECTRON)_$(APPLICATION_VERSION_DEBIAN)_$(TARGET_ARCH_DEBIAN).deb: \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME_ELECTRON)_$(APPLICATION_VERSION_DEBIAN)_$(TARGET_ARCH_DEBIAN).deb: \
| $(BUILD_DIRECTORY) | $(BUILD_DIRECTORY)
$(NPX) build --linux deb $(ELECTRON_BUILDER_OPTIONS) \ build --linux deb $(ELECTRON_BUILDER_OPTIONS) \
--extraMetadata.name=$(APPLICATION_NAME_ELECTRON) \ --extraMetadata.name=$(APPLICATION_NAME_ELECTRON) \
--extraMetadata.version=$(APPLICATION_VERSION_DEBIAN) \ --extraMetadata.version=$(APPLICATION_VERSION_DEBIAN) \
--extraMetadata.packageType=deb \ --extraMetadata.packageType=deb \
@ -322,7 +324,7 @@ ELECTRON_BUILDER_LINUX_UNPACKED_DIRECTORY = linux-$(TARGET_ARCH_ELECTRON_BUILDER
endif endif
$(BUILD_DIRECTORY)/$(ELECTRON_BUILDER_LINUX_UNPACKED_DIRECTORY)/$(APPLICATION_NAME_ELECTRON): | $(BUILD_DIRECTORY) $(BUILD_DIRECTORY)/$(ELECTRON_BUILDER_LINUX_UNPACKED_DIRECTORY)/$(APPLICATION_NAME_ELECTRON): | $(BUILD_DIRECTORY)
$(NPX) build --dir --linux $(ELECTRON_BUILDER_OPTIONS) \ build --dir --linux $(ELECTRON_BUILDER_OPTIONS) \
--extraMetadata.name=$(APPLICATION_NAME_ELECTRON) \ --extraMetadata.name=$(APPLICATION_NAME_ELECTRON) \
--extraMetadata.version=$(APPLICATION_VERSION) \ --extraMetadata.version=$(APPLICATION_VERSION) \
--extraMetadata.packageType=AppImage --extraMetadata.packageType=AppImage
@ -356,13 +358,13 @@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-$(PLATFO
$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-Portable-$(APPLICATION_VERSION)-$(TARGET_ARCH).exe: \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-Portable-$(APPLICATION_VERSION)-$(TARGET_ARCH).exe: \
| $(BUILD_DIRECTORY) | $(BUILD_DIRECTORY)
TARGET_ARCH=$(TARGET_ARCH) $(NPX) build --win portable $(ELECTRON_BUILDER_OPTIONS) \ TARGET_ARCH=$(TARGET_ARCH) build --win portable $(ELECTRON_BUILDER_OPTIONS) \
--extraMetadata.version=$(APPLICATION_VERSION) \ --extraMetadata.version=$(APPLICATION_VERSION) \
--extraMetadata.packageType=portable --extraMetadata.packageType=portable
$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-Setup-$(APPLICATION_VERSION)-$(TARGET_ARCH).exe: \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-Setup-$(APPLICATION_VERSION)-$(TARGET_ARCH).exe: \
| $(BUILD_DIRECTORY) | $(BUILD_DIRECTORY)
TARGET_ARCH=$(TARGET_ARCH) $(NPX) build --win nsis $(ELECTRON_BUILDER_OPTIONS) \ TARGET_ARCH=$(TARGET_ARCH) build --win nsis $(ELECTRON_BUILDER_OPTIONS) \
--extraMetadata.version=$(APPLICATION_VERSION) \ --extraMetadata.version=$(APPLICATION_VERSION) \
--extraMetadata.packageType=nsis --extraMetadata.packageType=nsis
@ -395,10 +397,10 @@ TARGETS = \
electron-develop electron-develop
changelog: changelog:
$(NPX) versionist versionist
package-electron: package-electron:
TARGET_ARCH=$(TARGET_ARCH) $(NPX) build --dir $(ELECTRON_BUILDER_OPTIONS) TARGET_ARCH=$(TARGET_ARCH) build --dir $(ELECTRON_BUILDER_OPTIONS)
package-cli: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH) package-cli: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH)
@ -524,13 +526,13 @@ electron-develop:
-s "$(PLATFORM)" -s "$(PLATFORM)"
sass: sass:
$(NPX) node-sass lib/gui/scss/main.scss > lib/gui/css/main.css node-sass lib/gui/scss/main.scss > lib/gui/css/main.css
lint-js: lint-js:
$(NPX) eslint lib tests scripts bin versionist.conf.js eslint lib tests scripts bin versionist.conf.js
lint-sass: lint-sass:
$(NPX) sass-lint lib/gui/scss sass-lint lib/gui/scss
lint-cpp: lint-cpp:
cpplint --recursive src cpplint --recursive src
@ -550,15 +552,13 @@ lint: lint-js lint-sass lint-cpp lint-html lint-spell
MOCHA_OPTIONS=--recursive --reporter spec MOCHA_OPTIONS=--recursive --reporter spec
test-spectron: test-spectron:
$(NPX) env \ ETCHER_SPECTRON_ENTRYPOINT="$(ETCHER_SPECTRON_ENTRYPOINT)" mocha $(MOCHA_OPTIONS) tests/spectron
ETCHER_SPECTRON_ENTRYPOINT=$(ETCHER_SPECTRON_ENTRYPOINT) \
mocha $(MOCHA_OPTIONS) tests/spectron
test-gui: test-gui:
$(NPX) electron-mocha $(MOCHA_OPTIONS) --renderer tests/gui electron-mocha $(MOCHA_OPTIONS) --renderer tests/gui
test-sdk: test-sdk:
$(NPX) electron-mocha $(MOCHA_OPTIONS) \ electron-mocha $(MOCHA_OPTIONS) \
tests/shared \ tests/shared \
tests/child-writer \ tests/child-writer \
tests/image-stream tests/image-stream

2676
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

1
package.json
View File

@ -110,7 +110,6 @@
"nock": "9.0.9", "nock": "9.0.9",
"node-gyp": "3.5.0", "node-gyp": "3.5.0",
"node-sass": "4.5.3", "node-sass": "4.5.3",
"npx": "5.2.0",
"pkg": "4.1.1", "pkg": "4.1.1",
"sass-lint": "1.10.2", "sass-lint": "1.10.2",
"spectron": "3.7.2", "spectron": "3.7.2",