@@ -16,7 +16,7 @@ url?=https://github.com/SiliconLabsSoftware/z-wave-protocol-controller
16
16
# https://gitlab.kitware.com/cmake/cmake/-/issues/22813#note_1620373
17
17
project_test_dir? =applications
18
18
project_docs_api_target? =zpc_doxygen
19
- version? =$(shell git describe --tags || echo "0")
19
+ version? =$(shell git describe --tags --always 2> /dev/null || echo "0")
20
20
21
21
# Allow overloading from env if needed
22
22
# VERBOSE?=1
@@ -92,14 +92,15 @@ cmake_options+=-DCARGO_TARGET_TRIPLE="${CARGO_TARGET_TRIPLE}"
92
92
export CMAKE_TARGET_TRIPLE
93
93
endif
94
94
95
+ run_file? =${build_dir}/applications/zpc/zpc
95
96
96
97
help : ./helper.mk
97
98
@echo " # ${project} : ${url} "
98
99
@echo " #"
99
100
@echo " # Usage:"
100
101
@echo " # ${<D} /${<F} setup # To setup developer system (once)"
101
102
@echo " # ${<D} /${<F} VERBOSE=1 # Default build tasks verbosely (depends on setup)"
102
- @echo " # ${<D} /${<F} # For more info"
103
+ @echo " # ${<D} /${<F} help/all # For more info"
103
104
@echo " #"
104
105
105
106
help/all : README.md NEWS.md
@@ -226,14 +227,17 @@ ${build_dir}/CMakeCache.txt: CMakeLists.txt
226
227
cmake ${cmake_options}
227
228
228
229
all : ${build_dir}/CMakeCache.txt
229
- cmake --build ${<D} \
230
- || cat ${build_dir} /CMakeFiles/CMakeOutput.log
230
+ # cmake --build ${<D} \
231
+ # || cat ${build_dir}/CMakeFiles/CMakeOutput.log
231
232
cmake --build ${<D}
232
233
.PHONY : all
233
234
234
235
${build_dir}/% : all
235
236
file -E " $@ "
236
237
238
+ ${build_dir} : ${build_dir}/CMakeCache.txt
239
+ file -E " $<"
240
+
237
241
test : ${build_dir}
238
242
ctest --test-dir ${<} /${project_test_dir}
239
243
@@ -260,6 +264,10 @@ prepare: git/prepare
260
264
all/default : configure prepare all test dist
261
265
@date -u
262
266
267
+ run_args? =--help
268
+ run :
269
+ file -E ${run_file}
270
+ ${run_file} ${run_args}
263
271
264
272
# ## @rootfs is faster than docker for env check
265
273
@@ -312,7 +320,7 @@ docker_url?=${url}.git\#${docker_branch}
312
320
docker/% : Dockerfile
313
321
time docker run " ${project} :latest" -C " ${docker_workdir} " " ${@ F} "
314
322
315
- test/docker : distclean prepare/docker docker/help docker/test
323
+ test/docker : distclean prepare/docker docker/help docker/test docker/run
316
324
@echo " # ${project} : log: $@ : done: $^"
317
325
318
326
test/docker/build :
0 commit comments