more work on the makefile...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-01-30 03:44:48 +03:00
parent 27289405fe
commit 51b3f4eba3

View File

@ -335,9 +335,14 @@ clean:
$(RM) $(BUILD_DIR) $(RM) $(BUILD_DIR)
.PHONY: clean-dist
clean-dist:
$(RM) $(DIST_DIR)
.PHONY: clean-all .PHONY: clean-all
clean-all: clean clean-all: clean clean-dist
$(RM) $(DIST_DIR) $(TARGET_DIR) $(NODE_DIR) $(RM) $(TARGET_DIR) $(NODE_DIR)
@ -383,9 +388,23 @@ electron-run: dev
#------------------------------------------------------- NW targets --- #------------------------------------------------------- NW targets ---
# XXX this clashes with the electron build as the recepies do not take the
# host framework into account...
#.PHONY: nw-dist
#nw-dist: VERSION := $(VERSION)-nw
#nw-dist: DIST := $(DIST_DIR)/$(APP_NAME)-$(VERSION)-$(TARGET_OS)-$(ARCH).zip
#nw-dist: $$(DIST)
# XXX # XXX
# XXX needs a different package.json or a way to share it with electron...
.PHONY: nw-run
nw-run: dev
nw .
#------------------------------------------------------ deb targets --- #------------------------------------------------------ deb targets ---
@ -550,6 +569,7 @@ $(BUILD_DIR)/app.asar: $(PACK_FULL)
# build the app dir (electron-specific)... # build the app dir (electron-specific)...
# NOTE: the "/" here is significant -- it prevents conflicts with other # NOTE: the "/" here is significant -- it prevents conflicts with other
# rules... # rules...
# XXX need to take nw/el version part into account...
# XXX need to setup app icons... # XXX need to setup app icons...
.PRECIOUS: $(BUILD_DIR)/$(APP_NAME)-%/ .PRECIOUS: $(BUILD_DIR)/$(APP_NAME)-%/
$(BUILD_DIR)/$(APP_NAME)-%/: $(TARGET_DIR)/$(ELECTRON_DIST) \ $(BUILD_DIR)/$(APP_NAME)-%/: $(TARGET_DIR)/$(ELECTRON_DIST) \
@ -569,6 +589,7 @@ $(BUILD_DIR)/$(APP_NAME)-%/: $(TARGET_DIR)/$(ELECTRON_DIST) \
# modify the archive in place (electron-specific)... # modify the archive in place (electron-specific)...
# XXX need to take nw/el version part into account...
# XXX need to setup app icons... # XXX need to setup app icons...
$(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/$(ELECTRON_DIST) \ $(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/$(ELECTRON_DIST) \
$(BUILD_DIR)/app.asar $(BUILD_INFO) $(BUILD_DIR)/app.asar $(BUILD_INFO)
@ -591,12 +612,14 @@ $(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/$(ELECTRON_DIST) \
# package the app dir (unpack - update - repack)... # package the app dir (unpack - update - repack)...
# XXX need to take nw/el version part into account (???)
$(BUILD_DIR)/$(APP_NAME)-%.repack.zip: $(BUILD_DIR)/$(APP_NAME)-%/ $(BUILD_DIR)/$(APP_NAME)-%.repack.zip: $(BUILD_DIR)/$(APP_NAME)-%/
$(MD) "$(@D)" $(MD) "$(@D)"
$(call zipFrom,$<,$@,*) $(call zipFrom,$<,$@,*)
# collect the built package to $(DIST_DIR) # collect the built package to $(DIST_DIR)
# XXX need to take nw/el version part into account (???)
$(DIST_DIR)/$(APP_NAME)-%.zip: $(BUILD_DIR)/$(APP_NAME)-%.$(BUILD_MODE).zip $(DIST_DIR)/$(APP_NAME)-%.zip: $(BUILD_DIR)/$(APP_NAME)-%.$(BUILD_MODE).zip
$(MD) "$(@D)" $(MD) "$(@D)"
cp "$<" "$@" cp "$<" "$@"