aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsay <say@yandex-team.com>2023-12-04 16:16:31 +0300
committersay <say@yandex-team.com>2023-12-05 03:06:48 +0300
commit3f8b89a2f9ee6a209520c520ddb36d5be5e9a991 (patch)
treed07fd2f1363b81b4523c79a89135c5635aba8e6b
parent1ff2a79206cf2fd76d1725a55d800a8366d2ba46 (diff)
downloadydb-3f8b89a2f9ee6a209520c520ddb36d5be5e9a991.tar.gz
Move macos and msvc platforms to internal
-rw-r--r--build/internal/platform/macos_sdk/ya.make (renamed from build/platform/macos_sdk/ya.make)0
-rw-r--r--build/internal/platform/macos_system_stl/ya.make (renamed from build/platform/macos_system_stl/ya.make)0
-rw-r--r--build/internal/platform/msvc/ya.make (renamed from build/platform/msvc/ya.make)0
-rwxr-xr-xbuild/ymake_conf.py16
-rw-r--r--ydb/apps/ydb/ya.make1
-rw-r--r--ydb/apps/ydbd/ya.make1
6 files changed, 10 insertions, 8 deletions
diff --git a/build/platform/macos_sdk/ya.make b/build/internal/platform/macos_sdk/ya.make
index 283c95430a..283c95430a 100644
--- a/build/platform/macos_sdk/ya.make
+++ b/build/internal/platform/macos_sdk/ya.make
diff --git a/build/platform/macos_system_stl/ya.make b/build/internal/platform/macos_system_stl/ya.make
index 1659a184ba..1659a184ba 100644
--- a/build/platform/macos_system_stl/ya.make
+++ b/build/internal/platform/macos_system_stl/ya.make
diff --git a/build/platform/msvc/ya.make b/build/internal/platform/msvc/ya.make
index 7472be4a00..7472be4a00 100644
--- a/build/platform/msvc/ya.make
+++ b/build/internal/platform/msvc/ya.make
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index ecc7546f95..4047beedb0 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -1268,10 +1268,10 @@ class GnuToolchain(Toolchain):
if target.is_apple:
if target.is_ios:
self.setup_xcode_sdk(project='build/platform/ios_sdk', var='${IOS_SDK_ROOT_RESOURCE_GLOBAL}')
- self.platform_projects.append('build/platform/macos_system_stl')
+ self.platform_projects.append('build/internal/platform/macos_system_stl')
if target.is_macos:
- self.setup_xcode_sdk(project='build/platform/macos_sdk', var='${MACOS_SDK_RESOURCE_GLOBAL}')
- self.platform_projects.append('build/platform/macos_system_stl')
+ self.setup_xcode_sdk(project='build/internal/platform/macos_sdk', var='${MACOS_SDK_RESOURCE_GLOBAL}')
+ self.platform_projects.append('build/internal/platform/macos_system_stl')
if target.is_linux:
if not tc.os_sdk_local:
@@ -1294,10 +1294,10 @@ class GnuToolchain(Toolchain):
if not tc.os_sdk_local:
if target.is_ios:
self.setup_xcode_sdk(project='build/platform/ios_sdk', var='${IOS_SDK_ROOT_RESOURCE_GLOBAL}')
- self.platform_projects.append('build/platform/macos_system_stl')
+ self.platform_projects.append('build/internal/platform/macos_system_stl')
if target.is_macos:
- self.setup_xcode_sdk(project='build/platform/macos_sdk', var='${MACOS_SDK_RESOURCE_GLOBAL}')
- self.platform_projects.append('build/platform/macos_system_stl')
+ self.setup_xcode_sdk(project='build/internal/platform/macos_sdk', var='${MACOS_SDK_RESOURCE_GLOBAL}')
+ self.platform_projects.append('build/internal/platform/macos_system_stl')
else:
if target.is_iossim:
self.env.setdefault('SDKROOT', subprocess.check_output(['xcrun', '-sdk', 'iphonesimulator', '--show-sdk-path']).strip())
@@ -1844,7 +1844,7 @@ class MSVCToolchain(MSVC, Toolchain):
MSVC.__init__(self, tc, build)
if self.tc.from_arcadia and not self.tc.ide_msvs:
- self.platform_projects.append('build/platform/msvc')
+ self.platform_projects.append('build/internal/platform/msvc')
if tc.under_wine:
self.platform_projects.append('build/platform/wine')
@@ -2398,7 +2398,7 @@ class Cuda(object):
}
if not self.build.tc.ide_msvs:
- self.peerdirs.append('build/platform/msvc')
+ self.peerdirs.append('build/internal/platform/msvc')
self.cuda_host_compiler_env.value = format_env(env)
self.cuda_host_msvc_version.value = vc_version
return '%(Y_VC_Root)s/bin/HostX64/x64/cl.exe' % env
diff --git a/ydb/apps/ydb/ya.make b/ydb/apps/ydb/ya.make
index dc11518ba5..11edde0756 100644
--- a/ydb/apps/ydb/ya.make
+++ b/ydb/apps/ydb/ya.make
@@ -29,6 +29,7 @@ ENDIF()
CHECK_DEPENDENT_DIRS(
ALLOW_ONLY
PEERDIRS
+ build/internal/platform
build/platform
certs
contrib
diff --git a/ydb/apps/ydbd/ya.make b/ydb/apps/ydbd/ya.make
index 10c9952b8e..4f15c464fb 100644
--- a/ydb/apps/ydbd/ya.make
+++ b/ydb/apps/ydbd/ya.make
@@ -78,6 +78,7 @@ CHECK_DEPENDENT_DIRS(
ALLOW_ONLY
PEERDIRS
arc/api/public
+ build/internal/platform
build/platform
certs
contrib