Archives/falk-werner_webfuse-provider
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse-provider synced 2024-10-27 20:44:10 +00:00
Code Issues Releases Wiki Activity

fixes docker output directory

Browse Source
This commit is contained in:
nosamad 2019-03-03 14:15:26 +01:00
parent 6218de5ae9
commit 4fc51d3382
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -89,8 +89,8 @@ $(OUT)/docker/%: $(PROJECT_ROOT)/docker/%.dockerfile $(PROJECT_RESOURCES) | $(OU
$(OUT)/%/CMakeCache.txt: $(PROJECT_ROOT)/CMakeLists.txt $(OUT)/docker/% | $(OUT_DIRS) $(OUT)/%/CMakeCache.txt: $(PROJECT_ROOT)/CMakeLists.txt $(OUT)/docker/% | $(OUT_DIRS)
$(SILENT)$(DOCKER) run $(DOCKER_RUNFLAGS) \ $(SILENT)$(DOCKER) run $(DOCKER_RUNFLAGS) \
--volume '$(realpath $(PROJECT_ROOT)):/tmp' \ --volume '$(realpath $(PROJECT_ROOT)):/tmp' \
--volume '$(realpath $(dir $@)):/tmp/out' \ --volume '$(realpath $(dir $@)):/tmp/$(notdir $(OUT))' \
--workdir /tmp/out \ --workdir '/tmp/$(notdir $(OUT))' \
$*:$(VERSION) \ $*:$(VERSION) \
cmake -GNinja $(CMAKEFLAGS) .. && touch $@ cmake -GNinja $(CMAKEFLAGS) .. && touch $@
@ -102,8 +102,8 @@ check-%: compile-%;
compile-%: $(OUT)/%/CMakeCache.txt compile-%: $(OUT)/%/CMakeCache.txt
$(SILENT)$(DOCKER) run $(DOCKER_RUNFLAGS) \ $(SILENT)$(DOCKER) run $(DOCKER_RUNFLAGS) \
--volume '$(realpath $(PROJECT_ROOT)):/tmp' \ --volume '$(realpath $(PROJECT_ROOT)):/tmp' \
--volume '$(realpath $(dir $^)):/tmp/out' \ --volume '$(realpath $(dir $<)):/tmp/$(notdir $(OUT))' \
--workdir /tmp/out \ --workdir '/tmp/$(notdir $(OUT))' \
$*:$(VERSION) \ $*:$(VERSION) \
ninja -j$(NPROC) $(GLOAS) ninja -j$(NPROC) $(GLOAS)