Просмотр исходного кода

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

workfork 3 лет назад
Родитель
Сommit
c374517327

+ 1 - 1
build/platform/binutils/ya.make

@@ -1,6 +1,6 @@
 RESOURCES_LIBRARY()
 
-OWNER(g:contrib somov)
+OWNER(g:contrib somov) 
 
 INCLUDE(binutils.resource)
 

+ 1 - 1
build/platform/clang/ya.make

@@ -2,7 +2,7 @@ RESOURCES_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-OWNER(g:contrib)
+OWNER(g:contrib) 
 
 IF (CLANG10BC AND CLANG10 AND HOST_OS_LINUX)
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(

+ 2 - 2
build/platform/yfm/ya.make

@@ -1,5 +1,5 @@
 OWNER(
-    workfork
+    workfork 
 )
 
 RESOURCES_LIBRARY()
@@ -16,4 +16,4 @@ DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
     sbr:2614617315 FOR WIN32
 )
 
-END()
+END() 

+ 27 - 27
build/plugins/docs.py

@@ -1,34 +1,34 @@
-import json
-
-
-def extract_macro_calls(unit, macro_value_name):
-    if not unit.get(macro_value_name):
-        return []
-
-    return filter(None, unit.get(macro_value_name).replace('$' + macro_value_name, '').split())
-
-
-def macro_calls_to_dict(unit, calls):
-    def split_args(arg):
-        if arg is None:
-            return None
-
-        kv = filter(None, arg.split('='))
-        if len(kv) != 2:
-            unit.message(['error', 'Invalid variables specification "{}": value expected to be in form %name%=%value% (with no spaces)'.format(arg)])
-            return None
-
-        return kv
-
-    return dict(filter(None, map(split_args, calls)))
-
-
-def onprocess_docs(unit, *args):
+import json 
+ 
+ 
+def extract_macro_calls(unit, macro_value_name): 
+    if not unit.get(macro_value_name): 
+        return [] 
+ 
+    return filter(None, unit.get(macro_value_name).replace('$' + macro_value_name, '').split()) 
+ 
+ 
+def macro_calls_to_dict(unit, calls): 
+    def split_args(arg): 
+        if arg is None: 
+            return None 
+ 
+        kv = filter(None, arg.split('=')) 
+        if len(kv) != 2: 
+            unit.message(['error', 'Invalid variables specification "{}": value expected to be in form %name%=%value% (with no spaces)'.format(arg)]) 
+            return None 
+ 
+        return kv 
+ 
+    return dict(filter(None, map(split_args, calls))) 
+ 
+ 
+def onprocess_docs(unit, *args): 
     build_tool = unit.get('_DOCS_BUILDER_VALUE')
     if build_tool:
         if build_tool not in ['mkdocs', 'yfm']:
             unit.message(['error', 'Unsupported build tool {}'.format(build_tool)])
-    else:
+    else: 
         build_tool = 'yfm'
         unit.ondocs_builder([build_tool])
     if build_tool == 'yfm' and unit.enabled('_DOCS_USE_PLANTUML'):

+ 1 - 1
build/plugins/ya.make

@@ -1,4 +1,4 @@
-OWNER(g:ymake)
+OWNER(g:ymake) 
 
 PY2_LIBRARY()
 

+ 1 - 1
build/scripts/build_dll_and_java.py

@@ -36,7 +36,7 @@ def just_do_it(argv):
                 inp = os.path.join(build_root, inp)
             if sys.platform == 'win32':
                 inp = inp.replace('\\', '/')
-            dll_cmd.remove(inp)
+            dll_cmd.remove(inp) 
     java_cmd.insert(java_cmd.index(dll_out), java_out)
     java_cmd.remove(dll_out)
     subprocess.check_call(java_cmd)

+ 39 - 39
build/scripts/clang_wrapper.py

@@ -1,4 +1,4 @@
-import subprocess
+import subprocess 
 import sys
 
 
@@ -6,48 +6,48 @@ def fix(s):
     # disable dbg DEVTOOLS-2744
     if s == '-g':
         return None
-    if s == '/Z7' or s == '/Od' or s == '/Ob0' or s == '/D_DEBUG':
-        return None
-
-    # disable sanitizers for generated code
-    if s.startswith('-fsanitize') or s == '-Dmemory_sanitizer_enabled' or s.startswith('-fsanitize-blacklist'):
-        return None
-
-    # strip gcc toolchain flags (appear when crosscompiling)
-    if s.startswith('-fabi-version'):
-        return None
-
+    if s == '/Z7' or s == '/Od' or s == '/Ob0' or s == '/D_DEBUG': 
+        return None 
+
+    # disable sanitizers for generated code 
+    if s.startswith('-fsanitize') or s == '-Dmemory_sanitizer_enabled' or s.startswith('-fsanitize-blacklist'): 
+        return None 
+ 
+    # strip gcc toolchain flags (appear when crosscompiling) 
+    if s.startswith('-fabi-version'): 
+        return None 
+ 
     # remove arguments unknown to clang-cl
     if s == '-fcase-insensitive-paths':  # or s == '-fno-lto':  # DEVTOOLSSUPPORT-3966
         return None
 
-    # Paths under .ya/tools/v3/.../msvc/include are divided with '\'
-    return s.replace('\\', '/')
-
-
-def fix_path(p):
-    try:
-        i = p.rfind('/bin/clang')
-        p = p[:i] + '/bin/clang-cl'
-    except ValueError:
-        pass
-    return p
+    # Paths under .ya/tools/v3/.../msvc/include are divided with '\' 
+    return s.replace('\\', '/') 
 
 
+def fix_path(p): 
+    try: 
+        i = p.rfind('/bin/clang') 
+        p = p[:i] + '/bin/clang-cl' 
+    except ValueError: 
+        pass 
+    return p 
+ 
+ 
 if __name__ == '__main__':
-    is_on_win = sys.argv[1] == 'yes'
-    path = sys.argv[2]
-    args = filter(None, [fix(s) for s in sys.argv[3:]])
-    if is_on_win:
-        path = fix_path(path)
-        try:
-            i = args.index('-emit-llvm')
-            args[i:i+1] = ['-Xclang', '-emit-llvm']
-        except ValueError:
-            pass
-        args.append('-fms-compatibility-version=19')
-
-    cmd = [path] + args
-
-    rc = subprocess.call(cmd, shell=False, stderr=sys.stderr, stdout=sys.stdout)
-    sys.exit(rc)
+    is_on_win = sys.argv[1] == 'yes' 
+    path = sys.argv[2] 
+    args = filter(None, [fix(s) for s in sys.argv[3:]]) 
+    if is_on_win: 
+        path = fix_path(path) 
+        try: 
+            i = args.index('-emit-llvm') 
+            args[i:i+1] = ['-Xclang', '-emit-llvm'] 
+        except ValueError: 
+            pass 
+        args.append('-fms-compatibility-version=19') 
+
+    cmd = [path] + args 
+ 
+    rc = subprocess.call(cmd, shell=False, stderr=sys.stderr, stdout=sys.stdout) 
+    sys.exit(rc) 

+ 1 - 1
build/scripts/collect_java_srcs.py

@@ -44,7 +44,7 @@ if __name__ == '__main__':
                 tf.extractall(dst)
 
         elif src.endswith('-sources.jar'):
-            with zipfile.ZipFile(src) as zf:
+            with zipfile.ZipFile(src) as zf: 
                 zf.extractall(dst)
 
         else:

+ 1 - 1
build/scripts/fetch_from_sandbox.py

@@ -24,7 +24,7 @@ def parse_args():
     parser.add_argument('--resource-id', type=int, required=True)
     parser.add_argument('--custom-fetcher')
     parser.add_argument('--resource-file')
-    return parser.parse_args()
+    return parser.parse_args() 
 
 
 class ResourceInfoError(Exception):

+ 3 - 3
build/scripts/fs_tools.py

@@ -29,9 +29,9 @@ if __name__ == '__main__':
 
     if mode == 'copy':
         shutil.copy(args[0], args[1])
-    elif mode == 'copy_tree_no_link':
-        dst = args[1]
-        shutil.copytree(args[0], dst, ignore=lambda dirname, names: [n for n in names if os.path.islink(os.path.join(dirname, n))])
+    elif mode == 'copy_tree_no_link': 
+        dst = args[1] 
+        shutil.copytree(args[0], dst, ignore=lambda dirname, names: [n for n in names if os.path.islink(os.path.join(dirname, n))]) 
     elif mode == 'copy_files':
         src = args[0]
         dst = args[1]

Некоторые файлы не были показаны из-за большого количества измененных файлов