Dismantle FROM_EXTERNAL, process .external file in plugin

2 files changed, 27 insertions, 6 deletions

diff --git a/build/plugins/large_files.py b/build/plugins/large_files.py
index 568e294253..308dc82075 100644
--- a/build/plugins/large_files.py
+++ b/build/plugins/large_files.py
@@ -1,6 +1,7 @@
+import json
 import os
 import ymake
-from _common import strip_roots
+from _common import strip_roots, resolve_common_const
 
 PLACEHOLDER_EXT = "external"
 
@@ -31,10 +32,27 @@ def onlarge_files(unit, *args):
             unit.message(["warn", msg])
             unit.oncopy_file([arg, arg])
         else:
-            out_file = strip_roots(os.path.join(unit.path(), arg))
             external = "{}.{}".format(arg, PLACEHOLDER_EXT)
-            from_external_cmd = [external, out_file, 'OUT_NOAUTO', arg]
+            rel_placeholder = resolve_common_const(unit.resolve_arc_path(external))
+            if not rel_placeholder.startswith("$S"):
+                ymake.report_configure_error('LARGE_FILES: neither actual data nor placeholder is found for "{}"'.format(arg))
+                return
+            try:
+                abs_placeholder = unit.resolve(rel_placeholder)
+                with open(abs_placeholder, "r") as f:
+                    res_desc = json.load(f)
+                    storage = res_desc["storage"]
+                    res_id = res_desc["resource_id"]
+            except e:
+                ymake.report_configure_error('LARGE_FILES: error processing placeholder file "{}.": {}'.format(external, e))
+                return
+
+            from_cmd = ['FILE', '{}'.format(res_id), 'OUT_NOAUTO', arg, 'EXTERNAL_FILE', external]
             if os.path.dirname(arg):
-                from_external_cmd.extend(("RENAME", os.path.basename(arg)))
-            unit.on_from_external(from_external_cmd)
-            unit.onadd_check(['check.external', external])
+                from_cmd.extend(("RENAME", os.path.basename(arg)))
+
+            method = getattr(unit, 'onfrom_{}'.format(storage.lower()), None)
+            if method:
+                method(from_cmd)
+            else:
+                ymake.report_configure_error('LARGE_FILES: error processing placeholder file "{}.": unknown storage kind "{}"'.format(external, storage))
diff --git a/build/plugins/ytest.py b/build/plugins/ytest.py
index 506466f355..9785684a49 100644
--- a/build/plugins/ytest.py
+++ b/build/plugins/ytest.py
@@ -624,6 +624,9 @@ def onadd_check(unit, *args):
     if check_type in ("check.data", "check.resource") and unit.get('VALIDATE_DATA') == "no":
         return
 
+    if check_type == "check.external" and (len(flat_args) == 1 or not flat_args[1]):
+        return
+
     test_dir = _common.get_norm_unit_path(unit)
 
     test_timeout = ''