working on initial make...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-02-01 00:52:15 +03:00
parent e2d854058b
commit 7abece217e
2 changed files with 24 additions and 20 deletions

View File

@ -38,8 +38,9 @@
## To print full list of user make targets use: ## To print full list of user make targets use:
## $ make help ## $ make help
## ##
## Currently it is not possible to do a make dist on a clean directory, ##
## this needs to be done in two stages: ## In some cases making things may fail on a clean directory, if this
## happens first build the environment and then try again:
## $ make dev ## $ make dev
## ... ## ...
## $ make dist ## $ make dist
@ -136,12 +137,7 @@
#.EXPORT_ALL_VARIABLES: #.EXPORT_ALL_VARIABLES:
# XXX for some reason in some contexts bash complains somewhere after SHELL := bash
# this point but otherwise works fine:
# - ssh localhost
# - termux on android
# while everything is OK on ubuntu and normal dev context...
SHELL := $(shell which bash)
# set path to use local tools... # set path to use local tools...
# NOTE this does not affect where make is seraching for commands... # NOTE this does not affect where make is seraching for commands...
@ -524,7 +520,7 @@ web: $(DIST_DIR)/$(APP_NAME)-$(VERSION)-web.zip
electron-dist: ## Make electron distributable electron-dist: ## Make electron distributable
electron-dist: VERSION := $(VERSION)-el electron-dist: VERSION := $(VERSION)-el
electron-dist: DIST := $(DIST_DIR)/$(APP_NAME)-$(VERSION)-$(TARGET_OS)-$(ARCH).zip electron-dist: DIST := $(DIST_DIR)/$(APP_NAME)-$(VERSION)-$(TARGET_OS)-$(ARCH).zip
electron-dist: dev $$(DIST) electron-dist: $$(DIST)
# add a time stamp to version... # add a time stamp to version...
@ -532,7 +528,7 @@ electron-dist: dev $$(DIST)
electron-test-dist: ## Make electron test distributable electron-test-dist: ## Make electron test distributable
electron-test-dist: VERSION := $(VERSION)-$(DATE)-el electron-test-dist: VERSION := $(VERSION)-$(DATE)-el
electron-test-dist: DIST := $(DIST_DIR)/$(APP_NAME)-$(VERSION)-$(TARGET_OS)-$(ARCH).zip electron-test-dist: DIST := $(DIST_DIR)/$(APP_NAME)-$(VERSION)-$(TARGET_OS)-$(ARCH).zip
electron-test-dist: dev $$(DIST) electron-test-dist: $$(DIST)
#electron-test-dist: $(DIST_DIR)/$(APP_NAME)-$$(VERSION)-$(TARGET_OS)-$(ARCH).zip #electron-test-dist: $(DIST_DIR)/$(APP_NAME)-$$(VERSION)-$(TARGET_OS)-$(ARCH).zip
@ -540,7 +536,7 @@ electron-test-dist: dev $$(DIST)
.PHONY: electron-unpacked .PHONY: electron-unpacked
electron-unpacked: ## Make unpacked electron app electron-unpacked: ## Make unpacked electron app
electron-unpacked: VERSION := $(VERSION)-el electron-unpacked: VERSION := $(VERSION)-el
electron-unpacked: dev $(BUILD_DIR)/$(APP_NAME)-$$(VERSION)-$(TARGET_OS)-$(ARCH)/ electron-unpacked: $(BUILD_DIR)/$(APP_NAME)-$$(VERSION)-$(TARGET_OS)-$(ARCH)/
#.PHONY: electron-inst #.PHONY: electron-inst

View File

@ -2,7 +2,14 @@
ImageGrid.Viewer Makefile... ImageGrid.Viewer Makefile...
To print full list of user make targets use: To print full list of user make targets use:
make help make help
In some cases making things may fail on a clean directory, if this
happens first build the environment and then try again:
make dev
...
make dist
Variables to control the build: Variables to control the build:
@ -38,21 +45,25 @@ NOTE: cross compilation is at this time not supported, if you try it
Examples: Examples:
# check if all dependencies are available... # check if all dependencies are available...
make check make check
# make development environment... # make development environment...
make dev make dev
# full build... # full build...
make clean dist make clean dist
# build in repack mode... # build in repack mode...
BUILD_MODE=repack make dist BUILD_MODE=repack make dist
# build for darwin... (EXPERIMENTAL) # build for darwin... (EXPERIMENTAL)
TARGET_OS=darwin make clean dist TARGET_OS=darwin make clean dist
Help and info:
help: Print make target help and exit
version: Print version and exit
Dependency checking: Dependency checking:
check: Run all dependency checks check: Run all dependency checks
check-web: Run web build dependency checks check-web: Run web build dependency checks
@ -86,9 +97,6 @@ Electron:
electron-unpacked: Make unpacked electron app electron-unpacked: Make unpacked electron app
electron-run: Run app in electron electron-run: Run app in electron
NW:
nw-run: Run app in nw (outdated)
Windows installer: Windows installer:
Deb package: Deb package: