diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:41:17 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:41:17 +0200 |
| commit | 3fcb77998ab10b85a76a7f538e87c61249785a88 (patch) | |
| tree | e466f42bda297d0e13a91b6f21b9c316900405d3 /make | |
| parent | d1fb7e346cd87e6976314a6e37ed10d34e4662d3 (diff) | |
| parent | 231ffc619a287ec49921e99488bd9fbc733a3c3a (diff) | |
Merge branch 'master' into _nb
Diffstat (limited to 'make')
| -rw-r--r-- | make/rules.mk | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/make/rules.mk b/make/rules.mk index 38fdbff..226d37d 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -3,7 +3,7 @@ HTMLTEMPLATE = text # 1:source 2:locales define SOURCE_template -$(1): $$($(1)_MODULES) $(dummy_MODULES) +$(1): init $$($(1)_MODULES) $(dummy_MODULES) .PHONY: $(1) endef @@ -11,45 +11,6 @@ $(foreach source,$(SOURCES),$(eval $(call SOURCE_template,$(source),$($(source)_ -# Initially clone, and later pull, all Git repositories: -# * Clone master branches from remote origin -# * Clone each non-master from local master - -# 1:moduledir 2:locale 3:mastermodule 4:source 5:flavor -define MODULE_template -$(3)_BRANCHES += $$(subst -FLAVOR,$(5:%=-$(5)),$$(subst -LOCALE,$(2:%=-$(2)),$$($(4)_BRANCH))) - -$(4): $(1) -ifneq ($(2),) -$(1): $$(subst module,$(3),$$(masterdir)) -endif - -$(1): origin = $$(if $(2)$(5),$(3),$$(subst MODULE,$(3),$$($(4)_ORIGIN))) -$(1): master = $$(subst -FLAVOR,$(5:%=-$(5)),$$(subst -LOCALE,$(2:%=-$(2)),$$($(4)_BRANCH))) -$(1): branches = $$(if $(2)$(5),,$$(filter-out $$(master),$$($(3)_BRANCHES))) -$(1): - @[ -d "$$(dir $$@)" ] || ( echo mkdir -p "$$(dir $$@)" && mkdir -p "$$(dir $$@)" ) - @[ -d "$$@" ] || ( echo git clone -o "$(4)" "$$(origin)" "$$@" && git clone -o "$(4)" "$$(origin)" "$$@" ) - @$(MAKE) -f "$$(CURDIR)/make/git.mk" -C "$$@" master="$$(master)" branches="$$(branches)" origin="$(4)" update - -# WARNING: this may wipe unrelated files too! -ultraclean:: - rm -rf "$(1)" -ifneq ($(2),) - rm -rf "$(dir $(1))" -endif - -.PHONY: $(1) -endef -$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(eval $(call MODULE_template,$(masterdir),,$(module),$(source))))) -$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(foreach locale,$($(source)_LOCALES),$(eval $(call MODULE_template,$(l10ndir),$(locale),$(module),$(source)))))) -#$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(foreach flavor,$(patsubst $(module)-%,%,$($(source)_MODULEFLAVORS)),$(eval $(call MODULE_template,$(flavordir),,$(module),$(source),$(flavor)))))) -#$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(foreach flavor,$(patsubst $(module)-%,%,$($(source)_MODULEFLAVORS)),$(foreach locale,$($(source)_LOCALES),$(eval $(call MODULE_template,$(flavorl10ndir),$(locale),$(module),$(source),$(flavor))))))) -$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(foreach flavor,$($(source)_$(module)_FLAVORS),$(eval $(call MODULE_template,$(flavordir),,$(module),$(source),$(flavor)))))) -$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(foreach flavor,$($(source)_$(module)_FLAVORS),$(foreach locale,$($(source)_LOCALES),$(eval $(call MODULE_template,$(flavorl10ndir),$(locale),$(module),$(source),$(flavor))))))) - - - # Override po4a with local Markdown-supportive text module export PERL5LIB = $(CURDIR)/perl |