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

7 files changed, 145 insertions, 145 deletions

diff --git a/build/conf/license.conf b/build/conf/license.conf
index e415adbf0f..f2fb576b0d 100644
--- a/build/conf/license.conf
+++ b/build/conf/license.conf
@@ -301,7 +301,7 @@ LICENSES_PERMISSIVE= \
     Sleepycat \
     Snprintf \
     SGI-B-2.0 \
-    SMLNJ \ 
+    SMLNJ \
     SSH-short \
     SSLeay \
     Sunpro \
diff --git a/build/platform/xcode/tools/ya.make.inc b/build/platform/xcode/tools/ya.make.inc
index 0e26156c78..a154917e33 100644
--- a/build/platform/xcode/tools/ya.make.inc
+++ b/build/platform/xcode/tools/ya.make.inc
@@ -1,8 +1,8 @@
 IF (NOT HOST_OS_DARWIN)
     MESSAGE(FATAL_ERROR Unsupported host platform for Xcode tools)
 ENDIF()
-IF (LOCAL_XCODE_TOOLS) # Local XCode installation is used instead. 
-ELSEIF (XCODE_TOOLS_VERSION == "10.1") 
+IF (LOCAL_XCODE_TOOLS) # Local XCode installation is used instead.
+ELSEIF (XCODE_TOOLS_VERSION == "10.1")
     DECLARE_EXTERNAL_RESOURCE(XCODE_TOOLS_ROOT sbr:799017771)
 ELSE()
     MESSAGE(FATAL_ERROR Unsupported Xcode tools version: $XCODE_TOOLS_VERSION)
diff --git a/build/scripts/ios_wrapper.py b/build/scripts/ios_wrapper.py
index ee68200fa2..d3aa48387a 100644
--- a/build/scripts/ios_wrapper.py
+++ b/build/scripts/ios_wrapper.py
@@ -27,7 +27,7 @@ def just_do_it(args):
             parts[-1].append(arg)
     if len(parts) != 3 or len(parts[0]) != 5:
         raise Exception('Bad call')
-    bin_name, ibtool_path, main_out, app_name, module_dir = parts[0] 
+    bin_name, ibtool_path, main_out, app_name, module_dir = parts[0]
     bin_name = os.path.basename(bin_name)
     inputs, storyboard_user_flags = parts[1:]
     plists, storyboards, signs, nibs, resources, signed_resources, plist_jsons, strings = [], [], [], [], [], [], [], []
@@ -76,7 +76,7 @@ def just_do_it(args):
         replaced_templates['$(' + k + ')'] = v
         replaced_templates['${' + k + '}'] = v
     make_main_plist(plists, os.path.join(app_dir, 'Info.plist'), replaced_templates)
-    link_storyboards(ibtool_path, storyboards, app_name, app_dir, storyboard_user_flags) 
+    link_storyboards(ibtool_path, storyboards, app_name, app_dir, storyboard_user_flags)
     if resources:
         extract_resources(resources, app_dir)
     if signed_resources:
diff --git a/build/scripts/process_whole_archive_option.py b/build/scripts/process_whole_archive_option.py
index afd46015a9..a9c4ef676a 100644
--- a/build/scripts/process_whole_archive_option.py
+++ b/build/scripts/process_whole_archive_option.py
@@ -142,7 +142,7 @@ class ProcessWholeArchiveOption():
         return cmd
 
     def construct_cmd(self, args):
-        if self.arch in ('DARWIN', 'IOS', 'IOSSIM'): 
+        if self.arch in ('DARWIN', 'IOS', 'IOSSIM'):
             return self._construct_cmd_apple(args)
 
         if self.arch == 'WINDOWS':
diff --git a/build/ya.conf.json b/build/ya.conf.json
index 60bdfc2ec9..5f7cc875d6 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -1981,80 +1981,80 @@
                 "cxx_compiler": "$(CLANG)/bin/clang++",
                 "llvm-symbolizer": "$(CLANG)/bin/llvm-symbolizer",
                 "objcopy": "$(CLANG)/bin/llvm-objcopy",
-                "simctl": "$(XCODE_TOOLS_ROOT-sbr:799017771)/Xcode/SystemRoot/PrivateFrameworks/CoreSimulator.framework/Resources/bin/simctl", 
-                "profiles": "$(XCODE_TOOLS_ROOT-sbr:799017771)/Xcode/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles", 
+                "simctl": "$(XCODE_TOOLS_ROOT-sbr:799017771)/Xcode/SystemRoot/PrivateFrameworks/CoreSimulator.framework/Resources/bin/simctl",
+                "profiles": "$(XCODE_TOOLS_ROOT-sbr:799017771)/Xcode/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles",
                 "strip": "$(CLANG)/bin/llvm-strip",
                 "gcc_version": "12.0"
             }
         },
-        "local": { 
-            "tools": { 
-                "c++": { 
-                    "executable": "c++" 
-                }, 
-                "cc": { 
-                    "executable": "cc" 
-                } 
-            }, 
-            "platforms": [ 
-                { 
-                    "host": { 
-                        "os": "DARWIN" 
-                    }, 
-                    "target": { 
-                        "os": "DARWIN", 
-                        "arch": "arm64" 
-                    }, 
-                    "default": false 
-                }, 
-                { 
-                    "host": { 
-                        "os": "DARWIN" 
-                    }, 
-                    "target": { 
-                        "os": "DARWIN", 
-                        "arch": "x86_64" 
-                    }, 
-                    "default": false 
-                }, 
-                { 
-                    "host": { 
-                        "os": "DARWIN" 
-                    }, 
-                    "target": { 
-                        "os": "IOS", 
-                        "arch": "x86_64" 
-                    }, 
-                    "default": false 
-                }, 
-                { 
-                    "host": { 
-                        "os": "DARWIN" 
-                    }, 
-                    "target": { 
-                        "os": "IOS", 
-                        "arch": "arm64" 
-                    }, 
-                    "default": false 
-                }, 
-                { 
-                    "host": { 
-                        "os": "DARWIN" 
-                    }, 
-                    "target": { 
-                        "os": "IOSSIM", 
-                        "arch": "arm64" 
-                    }, 
-                    "default": false 
-                } 
-            ], 
-            "params": { 
-                "type": "xcode", 
-                "local": true, 
-                "werror_mode": "all", 
-                "gcc_version": "13.1" 
-            } 
-        }, 
+        "local": {
+            "tools": {
+                "c++": {
+                    "executable": "c++"
+                },
+                "cc": {
+                    "executable": "cc"
+                }
+            },
+            "platforms": [
+                {
+                    "host": {
+                        "os": "DARWIN"
+                    },
+                    "target": {
+                        "os": "DARWIN",
+                        "arch": "arm64"
+                    },
+                    "default": false
+                },
+                {
+                    "host": {
+                        "os": "DARWIN"
+                    },
+                    "target": {
+                        "os": "DARWIN",
+                        "arch": "x86_64"
+                    },
+                    "default": false
+                },
+                {
+                    "host": {
+                        "os": "DARWIN"
+                    },
+                    "target": {
+                        "os": "IOS",
+                        "arch": "x86_64"
+                    },
+                    "default": false
+                },
+                {
+                    "host": {
+                        "os": "DARWIN"
+                    },
+                    "target": {
+                        "os": "IOS",
+                        "arch": "arm64"
+                    },
+                    "default": false
+                },
+                {
+                    "host": {
+                        "os": "DARWIN"
+                    },
+                    "target": {
+                        "os": "IOSSIM",
+                        "arch": "arm64"
+                    },
+                    "default": false
+                }
+            ],
+            "params": {
+                "type": "xcode",
+                "local": true,
+                "werror_mode": "all",
+                "gcc_version": "13.1"
+            }
+        },
         "xcode_11_1": {
             "tools": {
                 "c++": {
@@ -6082,11 +6082,11 @@
         "clang12": {
             "formula": {
                 "sandbox_id": [
-                    1042818759, 
-                    1042820568, 
-                    1042823154, 
-                    1042827120, 
-                    1042828064 
+                    1042818759,
+                    1042820568,
+                    1042823154,
+                    1042827120,
+                    1042828064
                 ],
                 "match": "CLANG"
             },
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 5d566adffb..081833998b 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -8840,23 +8840,23 @@ multimodule PY23_NATIVE_LIBRARY {
     }
 }
 
-IBTOOL_PATH=$XCODE_TOOLS_ROOT_RESOURCE_GLOBAL/Xcode/Contents/Developer/usr/bin/ibtool 
+IBTOOL_PATH=$XCODE_TOOLS_ROOT_RESOURCE_GLOBAL/Xcode/Contents/Developer/usr/bin/ibtool
 # tag:src-processing
 STORYBOARD_FLAGS=--errors --warnings --notices --auto-activate-custom-fonts --output-format human-readable-text
 macro _SRC("storyboard", SRC, SRCFLAGS...) {
-    .CMD=$IBTOOL_PATH $STORYBOARD_FLAGS --module $REALPRJNAME --output-partial-info-plist ${output;suf=.partial_plist:SRC} --compilation-directory $BINDIR ${input:SRC} && $YMAKE_PYTHON ${input:"build/scripts/tar_directory.py"}  ${output;tobindir;suf=.compiled_storyboard_tar:SRC} $BINDIR/${nopath;suf=c:SRC} $BINDIR/${nopath;suf=c:SRC} 
+    .CMD=$IBTOOL_PATH $STORYBOARD_FLAGS --module $REALPRJNAME --output-partial-info-plist ${output;suf=.partial_plist:SRC} --compilation-directory $BINDIR ${input:SRC} && $YMAKE_PYTHON ${input:"build/scripts/tar_directory.py"}  ${output;tobindir;suf=.compiled_storyboard_tar:SRC} $BINDIR/${nopath;suf=c:SRC} $BINDIR/${nopath;suf=c:SRC}
 }
 
 # tag:src-processing
 macro _SRC("xib", SRC, SRCFLAGS...) {
-    .CMD=$IBTOOL_PATH $STORYBOARD_FLAGS --module $REALPRJNAME --output-partial-info-plist ${output;suf=.partial_plist:SRC} --compile ${output;tobindir;nopath;noext;suf=.nib:SRC} ${input:SRC} 
+    .CMD=$IBTOOL_PATH $STORYBOARD_FLAGS --module $REALPRJNAME --output-partial-info-plist ${output;suf=.partial_plist:SRC} --compile ${output;tobindir;nopath;noext;suf=.nib:SRC} ${input:SRC}
 }
 
-ACTOOL_PATH=$XCODE_TOOLS_ROOT_RESOURCE_GLOBAL/Xcode/Contents/Developer/usr/bin/ibtool 
+ACTOOL_PATH=$XCODE_TOOLS_ROOT_RESOURCE_GLOBAL/Xcode/Contents/Developer/usr/bin/ibtool
 # tag:ios-specific
 ASSETS_FLAGS=--output-format human-readable-text --notices --warnings
 macro _IOS_ASSETS(AssetsDir, Content...) {
-    .CMD=$FS_TOOLS md $BINDIR/$REALPRJNAME && $ACTOOL_PATH $ASSETS_FLAGS --export-dependency-info $BINDIR/assetcatalog_dependencies --output-partial-info-plist ${output:"assetcatalog_generated_info.partial_plist"} --product-type com.apple.product-type.application --compile $BINDIR/$REALPRJNAME $AssetsDir ${input;hide:Content} && ${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/tar_directory.py"} ${output;suf=_assetes.resource_tar:REALPRJNAME} $REALPRJNAME $REALPRJNAME 
+    .CMD=$FS_TOOLS md $BINDIR/$REALPRJNAME && $ACTOOL_PATH $ASSETS_FLAGS --export-dependency-info $BINDIR/assetcatalog_dependencies --output-partial-info-plist ${output:"assetcatalog_generated_info.partial_plist"} --product-type com.apple.product-type.application --compile $BINDIR/$REALPRJNAME $AssetsDir ${input;hide:Content} && ${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/tar_directory.py"} ${output;suf=_assetes.resource_tar:REALPRJNAME} $REALPRJNAME $REALPRJNAME
 }
 
 # tag:ios-specific
@@ -8880,7 +8880,7 @@ macro DARWIN_SIGNED_RESOURCE(Resource, Relpath) {
 
 # tag:ios-specific
 DELIM=__DELIM__
-PACK_IOS_ARCHIVE=$GENERATE_MF && $YMAKE_PYTHON ${input:"build/scripts/ios_wrapper.py"} bin $IBTOOL_PATH $TARGET $REALPRJNAME $BINDIR $DELIM $AUTO_INPUT $DELIM $STORYBOARD_FLAGS 
+PACK_IOS_ARCHIVE=$GENERATE_MF && $YMAKE_PYTHON ${input:"build/scripts/ios_wrapper.py"} bin $IBTOOL_PATH $TARGET $REALPRJNAME $BINDIR $DELIM $AUTO_INPUT $DELIM $STORYBOARD_FLAGS
 ### @usage: IOS_INTERFACE()
 ### iOS GUI module definition
 module IOS_INTERFACE: _BARE_UNIT {
@@ -8898,33 +8898,33 @@ module DEFAULT_IOS_INTERFACE: IOS_INTERFACE {
     SET(MODULE_SUFFIX .default.ios.interface)
 }
 
-DEFAULT_IOS_TYPE= 
-IOS_TYPE= 
-when(!$IOS_TYPE) { 
-    when($DEFAULT_IOS_TYPE) { 
-        IOS_TYPE=$DEFAULT_IOS_TYPE 
-    } 
-    otherwise { 
-        IOS_TYPE=com.apple.CoreSimulator.SimDeviceType.iPhone-X 
-    } 
-} 
-DEFAULT_IOS_RUNTIME= 
-IOS_RUNTIME= 
-when(!$IOS_RUNTIME) { 
-    when($DEFAULT_IOS_RUNTIME) { 
-        IOS_RUNTIME=$DEFAULT_IOS_RUNTIME 
-    } 
-    otherwise { 
-        IOS_RUNTIME=com.apple.CoreSimulator.SimRuntime.iOS-12-1 
-    } 
-} 
+DEFAULT_IOS_TYPE=
+IOS_TYPE=
+when(!$IOS_TYPE) {
+    when($DEFAULT_IOS_TYPE) {
+        IOS_TYPE=$DEFAULT_IOS_TYPE
+    }
+    otherwise {
+        IOS_TYPE=com.apple.CoreSimulator.SimDeviceType.iPhone-X
+    }
+}
+DEFAULT_IOS_RUNTIME=
+IOS_RUNTIME=
+when(!$IOS_RUNTIME) {
+    when($DEFAULT_IOS_RUNTIME) {
+        IOS_RUNTIME=$DEFAULT_IOS_RUNTIME
+    }
+    otherwise {
+        IOS_RUNTIME=com.apple.CoreSimulator.SimRuntime.iOS-12-1
+    }
+}
 when ($ARCH_I386) {
     TEST_IOS_DEVICE_TYPE_VALUE=com.apple.CoreSimulator.SimDeviceType.iPhone-5
     TEST_IOS_RUNTIME_TYPE_VALUE=com.apple.CoreSimulator.SimRuntime.iOS-10-3
 }
 otherwise {
-    TEST_IOS_DEVICE_TYPE_VALUE=$IOS_TYPE 
-    TEST_IOS_RUNTIME_TYPE_VALUE=$IOS_RUNTIME 
+    TEST_IOS_DEVICE_TYPE_VALUE=$IOS_TYPE
+    TEST_IOS_RUNTIME_TYPE_VALUE=$IOS_RUNTIME
 }
 
 # tag:java-specific
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index ca06f61eb9..30219eb85e 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -579,28 +579,28 @@ class Build(object):
     def is_ide_build_type(build_type):
         return build_type == 'nobuild'
 
-    def _configure_runtime_versions(self): 
-        res = subprocess.check_output(['xcrun', 'simctl', 'list', '--json', 'runtimes']) 
-        raw_object = json.loads(res) 
-        raw_object = raw_object['runtimes'] 
-        for runtime in raw_object: 
-            if runtime['isAvailable']: 
-                if "iOS" in runtime['identifier']: 
-                    emit('DEFAULT_IOS_RUNTIME', '{}'.format(runtime['identifier'])) 
- 
+    def _configure_runtime_versions(self):
+        res = subprocess.check_output(['xcrun', 'simctl', 'list', '--json', 'runtimes'])
+        raw_object = json.loads(res)
+        raw_object = raw_object['runtimes']
+        for runtime in raw_object:
+            if runtime['isAvailable']:
+                if "iOS" in runtime['identifier']:
+                    emit('DEFAULT_IOS_RUNTIME', '{}'.format(runtime['identifier']))
+
     def _get_toolchain_options(self):
         type_ = self.params['params']['type']
 
-        if self.params['params'].get('local') and type_ == 'xcode': 
+        if self.params['params'].get('local') and type_ == 'xcode':
+            detector = CompilerDetector()
+            detector.detect(self.params['params']['c_compiler'], self.params['params']['cxx_compiler'])
+            emit('LOCAL_XCODE_TOOLS', 'yes')
+            emit('XCODE', 'yes')
+            emit('ACTOOL_PATH', self.params['params']['actool'])
+            emit('IBTOOL_PATH', self.params['params']['ibtool'])
+            self._configure_runtime_versions()
+        elif type_ == 'system_cxx':
             detector = CompilerDetector()
-            detector.detect(self.params['params']['c_compiler'], self.params['params']['cxx_compiler']) 
-            emit('LOCAL_XCODE_TOOLS', 'yes') 
-            emit('XCODE', 'yes') 
-            emit('ACTOOL_PATH', self.params['params']['actool']) 
-            emit('IBTOOL_PATH', self.params['params']['ibtool']) 
-            self._configure_runtime_versions() 
-        elif type_ == 'system_cxx': 
-            detector = CompilerDetector() 
             detector.detect(self.params['params'].get('c_compiler'), self.params['params'].get('cxx_compiler'))
             type_ = detector.type
         else:
@@ -1264,22 +1264,22 @@ class GnuToolchain(Toolchain):
 
                 if target.is_yocto:
                     self.setup_sdk(project='build/platform/yocto_sdk/yocto_sdk', var='${YOCTO_SDK_ROOT_RESOURCE_GLOBAL}')
-            elif self.tc.params.get('local'): 
-                if target.is_apple: 
-                    if not tc.os_sdk_local: 
-                        if target.is_ios: 
-                            self.setup_sdk(project='build/platform/ios_sdk', var='${IOS_SDK_ROOT_RESOURCE_GLOBAL}') 
-                            self.platform_projects.append('build/platform/macos_system_stl') 
-                        if target.is_macos: 
-                            self.setup_sdk(project='build/platform/macos_sdk', var='${MACOS_SDK_RESOURCE_GLOBAL}') 
-                            self.platform_projects.append('build/platform/macos_system_stl') 
-                    else: 
-                        if target.is_iossim: 
-                            self.env.setdefault('SDKROOT', subprocess.check_output(['xcrun', '-sdk', 'iphonesimulator', '--show-sdk-path']).strip()) 
-                        elif target.is_ios: 
-                            self.env.setdefault('SDKROOT', subprocess.check_output(['xcrun', '-sdk', 'iphoneos', '--show-sdk-path']).strip()) 
-                        elif target.is_macos: 
-                            self.env.setdefault('SDKROOT', subprocess.check_output(['xcrun', '-sdk', 'macosx', '--show-sdk-path']).strip()) 
+            elif self.tc.params.get('local'):
+                if target.is_apple:
+                    if not tc.os_sdk_local:
+                        if target.is_ios:
+                            self.setup_sdk(project='build/platform/ios_sdk', var='${IOS_SDK_ROOT_RESOURCE_GLOBAL}')
+                            self.platform_projects.append('build/platform/macos_system_stl')
+                        if target.is_macos:
+                            self.setup_sdk(project='build/platform/macos_sdk', var='${MACOS_SDK_RESOURCE_GLOBAL}')
+                            self.platform_projects.append('build/platform/macos_system_stl')
+                    else:
+                        if target.is_iossim:
+                            self.env.setdefault('SDKROOT', subprocess.check_output(['xcrun', '-sdk', 'iphonesimulator', '--show-sdk-path']).strip())
+                        elif target.is_ios:
+                            self.env.setdefault('SDKROOT', subprocess.check_output(['xcrun', '-sdk', 'iphoneos', '--show-sdk-path']).strip())
+                        elif target.is_macos:
+                            self.env.setdefault('SDKROOT', subprocess.check_output(['xcrun', '-sdk', 'macosx', '--show-sdk-path']).strip())
 
     def setup_sdk(self, project, var):
         self.platform_projects.append(project)
@@ -2058,7 +2058,7 @@ class LD(Linker):
             "GENERATE_MF_CMD",
             '$YMAKE_PYTHON', '${input:"build/scripts/generate_mf.py"}',
             '--build-root $ARCADIA_BUILD_ROOT --module-name $REALPRJNAME -o ${output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME}',
-            '-t $MODULE_TYPE --ya-start-command-file -Ya,lics $LICENSE_NAMES -Ya,peers ${rootrel:PEERS} -Ya,credits ${input:CREDITS_TEXTS_FILE} $CREDITS_FLAGS --ya-end-command-file', 
+            '-t $MODULE_TYPE --ya-start-command-file -Ya,lics $LICENSE_NAMES -Ya,peers ${rootrel:PEERS} -Ya,credits ${input:CREDITS_TEXTS_FILE} $CREDITS_FLAGS --ya-end-command-file',
         )
         if is_positive("TIDY"):
             emit(
@@ -2763,7 +2763,7 @@ class MSVCLinker(MSVC, Linker):
 
         emit("GENERATE_MF_CMD", '$YMAKE_PYTHON ${input:"build/scripts/generate_mf.py"}',
              '--build-root $ARCADIA_BUILD_ROOT --module-name $REALPRJNAME -o ${output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME}',
-             '-t $MODULE_TYPE --ya-start-command-file -Ya,lics $LICENSE_NAMES -Ya,peers ${rootrel:PEERS} -Ya,credits ${input:CREDITS_TEXTS_FILE} $CREDITS_FLAGS --ya-end-command-file', 
+             '-t $MODULE_TYPE --ya-start-command-file -Ya,lics $LICENSE_NAMES -Ya,peers ${rootrel:PEERS} -Ya,credits ${input:CREDITS_TEXTS_FILE} $CREDITS_FLAGS --ya-end-command-file',
              )
 
         # we split srcs_global into two groups: libs and objs