diff options
| author | Vincent Peugnet <33429034+vincent-peugnet@users.noreply.github.com> | 2019-12-26 18:22:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-26 18:22:01 +0100 |
| commit | 4b967cb532b34c5d38452a71de6ae6e965858ca0 (patch) | |
| tree | acfeff973269ae4fa4d14b81fdb1acfb791c33ca /Makefile | |
| parent | 698a6d274e1c909e4e7be56fa9d15296706464b5 (diff) | |
| parent | 169f2b097bb7ffcab1b536d66437165e9c4ea2d8 (diff) | |
| download | wcms-4b967cb532b34c5d38452a71de6ae6e965858ca0.tar.gz wcms-4b967cb532b34c5d38452a71de6ae6e965858ca0.zip | |
Merge pull request #31 from n-peugnet/minor-fixes
Chore: minor file changes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -2,22 +2,22 @@ include .default.env include .env export -build_dir := build +build_dir := build +js_src_dir := src # Misc variables. -PATH := vendor/bin:node_modules/.bin:$(PATH) -override GIT_VERSION := $(shell git --no-pager describe --always --tags) -override CUR_VERSION := $(strip $(shell cat VERSION 2>/dev/null)) -override WEBPACK_FLAGS += $(if $(filter $(ENV),dist),-p) +PATH := vendor/bin:node_modules/.bin:$(PATH) +override GIT_VERSION := $(shell git --no-pager describe --always --tags) +override CUR_VERSION := $(strip $(shell cat VERSION 2>/dev/null)) +override WEBPACK_FLAGS += $(if $(filter $(ENV),dist),-p) override COMPOSER_FLAGS += $(if $(filter $(ENV),dist),--no-dev --prefer-dist) -PREV_ENV_FILE := $(build_dir)/prev_env -PREV_ENV := $(strip $(shell cat $(PREV_ENV_FILE) 2>/dev/null)) +PREV_ENV_FILE := $(build_dir)/prev_env +PREV_ENV := $(strip $(shell cat $(PREV_ENV_FILE) 2>/dev/null)) # Files variables. -js_src_dir := src -js_sources := $(wildcard $(js_src_dir)/*.js) -js_bundles := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js) -js_srcmaps := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js.map) +js_sources := $(wildcard $(js_src_dir)/*.js) +js_bundles := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js) +js_srcmaps := $(js_sources:$(js_src_dir)/%.js=assets/js/%.bundle.js.map) zip_release := dist/w_cms_$(GIT_VERSION).zip # Default target. This executes everything targets needed to get a fully |