Update erlang.mk
This commit is contained in:
		
							parent
							
								
									97e551919e
								
							
						
					
					
						commit
						41b2cc1c5a
					
				|  | @ -16,7 +16,7 @@ | |||
| 
 | ||||
| ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST))) | ||||
| 
 | ||||
| ERLANG_MK_VERSION = 2.0.0-pre.2-16-ga6d6bfe-dirty | ||||
| ERLANG_MK_VERSION = 2.0.0-pre.2-16-gb52203c-dirty | ||||
| 
 | ||||
| # Core configuration.
 | ||||
| 
 | ||||
|  | @ -4656,6 +4656,67 @@ $(foreach p,$(DEP_PLUGINS),\ | |||
| 		$(call core_dep_plugin,$p,$(firstword $(subst /, ,$p))),\
 | ||||
| 		$(call core_dep_plugin,$p/plugins.mk,$p)))) | ||||
| 
 | ||||
| # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
 | ||||
| # This file is part of erlang.mk and subject to the terms of the ISC License.
 | ||||
| 
 | ||||
| # Configuration.
 | ||||
| 
 | ||||
| DTL_FULL_PATH ?= | ||||
| DTL_PATH ?= templates/ | ||||
| DTL_SUFFIX ?= _dtl | ||||
| 
 | ||||
| # Verbosity.
 | ||||
| 
 | ||||
| dtl_verbose_0 = @echo " DTL   " $(filter %.dtl,$(?F)); | ||||
| dtl_verbose = $(dtl_verbose_$(V)) | ||||
| 
 | ||||
| # Core targets.
 | ||||
| 
 | ||||
| define erlydtl_compile.erl | ||||
| 	[begin | ||||
| 		Module0 = case "$(strip $(DTL_FULL_PATH))" of | ||||
| 			"" -> | ||||
| 				filename:basename(F, ".dtl"); | ||||
| 			_ -> | ||||
| 				"$(DTL_PATH)" ++ F2 = filename:rootname(F, ".dtl"), | ||||
| 				re:replace(F2, "/",  "_",  [{return, list}, global]) | ||||
| 		end, | ||||
| 		Module = list_to_atom(string:to_lower(Module0) ++ "$(DTL_SUFFIX)"), | ||||
| 		case erlydtl:compile(F, Module, [{out_dir, "ebin/"}, return_errors, {doc_root, "templates"}]) of | ||||
| 			ok -> ok; | ||||
| 			{ok, _} -> ok | ||||
| 		end | ||||
| 	end || F <- string:tokens("$(1)", " ")], | ||||
| 	halt(). | ||||
| endef | ||||
| 
 | ||||
| ifneq ($(wildcard src/),) | ||||
| 
 | ||||
| DTL_FILES = $(sort $(call core_find,$(DTL_PATH),*.dtl)) | ||||
| 
 | ||||
| ifdef DTL_FULL_PATH | ||||
| BEAM_FILES += $(addprefix ebin/,$(patsubst %.dtl,%_dtl.beam,$(subst /,_,$(DTL_FILES:$(DTL_PATH)%=%)))) | ||||
| else | ||||
| BEAM_FILES += $(addprefix ebin/,$(patsubst %.dtl,%_dtl.beam,$(notdir $(DTL_FILES)))) | ||||
| endif | ||||
| 
 | ||||
| ifneq ($(words $(DTL_FILES)),0) | ||||
| # Rebuild everything when the Makefile changes.
 | ||||
| $(ERLANG_MK_TMP)/last-makefile-change-erlydtl: $(MAKEFILE_LIST) | ||||
| 	@mkdir -p $(ERLANG_MK_TMP) | ||||
| 	@if test -f $@; then \
 | ||||
| 		touch $(DTL_FILES); \
 | ||||
| 	fi | ||||
| 	@touch $@ | ||||
| 
 | ||||
| ebin/$(PROJECT).app:: $(ERLANG_MK_TMP)/last-makefile-change-erlydtl | ||||
| endif | ||||
| 
 | ||||
| ebin/$(PROJECT).app:: $(DTL_FILES) | ||||
| 	$(if $(strip $?),\
 | ||||
| 		$(dtl_verbose) $(call erlang,$(call erlydtl_compile.erl,$?,-pa ebin/ $(DEPS_DIR)/erlydtl/ebin/))) | ||||
| endif | ||||
| 
 | ||||
| # Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
 | ||||
| # This file is part of erlang.mk and subject to the terms of the ISC License.
 | ||||
| 
 | ||||
|  | @ -5988,67 +6049,6 @@ elvis: $(ELVIS) $(ELVIS_CONFIG) | |||
| distclean-elvis: | ||||
| 	$(gen_verbose) rm -rf $(ELVIS) | ||||
| 
 | ||||
| # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
 | ||||
| # This file is part of erlang.mk and subject to the terms of the ISC License.
 | ||||
| 
 | ||||
| # Configuration.
 | ||||
| 
 | ||||
| DTL_FULL_PATH ?= | ||||
| DTL_PATH ?= templates/ | ||||
| DTL_SUFFIX ?= _dtl | ||||
| 
 | ||||
| # Verbosity.
 | ||||
| 
 | ||||
| dtl_verbose_0 = @echo " DTL   " $(filter %.dtl,$(?F)); | ||||
| dtl_verbose = $(dtl_verbose_$(V)) | ||||
| 
 | ||||
| # Core targets.
 | ||||
| 
 | ||||
| define erlydtl_compile.erl | ||||
| 	[begin | ||||
| 		Module0 = case "$(strip $(DTL_FULL_PATH))" of | ||||
| 			"" -> | ||||
| 				filename:basename(F, ".dtl"); | ||||
| 			_ -> | ||||
| 				"$(DTL_PATH)" ++ F2 = filename:rootname(F, ".dtl"), | ||||
| 				re:replace(F2, "/",  "_",  [{return, list}, global]) | ||||
| 		end, | ||||
| 		Module = list_to_atom(string:to_lower(Module0) ++ "$(DTL_SUFFIX)"), | ||||
| 		case erlydtl:compile(F, Module, [{out_dir, "ebin/"}, return_errors, {doc_root, "templates"}]) of | ||||
| 			ok -> ok; | ||||
| 			{ok, _} -> ok | ||||
| 		end | ||||
| 	end || F <- string:tokens("$(1)", " ")], | ||||
| 	halt(). | ||||
| endef | ||||
| 
 | ||||
| ifneq ($(wildcard src/),) | ||||
| 
 | ||||
| DTL_FILES = $(sort $(call core_find,$(DTL_PATH),*.dtl)) | ||||
| 
 | ||||
| ifdef DTL_FULL_PATH | ||||
| BEAM_FILES += $(addprefix ebin/,$(patsubst %.dtl,%_dtl.beam,$(subst /,_,$(DTL_FILES:$(DTL_PATH)%=%)))) | ||||
| else | ||||
| BEAM_FILES += $(addprefix ebin/,$(patsubst %.dtl,%_dtl.beam,$(notdir $(DTL_FILES)))) | ||||
| endif | ||||
| 
 | ||||
| ifneq ($(words $(DTL_FILES)),0) | ||||
| # Rebuild everything when the Makefile changes.
 | ||||
| $(ERLANG_MK_TMP)/last-makefile-change-erlydtl: $(MAKEFILE_LIST) | ||||
| 	@mkdir -p $(ERLANG_MK_TMP) | ||||
| 	@if test -f $@; then \
 | ||||
| 		touch $(DTL_FILES); \
 | ||||
| 	fi | ||||
| 	@touch $@ | ||||
| 
 | ||||
| ebin/$(PROJECT).app:: $(ERLANG_MK_TMP)/last-makefile-change-erlydtl | ||||
| endif | ||||
| 
 | ||||
| ebin/$(PROJECT).app:: $(DTL_FILES) | ||||
| 	$(if $(strip $?),\
 | ||||
| 		$(dtl_verbose) $(call erlang,$(call erlydtl_compile.erl,$?,-pa ebin/ $(DEPS_DIR)/erlydtl/ebin/))) | ||||
| endif | ||||
| 
 | ||||
| # Copyright (c) 2014 Dave Cottlehuber <dch@skunkwerks.at>
 | ||||
| # This file is part of erlang.mk and subject to the terms of the ISC License.
 | ||||
| 
 | ||||
|  | @ -6491,7 +6491,7 @@ $(ERLANG_MK_RECURSIVE_SHELL_DEPS_LIST): | |||
| 	$(verbose) :> $@ | ||||
| else | ||||
| LIST_DIRS = $(ALL_DEPS_DIRS) | ||||
| LIST_DEPS = $(DEPS) | ||||
| LIST_DEPS = $(BUILD_DEPS) $(DEPS) | ||||
| 
 | ||||
| $(ERLANG_MK_RECURSIVE_DEPS_LIST): fetch-deps | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue