More cleanup

Author: lhoguin

Makefile

@@ -45,10 +45,6 @@ XREF_IGNORE = [ \
 xref: ERL_LIBS := $(ERL_LIBS):$(CURDIR)/apps:$(CURDIR)/deps:$(dir $(shell elixir --eval ':io.format "~s~n", [:code.lib_dir :elixir ]'))
 endif
 
-ifneq ($(wildcard deps/.hex/cache.erl),)
-deps:: restore-hex-cache-ets-file
-endif
-
 include rabbitmq-components.mk
 
 # Set PROJECT_VERSION, calculated in rabbitmq-components.mk,
@@ -81,54 +77,6 @@ ifdef PLUGINS
 RABBITMQ_ENABLED_PLUGINS ?= $(call comma_list,$(PLUGINS))
 endif
 
-# --------------------------------------------------------------------
-# Mix Hex cache management.
-# --------------------------------------------------------------------
-
-# We restore the initial Hex cache.ets file from an Erlang term created
-# at the time the source archive was prepared.
-#
-# See the `$(SOURCE_DIST)` recipe for the reason behind this step.
-
-restore-hex-cache-ets-file: deps/.hex/cache.ets
-
-deps/.hex/cache.ets: deps/.hex/cache.erl
-	$(gen_verbose) $(call erlang,$(call restore_hex_cache_from_erl_term,$<,$@))
-
-define restore_hex_cache_from_erl_term
-  In = "$(1)",
-  Out = "$(2)",
-  {ok, [Props, Entries]} = file:consult(In),
-  Name = proplists:get_value(name, Props),
-  Type = proplists:get_value(type, Props),
-  Access = proplists:get_value(protection, Props),
-  NamedTable = proplists:get_bool(named_table, Props),
-  Keypos = proplists:get_value(keypos, Props),
-  Heir = proplists:get_value(heir, Props),
-  ReadConc = proplists:get_bool(read_concurrency, Props),
-  WriteConc = proplists:get_bool(write_concurrency, Props),
-  Compressed = proplists:get_bool(compressed, Props),
-  Options0 = [
-    Type,
-    Access,
-    {keypos, Keypos},
-    {heir, Heir},
-    {read_concurrency, ReadConc},
-    {write_concurrency, WriteConc}],
-  Options1 = case NamedTable of
-    true  -> [named_table | Options0];
-    false -> Options0
-  end,
-  Options2 = case Compressed of
-    true  -> [compressed | Options0];
-    false -> Options0
-  end,
-  Tab = ets:new(Name, Options2),
-  [true = ets:insert(Tab, Entry) || Entry <- Entries],
-  ok = ets:tab2file(Tab, Out),
-  init:stop().
-endef
-
 # --------------------------------------------------------------------
 # Distribution.
 # --------------------------------------------------------------------
@@ -250,14 +198,6 @@ $(SOURCE_DIST): $(ERLANG_MK_RECURSIVE_DEPS_LIST)
 		sed -E -i.bak "s|^[[:blank:]]*include[[:blank:]]+\.\./.*erlang.mk$$|include ../../erlang.mk|" \
 		 $@/deps/$$(basename $$dep)/Makefile && \
 		rm $@/deps/$$(basename $$dep)/Makefile.bak; \
-		mix_exs=$@/deps/$$(basename $$dep)/mix.exs; \
-		if test -f $$mix_exs; then \
-			(cd $$(dirname "$$mix_exs") && \
-			 (test -d $@/deps/.hex || env DEPS_DIR=$@/deps MIX_HOME=$@/deps/.mix HEX_HOME=$@/deps/.hex MIX_ENV=prod FILL_HEX_CACHE=yes mix local.hex --force) && \
-			 env DEPS_DIR=$@/deps MIX_HOME=$@/deps/.mix HEX_HOME=$@/deps/.hex MIX_ENV=prod FILL_HEX_CACHE=yes mix deps.get --only prod && \
-			 cp $(CURDIR)/mk/rabbitmq-mix.mk . && \
-			 rm -rf _build deps); \
-		fi; \
 		if test -f "$$dep/license_info"; then \
 			cp "$$dep/license_info" "$@/deps/licensing/license_info_$$(basename "$$dep")"; \
 			cat "$$dep/license_info" >> $@/LICENSE; \
@@ -283,52 +223,10 @@ $(SOURCE_DIST): $(ERLANG_MK_RECURSIVE_DEPS_LIST)
 	$(verbose) echo "PLUGINS := $(PLUGINS)" > $@/plugins.mk
 # Remember the latest Git timestamp.
 	$(verbose) sort -r < "[email protected]" | head -n 1 > "[email protected]"
-# Mix Hex component requires a cache file, otherwise it refuses to build
-# offline... That cache is an ETS table with all the applications we
-# depend on, plus some versioning informations and checksums. There
-# are two problems with that: the table contains a date (`last_update`
-# field) and `ets:tab2file()` produces a different file each time it's
-# called.
-#
-# To make our source archive reproducible, we fix the time of the
-# `last_update` field to the last Git commit and dump the content of the
-# table as an Erlang term to a text file.
-#
-# The ETS file must be recreated before compiling RabbitMQ. See the
-# `restore-hex-cache-ets-file` Make target.
-	$(verbose) $(call erlang,$(call dump_hex_cache_to_erl_term,$(call core_native_path,$@),$(call core_native_path,[email protected])))
 # Fix file timestamps to have reproducible source archives.
 	$(verbose) find $@ -print0 | xargs -0 touch -t "$$(cat "[email protected]")"
 	$(verbose) rm "[email protected]" "[email protected]"
 
-define dump_hex_cache_to_erl_term
-  In = "$(1)/deps/.hex/cache.ets",
-  Out = "$(1)/deps/.hex/cache.erl",
-  {ok, DateStr} = file:read_file("$(2)"),
-  {match, Date} = re:run(DateStr,
-    "^([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})\.([0-9]{2})",
-    [{capture, all_but_first, list}]),
-  [Year, Month, Day, Hour, Min, Sec] = [erlang:list_to_integer(V) || V <- Date],
-  {ok, Tab} = ets:file2tab(In),
-  true = ets:insert(Tab, {last_update, {{Year, Month, Day}, {Hour, Min, Sec}}}),
-  Props = [
-    Prop
-    || {Key, _} = Prop <- ets:info(Tab),
-    Key =:= name orelse
-    Key =:= type orelse
-    Key =:= protection orelse
-    Key =:= named_table orelse
-    Key =:= keypos orelse
-    Key =:= heir orelse
-    Key =:= read_concurrency orelse
-    Key =:= write_concurrency orelse
-    Key =:= compressed],
-  Entries = ets:tab2list(Tab),
-  ok = file:write_file(Out, io_lib:format("~w.~n~w.~n", [Props, Entries])),
-  ok = file:delete(In),
-  init:stop().
-endef
-
 $(SOURCE_DIST).manifest: $(SOURCE_DIST)
 	$(gen_verbose) cd $(dir $(SOURCE_DIST)) && \
 		find $(notdir $(SOURCE_DIST)) | LC_COLLATE=C sort > $@

deps/rabbit_common/mk/rabbitmq-dist.mk

@@ -3,7 +3,6 @@
 DIST_DIR ?= $(CURDIR)/plugins
 CLI_SCRIPTS_DIR ?= $(CURDIR)/sbin
 CLI_ESCRIPTS_DIR ?= $(CURDIR)/escript
-MIX = echo y | mix
 
 # Set $(DIST_AS_EZS) to a non-empty value to enable the packaging of
 # plugins as .ez archives.
@@ -81,17 +80,13 @@ endef
 
 # Real entry point: it tests the existence of an .app file to determine
 # if it is an Erlang application (and therefore if it should be provided
-# as an .ez plugin archive) and calls do_ez_target_erlangmk. If instead
-# it finds a Mix configuration file, it is skipped, as the only elixir
-# applications in the directory are used by rabbitmq_cli and compiled
-# with it.
+# as an .ez plugin archive) and calls do_ez_target_erlangmk.
 #
 #   $(call ez_target,path_to_app)
 
 define ez_target
 dist_$(1)_appdir  = $(2)
 dist_$(1)_appfile = $$(dist_$(1)_appdir)/ebin/$(1).app
-dist_$(1)_mixfile = $$(dist_$(1)_appdir)/mix.exs
 
 $$(if $$(shell test -f $$(dist_$(1)_appfile) && echo OK), \
   $$(eval $$(call do_ez_target_erlangmk,$(1),$$(call get_app_version,$$(dist_$(1)_appfile)),$$(dist_$(1)_appdir))))
@@ -117,9 +112,8 @@ endif
 endif
 
 # The actual recipe to create the .ez plugin archive. Some variables
-# are defined in the do_ez_target_erlangmk and do_ez_target_mix macros
-# above. All .ez archives are also listed in this do_ez_target_erlangmk
-# and do_ez_target_mix macros.
+# are defined in the do_ez_target_erlangmk macro
+# above. All .ez archives are also listed in this macro.
 
 RSYNC ?= rsync
 RSYNC_V_0 =
@@ -200,7 +194,7 @@ test-dist:: $(ERLANG_MK_RECURSIVE_TEST_DEPS_LIST) test-build
 		$(MAYBE_APPS_LIST)"; \
 	fi
 
-DIST_EZS = $(ERLANGMK_DIST_EZS) $(MIX_DIST_EZS)
+DIST_EZS = $(ERLANGMK_DIST_EZS)
 
 do-dist:: $(DIST_EZS)
 	$(verbose) unwanted='$(filter-out $(DIST_EZS) $(EXTRA_DIST_EZS), \

mk/rabbitmq-mix.mk

@@ -44,11 +44,8 @@ dist:
 # Umbrella. Those manpages are copied to www.rabbitmq.com
 #
 # We explicitely set $HOME as a Make variable below because some package
-# builders do that, as part of cleaning the build environment. It
-# exercises our hack to convince mix(1) to work offline because that
-# hack depends on `$HOME`. A Make variable on the command line takes
-# precedence over variables declared in Makefiles, so our hack needs
-# to consider this. We do the same with the Freedesktop.org-specified
+# builders do that, as part of cleaning the build environment.
+# We do the same with the Freedesktop.org-specified
 # variables ($XDG_*_HOME).
 	$(MAKE) -C $(SOURCE_DIR) \
 		HOME="$(HOME)" \