diff options
| author | Loïc Hoguin <[email protected]> | 2019-06-24 19:37:27 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2019-06-24 19:37:27 +0200 |
| commit | c26ffe195abd7f5777f0cc8cd2693768f64aeeb5 (patch) | |
| tree | 4f1e0395930e3e6f25fc01c1ca2d8a2cae8ea4e7 | |
| parent | 84df4e23878e15b7e3c76e97491f5a1f7b09a95f (diff) | |
| download | erlang.mk-c26ffe195abd7f5777f0cc8cd2693768f64aeeb5.tar.gz erlang.mk-c26ffe195abd7f5777f0cc8cd2693768f64aeeb5.tar.bz2 erlang.mk-c26ffe195abd7f5777f0cc8cd2693768f64aeeb5.zip | |
Rename force_rebuilding_dep to force_rebuild_dep
| -rw-r--r-- | core/deps.mk | 2 | ||||
| -rw-r--r-- | test/core_deps.mk | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/deps.mk b/core/deps.mk index 2ecb0d2..4146cc0 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -130,7 +130,7 @@ ifneq ($(ALL_DEPS_DIRS),) :; \ else \ echo $$dep >> $(ERLANG_MK_TMP)/deps.log; \ - if [ -z "$(strip $(FULL))" ] $(if $(force_rebuilding_dep),&& ! ($(call force_rebuilding_dep,$$dep)),) && [ ! -L $$dep ] && [ -f $$dep/ebin/dep_built ]; then \ + if [ -z "$(strip $(FULL))" ] $(if $(force_rebuild_dep),&& ! ($(call force_rebuild_dep,$$dep)),) && [ ! -L $$dep ] && [ -f $$dep/ebin/dep_built ]; then \ :; \ elif [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ]; then \ $(MAKE) -C $$dep IS_DEP=1; \ diff --git a/test/core_deps.mk b/test/core_deps.mk index 38b369f..dcb84b6 100644 --- a/test/core_deps.mk +++ b/test/core_deps.mk @@ -191,21 +191,21 @@ core-deps-dep-built-force-full: init $t $(SLEEP) $t touch $(APP)/deps/cowlib/src/cow_http.erl - $i "Check that cowlib is not rebuilt if \`force_rebuilding_dep\` returns false" + $i "Check that cowlib is not rebuilt if \`force_rebuild_dep\` returns false" $t touch $(APP)/EXPECT $t $(SLEEP) - $t $(MAKE) -C $(APP) force_rebuilding_dep='test $$(1) != $(CURDIR)/$(APP)/deps/cowlib' $v + $t $(MAKE) -C $(APP) force_rebuild_dep='test $$(1) != $(CURDIR)/$(APP)/deps/cowlib' $v $t find $(APP)/deps/cowlib -type f -newer $(APP)/EXPECT | sort | diff $(APP)/EXPECT - $t rm $(APP)/EXPECT - $i "Check that cowlib is rebuilt if \`force_rebuilding_dep\` returns true" + $i "Check that cowlib is rebuilt if \`force_rebuild_dep\` returns true" $t printf "%s\n" \ $(APP)/deps/cowlib/cowlib.d \ $(APP)/deps/cowlib/ebin/cowlib.app \ $(APP)/deps/cowlib/ebin/cow_http.beam \ $(APP)/deps/cowlib/ebin/dep_built | sort > $(APP)/EXPECT $t $(SLEEP) - $t $(MAKE) -C $(APP) force_rebuilding_dep='test $$(1) = $(CURDIR)/$(APP)/deps/cowlib' $v + $t $(MAKE) -C $(APP) force_rebuild_dep='test $$(1) = $(CURDIR)/$(APP)/deps/cowlib' $v # Files in .git might end up modified due to the id generation in the .app file. $t find $(APP)/deps/cowlib -type f -newer $(APP)/EXPECT | grep -v ".git" | sort | diff $(APP)/EXPECT - $t rm $(APP)/EXPECT @@ -1015,8 +1015,8 @@ core-deps-dep-makefile-change: init $t $(MAKE) -C $(APP)/my_dep/ -f erlang.mk bootstrap-lib $v $i "Add my_dep to the list of dependencies" -# We use force_rebuilding_dep to ensure it gets rebuilt even on Windows. - $t perl -ni.bak -e "print;if ($$.==1) {print \"DEPS = my_dep\ndep_my_dep = ln $(CURDIR)/$(APP)/my_dep/\nforce_rebuilding_dep = test \";print '\$$1';print \" = $(CURDIR)/$(APP)/deps/my_dep\n\"}" $(APP)/Makefile +# We use force_rebuild_dep to ensure it gets rebuilt even on Windows. + $t perl -ni.bak -e "print;if ($$.==1) {print \"DEPS = my_dep\ndep_my_dep = ln $(CURDIR)/$(APP)/my_dep/\nforce_rebuild_dep = test \";print '\$$1';print \" = $(CURDIR)/$(APP)/deps/my_dep\n\"}" $(APP)/Makefile ifdef LEGACY $i "Add my_dep to the applications key in the .app.src file" |