status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: improve Makefile targets nim_status_client and rcc 

Allow for `make` to check the timestamps of files relevant to those targets and
thereby skip one or both targets if nothing's changed.
This commit is contained in:
Michael Bradley, Jr 2021-09-16 16:17:10 -05:00 committed by Iuri Matias
parent f892b59ca1
commit 8baa8c7b73
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile
View File

@ -226,13 +226,28 @@ fleets-remove:
fleets-update: fleets-remove $(FLEETS)
rcc:
UI_RESOURCES := resources.rcc
# This `UI_SOURCES` file set is small enough that the rcc target completes very
# quickly if no files in the set have changed. However, if there's a change to
# a file not in the set (e.g. a PNG file) then it will be necessary to delete
# resources.rcc (or touch a .qml file, etc.) in order to trigger a fresh build
# of resources.rcc.
ifeq ($(detected_OS),Darwin)
UI_SOURCES := $(shell find -E ui -type f -iregex '.*(qmldir|qml|qrc)$$' -not -iname 'resources.qrc')
else
UI_SOURCES := $(shell find ui -type f -regextype egrep -iregex '.*(qmldir|qml|qrc)$$' -not -iname 'resources.qrc')
endif
$(UI_RESOURCES): $(UI_SOURCES)
echo -e $(BUILD_MSG) "resources.rcc"
rm -f ./resources.rcc
rm -f ./ui/resources.qrc
go run ui/generate-rcc.go -source=ui -output=ui/resources.qrc
rcc -binary $(RCC_PARAMS) ui/resources.qrc -o ./resources.rcc
rcc: $(UI_RESOURCES)
# default token is a free-tier token with limited capabilities and usage
# limits; our docs should include directions for community contributor to setup
# their own Infura account and token instead of relying on this default token
@ -249,8 +264,15 @@ NIM_PARAMS += -d:chronicles_sinks=textlines[stdout],textlines[nocolors,dynamic],
RESOURCES_LAYOUT := -d:development
nim_status_client: NIM_PARAMS += $(RESOURCES_LAYOUT)
nim_status_client: | $(DOTHERSIDE) $(STATUSGO) $(QRCODEGEN) $(FLEETS) rcc deps
NIM_SOURCES := $(shell find src -type f)
ifeq ($(detected_OS),Windows)
NIM_STATUS_CLIENT := bin/nim_status_client.exe
else
NIM_STATUS_CLIENT := bin/nim_status_client
endif
$(NIM_STATUS_CLIENT): NIM_PARAMS += $(RESOURCES_LAYOUT)
$(NIM_STATUS_CLIENT): $(NIM_SOURCES) | $(DOTHERSIDE) $(STATUSGO) $(QRCODEGEN) $(FLEETS) rcc deps
echo -e $(BUILD_MSG) "$@" && \
$(ENV_SCRIPT) nim c $(NIM_PARAMS) --passL:"-L$(STATUSGO_LIBDIR)" --passL:"-lstatus" $(NIM_EXTRA_PARAMS) --passL:"$(QRCODEGEN)" --passL:"-lm" src/nim_status_client.nim && \
[[ $$? = 0 ]] && \
@ -260,6 +282,8 @@ nim_status_client: | $(DOTHERSIDE) $(STATUSGO) $(QRCODEGEN) $(FLEETS) rcc deps
@rpath/libstatus.dylib \
bin/nim_status_client) || true)
nim_status_client: $(NIM_STATUS_CLIENT)
_APPIMAGE_TOOL := appimagetool-x86_64.AppImage
APPIMAGE_TOOL := tmp/linux/tools/$(_APPIMAGE_TOOL)
@ -464,7 +488,7 @@ clean: | clean-common
rm -rf bin/* node_modules bottles/* pkg/* tmp/* $(STATUSGO)
+ $(MAKE) -C vendor/DOtherSide/build --no-print-directory clean
run: rcc $(RUN_TARGET)
run: nim_status_client $(RUN_TARGET)
ICON_TOOL := node_modules/.bin/fileicon