diff options
| -rw-r--r-- | make/configure.py | 2 | ||||
| -rw-r--r-- | make/df-fetch.py | 1 | ||||
| -rw-r--r-- | make/include/contrib.defs | 7 |
3 files changed, 7 insertions, 3 deletions
diff --git a/make/configure.py b/make/configure.py index cf1894fb0..e27b477fa 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1192,7 +1192,6 @@ def encodeDistfileConfig(): 'verbosity': options.df_verbosity, 'accept-url': options.df_accept_url, 'deny-url': options.df_deny_url, - 'exhaust-url': options.df_exhaust_url, } try: try: @@ -1266,7 +1265,6 @@ def createCLI(): grp.add_option( '--df-verbose', default=1, action='count', dest='df_verbosity', help='increase distfile tools verbosity' ) grp.add_option( '--df-accept-url', default=[], action='append', metavar='SPEC', help='accept URLs matching regex pattern' ) grp.add_option( '--df-deny-url', default=[], action='append', metavar='SPEC', help='deny URLs matching regex pattern' ) - grp.add_option( '--df-exhaust-url', default=False, action='store_true', help='try all active distfiles' ) cli.add_option_group( grp ) ## add install options diff --git a/make/df-fetch.py b/make/df-fetch.py index 914426bb0..b50d6f636 100644 --- a/make/df-fetch.py +++ b/make/df-fetch.py @@ -72,7 +72,6 @@ class Tool(hb_distfile.Tool): parser.values.disable = data['disable-fetch'] parser.values.accept_url = data['accept-url'] parser.values.deny_url = data['deny-url'] - parser.values.exhaust_url = data['exhaust-url'] def _run(self, error): if self.options.disable: diff --git a/make/include/contrib.defs b/make/include/contrib.defs index c161dc78c..face4be2e 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -33,6 +33,9 @@ define import.CONTRIB.defs define $(1).FETCH $$(DF.FETCH.exe) --config $(BUILD/)distfile.cfg $$(if $$($(1).FETCH.md5),--md5 $$($(1).FETCH.md5)) --output $$@ $$($(1).FETCH.url) endef + define $(1).FETCH.test + $$(DF.FETCH.exe) --config $(BUILD/)distfile.cfg $$(if $$($(1).FETCH.md5),--md5 $$($(1).FETCH.md5)) --exhaust-url $$($(1).FETCH.url) + endef ## ## target: verify @@ -225,6 +228,9 @@ $($(1).name).fetch: $$($(1).FETCH.target) $$($(1).FETCH.target): | $$(dir $$($(1).FETCH.target)) @$$($(1).FETCH) +$($(1).name).fetch.test: + @$$($(1).FETCH.test) + ## ## target: verify ## @@ -345,6 +351,7 @@ $($(1).name): $($(1).name).build ## participate with global convenience targets ## contrib.fetch: $($(1).name).fetch +contrib.fetch.test: $($(1).name).fetch.test contrib.verify: $($(1).name).verify contrib.verify.touch: $($(1).name).verify.touch contrib.verify.untouch: $($(1).name).verify.untouch |