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

Try: better change testing in Makefile #3225

Draft
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Draft

Try: better change testing in Makefile #3225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ ELECTRON_VERSION := $(shell node -e "console.log(require('./package.json').devDe
RED=`tput setaf 1`
RESET=`tput sgr0`

SIMPLENOTE_JS := $(THIS_DIR)/dist/app.js
# SIMPLENOTE_JS := `find $(THIS_DIR)/dist -name 'app.*.js'`
# this finds the newest file that matches app.*.js
SIMPLENOTE_JS := $(shell find $(THIS_DIR)/dist -name 'app.*.js' -print0 | xargs -r -0 ls -1 -t | head -1)
SIMPLENOTE_CHANGES_STD := `find "$(THIS_DIR)" -newer "$(SIMPLENOTE_JS)" \( -name "*.js" -o -name "*.jsx" -o -name "*.json" -o -name "*.scss" -o -name "*.ts" -o -name "*.tsx" \) -type f -print -quit | grep -v .min. | wc -l`
SIMPLENOTE_BRANCH = $(shell git --git-dir .git branch | sed -n -e 's/^\* \(.*\)/\1/p')

Expand Down Expand Up @@ -91,12 +93,11 @@ build-app:

.PHONY: build-if-not-exists
build-if-not-exists: config.json
@if [ -f $(SIMPLENOTE_JS) ]; then true; else make build; fi
@if [ ! -z $(SIMPLENOTE_JS) ] && [ -f $(SIMPLENOTE_JS) ]; then true; else make build; fi

.PHONY: build-if-changed
build-if-changed: build-if-not-exists
@if [ $(SIMPLENOTE_CHANGES_STD) -eq 0 ]; then true; else make build; fi;

@if [ ! -z $(SIMPLENOTE_JS) ] && [ $(SIMPLENOTE_CHANGES_STD) -eq 0 ]; then true; else make build; fi

# Build binaries only
.PHONY: osx
Expand Down