Skip to content

Commit a2dc067

Browse files
authored
Remove unused substitutions. NFC (#1662)
The last usage of `%MSBuildPlatformsDir%` was removed in #395. The last usage of `%cmake_build_type_on_win%` was removed in #1325.
1 parent ea85084 commit a2dc067

1 file changed

Lines changed: 0 additions & 17 deletions

File tree

emsdk.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,19 +1825,6 @@ def generate_em_config(active_tools, permanently_activate, system):
18251825
print(' echo \'source "%s"\' >> %s' % (emsdk_env, shell_config_file))
18261826

18271827

1828-
def find_msbuild_dir():
1829-
program_files = os.getenv('ProgramFiles', 'C:/Program Files')
1830-
program_files_x86 = os.getenv('ProgramFiles(x86)', 'C:/Program Files (x86)')
1831-
MSBUILDX86_DIR = os.path.join(program_files_x86, "MSBuild/Microsoft.Cpp/v4.0/Platforms")
1832-
MSBUILD_DIR = os.path.join(program_files, "MSBuild/Microsoft.Cpp/v4.0/Platforms")
1833-
if os.path.exists(MSBUILDX86_DIR):
1834-
return MSBUILDX86_DIR
1835-
if os.path.exists(MSBUILD_DIR):
1836-
return MSBUILD_DIR
1837-
# No MSbuild installed.
1838-
return ''
1839-
1840-
18411828
class Tool:
18421829
def __init__(self, data):
18431830
# Convert the dictionary representation of the tool in 'data' to members of
@@ -1859,10 +1846,6 @@ def __repr__(self):
18591846
return self.name
18601847

18611848
def expand_vars(self, str):
1862-
if WINDOWS and '%MSBuildPlatformsDir%' in str:
1863-
str = str.replace('%MSBuildPlatformsDir%', find_msbuild_dir())
1864-
if '%cmake_build_type_on_win%' in str:
1865-
str = str.replace('%cmake_build_type_on_win%', (decide_cmake_build_type(self) + '/') if WINDOWS else '')
18661849
if '%installation_dir%' in str:
18671850
str = str.replace('%installation_dir%', sdk_path(self.installation_dir()))
18681851
if '%macos_app_bundle_prefix%' in str:

0 commit comments

Comments
 (0)