diff options
| author | Loïc Hoguin <[email protected]> | 2018-12-04 15:26:03 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-12-04 15:27:38 +0100 |
| commit | 671052aaa9e83ff959b5782387223f7439be41d4 (patch) | |
| tree | bac2b515aa928ed2b7f64e4aad491c7b5f2deee3 | |
| parent | c63d7be6f71a97f02ba62f78fec55afe8754fd8a (diff) | |
| download | erlang.mk-671052aaa9e83ff959b5782387223f7439be41d4.tar.gz erlang.mk-671052aaa9e83ff959b5782387223f7439be41d4.tar.bz2 erlang.mk-671052aaa9e83ff959b5782387223f7439be41d4.zip | |
Delete $(ERLANG_MK_TMP) directory after 'make erlang-mk'
This allows refreshing tools at the same time Erlang.mk
gets updated.
| -rw-r--r-- | core/core.mk | 1 | ||||
| -rw-r--r-- | test/core_upgrade.mk | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/core/core.mk b/core/core.mk index 85bf65f..a3e68e5 100644 --- a/core/core.mk +++ b/core/core.mk @@ -209,6 +209,7 @@ endif $(gen_verbose) $(MAKE) --no-print-directory -C $(ERLANG_MK_BUILD_DIR) WITHOUT='$(strip $(WITHOUT))' UPGRADE=1 $(verbose) cp $(ERLANG_MK_BUILD_DIR)/erlang.mk ./erlang.mk $(verbose) rm -rf $(ERLANG_MK_BUILD_DIR) + $(verbose) rm -rf $(ERLANG_MK_TMP) # The erlang.mk package index is bundled in the default erlang.mk build. # Search for the string "copyright" to skip to the rest of the code. diff --git a/test/core_upgrade.mk b/test/core_upgrade.mk index 9567518..2f729e8 100644 --- a/test/core_upgrade.mk +++ b/test/core_upgrade.mk @@ -127,6 +127,25 @@ core-upgrade-custom-repo: build clean $i "Check our modification is there" $t grep -q "# Copyright (c) erlang.mk Testsuite!" $(APP)/erlang.mk +core-upgrade-delete-tmp-dir: build clean + + $i "Bootstrap a new OTP library named $(APP)" + $t mkdir $(APP)/ + $t cp ../erlang.mk $(APP)/ + $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v + + $i "Build the application" + $t $(MAKE) -C $(APP) $v + + $i "Check that the .erlang.mk directory exists" + $t test -e $(APP)/.erlang.mk/ + + $i "Upgrade Erlang.mk" + $t $(MAKE) -C $(APP) erlang-mk $v + + $i "Check that the .erlang.mk directory was removed" + $t ! test -e $(APP)/.erlang.mk/ + core-upgrade-no-config: build clean $i "Bootstrap a new OTP library named $(APP)" |