Build: add target contrib.fetch.test

- remove configure --df-exhaust-url

diff --git a/make/configure.py b/make/configure.py
index cf1894fb0049c96ac3d532e0d6e54896787a5f01..e27b477fa7af9628f542619ae3bb3e9a0627dbf6 100644 (file)
--- 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 914426bb09ef30fd4c97dbbe5dee9f39caa69414..b50d6f63625e4288f58c0fbf97ed228046ab526f 100644 (file)
--- 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 c161dc78c865da740b97c1a1c25998d542aabb02..face4be2ef4cdbd1d14d0ed45b3c1590c1ef0dc8 100644 (file)
--- 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