Restoring authorship annotation for <kakabba@yandex-team.ru>. Commit 2 of 2.

build/platform/linux_sdk/ya.make

@@ -40,14 +40,14 @@ ELSEIF (ARCH_PPC64LE)
     ELSE()
         MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for PPC64LE")
     ENDIF()
-ELSEIF (ARCH_ARM7) 
+ELSEIF (ARCH_ARM7)
     IF (ARM7_FLOAT_ABI == "hard" AND OS_SDK == "ubuntu-16")
-        DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1323200692) 
+        DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1323200692)
     ELSEIF (ARM7_FLOAT_ABI == "softfp" AND OS_SDK == "ubuntu-18")
         DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:2402287545)
-    ELSE() 
+    ELSE()
         MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for ARMv7 32 bit (float ABI: ${ARM7_FLOAT_ABI})")
-    ENDIF() 
+    ENDIF()
 ELSE()
     MESSAGE(FATAL_ERROR "Unexpected OS_SDK value: ${OS_SDK}")
 ENDIF()

build/platform/yocto_sdk/yocto_sdk/ya.make

@@ -1,11 +1,11 @@
-RESOURCES_LIBRARY() 
- 
-OWNER(heretic) 
- 
-DECLARE_EXTERNAL_RESOURCE(YOCTO_SDK_ROOT sbr:882588946) 
-CFLAGS( 
-    GLOBAL -cxx-isystem GLOBAL $YOCTO_SDK_ROOT_RESOURCE_GLOBAL/usr/include/c++/5.3.0/arm-poky-linux-gnueabi 
-    GLOBAL -cxx-isystem GLOBAL $YOCTO_SDK_ROOT_RESOURCE_GLOBAL/usr/include/c++/5.3.0 
-) 
- 
-END() 
+RESOURCES_LIBRARY()
+
+OWNER(heretic)
+
+DECLARE_EXTERNAL_RESOURCE(YOCTO_SDK_ROOT sbr:882588946)
+CFLAGS(
+    GLOBAL -cxx-isystem GLOBAL $YOCTO_SDK_ROOT_RESOURCE_GLOBAL/usr/include/c++/5.3.0/arm-poky-linux-gnueabi
+    GLOBAL -cxx-isystem GLOBAL $YOCTO_SDK_ROOT_RESOURCE_GLOBAL/usr/include/c++/5.3.0
+)
+
+END()

build/plugins/_common.py

@@ -68,51 +68,51 @@ def before(s, ss):
 
     return s[:p]
 
- 
-def sort_by_keywords(keywords, args): 
-    flat = [] 
-    res = {} 
- 
-    cur_key = None 
-    limit = -1 
-    for arg in args: 
-        if arg in keywords: 
-            limit = keywords[arg] 
-            if limit == 0: 
-                res[arg] = True 
-                cur_key = None 
-                limit = -1 
-            else: 
-                cur_key = arg 
-            continue 
-        if limit == 0: 
-            cur_key = None 
-            limit = -1 
-        if cur_key: 
-            if cur_key in res: 
-                res[cur_key].append(arg) 
-            else: 
-                res[cur_key] = [arg] 
-            limit -= 1 
-        else: 
-            flat.append(arg) 
-    return (flat, res) 
- 
- 
-def resolve_common_const(path): 
-    if path.startswith('${ARCADIA_ROOT}'): 
-        return path.replace('${ARCADIA_ROOT}', '$S', 1) 
-    if path.startswith('${ARCADIA_BUILD_ROOT}'): 
-        return path.replace('${ARCADIA_BUILD_ROOT}', '$B', 1) 
-    return path 
-
-
-def resolve_to_abs_path(path, source_root, build_root): 
-    if path.startswith('$S') and source_root is not None: 
-        return path.replace('$S', source_root, 1) 
-    if path.startswith('$B') and build_root is not None: 
-        return path.replace('$B', build_root, 1) 
-    return path 
+
+def sort_by_keywords(keywords, args):
+    flat = []
+    res = {}
+
+    cur_key = None
+    limit = -1
+    for arg in args:
+        if arg in keywords:
+            limit = keywords[arg]
+            if limit == 0:
+                res[arg] = True
+                cur_key = None
+                limit = -1
+            else:
+                cur_key = arg
+            continue
+        if limit == 0:
+            cur_key = None
+            limit = -1
+        if cur_key:
+            if cur_key in res:
+                res[cur_key].append(arg)
+            else:
+                res[cur_key] = [arg]
+            limit -= 1
+        else:
+            flat.append(arg)
+    return (flat, res)
+
+
+def resolve_common_const(path):
+    if path.startswith('${ARCADIA_ROOT}'):
+        return path.replace('${ARCADIA_ROOT}', '$S', 1)
+    if path.startswith('${ARCADIA_BUILD_ROOT}'):
+        return path.replace('${ARCADIA_BUILD_ROOT}', '$B', 1)
+    return path
+
+
+def resolve_to_abs_path(path, source_root, build_root):
+    if path.startswith('$S') and source_root is not None:
+        return path.replace('$S', source_root, 1)
+    if path.startswith('$B') and build_root is not None:
+        return path.replace('$B', build_root, 1)
+    return path
 
 
 def resolve_to_ymake_path(path):
@@ -121,20 +121,20 @@ def resolve_to_ymake_path(path):
 
 def join_intl_paths(*args):
     return '/'.join(args)
- 
- 
-def get(fun, num): 
-    return fun()[num][0] 
- 
- 
-def make_tuples(arg_list): 
-    def tpl(): 
-        for x in arg_list: 
-            yield (x, []) 
- 
-    return list(tpl()) 
- 
- 
+
+
+def get(fun, num):
+    return fun()[num][0]
+
+
+def make_tuples(arg_list):
+    def tpl():
+        for x in arg_list:
+            yield (x, [])
+
+    return list(tpl())
+
+
 def resolve_includes(unit, src, paths):
     return unit.resolve_include([src] + paths) if paths else []
 

build/plugins/_custom_command.py

@@ -1,65 +1,65 @@
-import subprocess 
-import sys 
+import subprocess
+import sys
 import os
 
-import _common as common 
- 
- 
-class CustomCommand(object): 
-    def __setstate__(self, sdict): 
-        if isinstance(sdict, tuple): 
-            for elem in sdict: 
-                if isinstance(elem, dict): 
-                    for key in elem: 
-                        setattr(self, key, elem[key]) 
- 
-        self._source_root = None 
-        self._build_root = None 
- 
-    def set_source_root(self, path): 
-        self._source_root = path 
- 
-    def set_build_root(self, path): 
-        self._build_root = path 
- 
-    def call(self, args, **kwargs): 
-        cwd = self._get_call_specs('cwd', kwargs) 
-        stdout_path = self._get_call_specs('stdout', kwargs) 
-
-        resolved_args = [] 
-
-        for arg in args: 
+import _common as common
+
+
+class CustomCommand(object):
+    def __setstate__(self, sdict):
+        if isinstance(sdict, tuple):
+            for elem in sdict:
+                if isinstance(elem, dict):
+                    for key in elem:
+                        setattr(self, key, elem[key])
+
+        self._source_root = None
+        self._build_root = None
+
+    def set_source_root(self, path):
+        self._source_root = path
+
+    def set_build_root(self, path):
+        self._build_root = path
+
+    def call(self, args, **kwargs):
+        cwd = self._get_call_specs('cwd', kwargs)
+        stdout_path = self._get_call_specs('stdout', kwargs)
+
+        resolved_args = []
+
+        for arg in args:
             resolved_args.append(self.resolve_path(arg))
- 
-        if stdout_path: 
-            stdout = open(stdout_path, 'wb') 
-        else: 
-            stdout = None 
- 
+
+        if stdout_path:
+            stdout = open(stdout_path, 'wb')
+        else:
+            stdout = None
+
         env = os.environ.copy()
         env['ASAN_OPTIONS'] = 'detect_leaks=0'
- 
+
         rc = subprocess.call(resolved_args, cwd=cwd, stdout=stdout, env=env)
 
-        if stdout: 
-            stdout.close() 
-        if rc: 
-            sys.exit(rc) 
- 
+        if stdout:
+            stdout.close()
+        if rc:
+            sys.exit(rc)
+
     def resolve_path(self, path):
         return common.resolve_to_abs_path(path, self._source_root, self._build_root)
- 
-    def _get_call_specs(self, name, kwargs): 
-        if isinstance(kwargs, dict): 
-            param = kwargs.get(name, None) 
-            if param: 
-                return self.resolve_path(param) 
-        return None 
-
- 
-def addrule(*unused): 
-    pass 
- 
- 
+
+    def _get_call_specs(self, name, kwargs):
+        if isinstance(kwargs, dict):
+            param = kwargs.get(name, None)
+            if param:
+                return self.resolve_path(param)
+        return None
+
+
+def addrule(*unused):
+    pass
+
+
 def addparser(*unused, **kwargs):
-    pass 
+    pass

build/plugins/_import_wrapper.py

@@ -1,9 +1,9 @@
-try: 
+try:
     from ymake import CustomCommand as RealCustomCommand
-    from ymake import addrule 
-    from ymake import addparser 
+    from ymake import addrule
+    from ymake import addparser
     from ymake import subst
- 
+
     class CustomCommand(RealCustomCommand):
         def __init__(self, *args, **kwargs):
             RealCustomCommand.__init__(*args, **kwargs)
@@ -11,7 +11,7 @@ try:
         def resolve_path(self, path):
             return subst(path)
 
-except ImportError: 
+except ImportError:
     from _custom_command import CustomCommand  # noqa
     from _custom_command import addrule  # noqa
     from _custom_command import addparser  # noqa

build/plugins/_unpickler.py

@@ -2,41 +2,41 @@ import sys
 
 sys.dont_write_bytecode = True
 
-import argparse 
-import base64 
+import argparse
+import base64
 try:
     import cPickle as pickle
 except Exception:
     import pickle
- 
+
 import _common as common
- 
-
-def main(): 
-    parser = argparse.ArgumentParser() 
-    parser.add_argument('--data', help='pickled object of TCustomCommand class', required=True) 
-    parser.add_argument('--src-root', help='$S real path', required=True) 
-    parser.add_argument('--build-root', help='$B real path', required=True) 
-    parser.add_argument('--tools', help='binaries needed by command', required=True, nargs='+') 
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--data', help='pickled object of TCustomCommand class', required=True)
+    parser.add_argument('--src-root', help='$S real path', required=True)
+    parser.add_argument('--build-root', help='$B real path', required=True)
+    parser.add_argument('--tools', help='binaries needed by command', required=True, nargs='+')
     args, unknown_args = parser.parse_known_args()
- 
-    encoded_cmd = args.data 
-    src_root = args.src_root 
-    build_root = args.build_root 
-    tools = args.tools 
- 
-    assert (int(tools[0]) == len(tools[1:])), "tools quantity != tools number!" 
- 
+
+    encoded_cmd = args.data
+    src_root = args.src_root
+    build_root = args.build_root
+    tools = args.tools
+
+    assert (int(tools[0]) == len(tools[1:])), "tools quantity != tools number!"
+
     cmd_object = pickle.loads(base64.b64decode(encoded_cmd))
- 
-    cmd_object.set_source_root(src_root) 
-    cmd_object.set_build_root(build_root) 
- 
-    if len(tools[1:]) == 0: 
+
+    cmd_object.set_source_root(src_root)
+    cmd_object.set_build_root(build_root)
+
+    if len(tools[1:]) == 0:
         cmd_object.run(unknown_args, common.get_interpreter_path())
-    else: 
+    else:
         cmd_object.run(unknown_args, *tools[1:])
- 
- 
-if __name__ == '__main__': 
-    main() 
+
+
+if __name__ == '__main__':
+    main()

build/plugins/_xsyn_includes.py

@@ -1,4 +1,4 @@
-def get_include_callback(): 
+def get_include_callback():
     """
     .. function: get_include_callback    returns function that processes each DOM element to get xsyn include from it, and it's aware of directory with all the xsyns.
 
@@ -55,6 +55,6 @@ def process_xsyn(filepath, on_element):
     return res
 
 
-def get_all_includes(filepath): 
-    callback = get_include_callback() 
-    return process_xsyn(filepath, callback) 
+def get_all_includes(filepath):
+    callback = get_include_callback()
+    return process_xsyn(filepath, callback)

build/plugins/build_mn_files.py

@@ -7,7 +7,7 @@ def on_build_mns_files(unit, *args):
     ranking_suffix = ''
     check = ''
     index = 0
-    fml_unused_tool = '' 
+    fml_unused_tool = ''
     while index < len(args):
         if args[index] == 'NAME':
             index += 1
@@ -17,7 +17,7 @@ def on_build_mns_files(unit, *args):
             ranking_suffix = args[index]
         elif args[index] == 'CHECK':
             check = 'CHECK'
-            fml_unused_tool = unit.get('FML_UNUSED_TOOL') or '$FML_UNUSED_TOOL' 
+            fml_unused_tool = unit.get('FML_UNUSED_TOOL') or '$FML_UNUSED_TOOL'
         else:
             files.append(args[index])
         index += 1

build/plugins/cp.py

@@ -1,30 +1,30 @@
-import os 
+import os
 
-from _common import sort_by_keywords 
- 
- 
-def oncopy(unit, *args): 
+from _common import sort_by_keywords
+
+
+def oncopy(unit, *args):
     keywords = {'RESULT': 1, 'KEEP_DIR_STRUCT': 0, 'DESTINATION': 1, 'FROM': 1}
- 
-    flat_args, spec_args = sort_by_keywords(keywords, args) 
- 
-    dest_dir = spec_args['DESTINATION'][0] if 'DESTINATION' in spec_args else '' 
+
+    flat_args, spec_args = sort_by_keywords(keywords, args)
+
+    dest_dir = spec_args['DESTINATION'][0] if 'DESTINATION' in spec_args else ''
     from_dir = spec_args['FROM'][0] if 'FROM' in spec_args else ''
-    keep_struct = 'KEEP_DIR_STRUCT' in spec_args 
-    save_in_var = 'RESULT' in spec_args 
-    targets = [] 
- 
-    for source in flat_args: 
-        rel_path = '' 
-        path_list = source.split(os.sep) 
-        filename = path_list[-1] 
-        if keep_struct: 
-            if path_list[:-1]: 
-                rel_path = os.path.join(*path_list[:-1]) 
+    keep_struct = 'KEEP_DIR_STRUCT' in spec_args
+    save_in_var = 'RESULT' in spec_args
+    targets = []
+
+    for source in flat_args:
+        rel_path = ''
+        path_list = source.split(os.sep)
+        filename = path_list[-1]
+        if keep_struct:
+            if path_list[:-1]:
+                rel_path = os.path.join(*path_list[:-1])
         source_path = os.path.join(from_dir, rel_path, filename)
         target_path = os.path.join(dest_dir, rel_path, filename)
-        if save_in_var: 
+        if save_in_var:
             targets.append(target_path)
         unit.oncopy_file([source_path, target_path])
-    if save_in_var: 
-        unit.set([spec_args["RESULT"][0], " ".join(targets)]) 
+    if save_in_var:
+        unit.set([spec_args["RESULT"][0], " ".join(targets)])

build/plugins/create_init_py.py

@@ -1,15 +1,15 @@
-import os 
+import os
+
+from _common import sort_by_keywords
 
-from _common import sort_by_keywords 
- 
 
 def oncreate_init_py_structure(unit, *args):
-    if unit.get('DISTBUILD'): 
-        return 
+    if unit.get('DISTBUILD'):
+        return
     target_dir = unit.get('PY_PROTOS_FOR_DIR')
     path_list = target_dir.split(os.path.sep)[1:]
     inits = [os.path.join("${ARCADIA_BUILD_ROOT}", '__init__.py')]
     for i in range(1, len(path_list) + 1):
         inits.append(os.path.join("${ARCADIA_BUILD_ROOT}", os.path.join(*path_list[0:i]), '__init__.py'))
     unit.ontouch(inits)
- 
+