admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the optimizer build path optionally specified so that it points to correct location on OSX and Linux as well.

Browse Source
This commit is contained in:
Jukka Jylänki
2015-01-19 09:42:00 +02:00
parent b79fb12ec7
commit a9ba3a857a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
emsdk
View File

@@ -674,6 +674,8 @@ class Tool:
def expand_vars(self, str): def expand_vars(self, str):
if WINDOWS and '%MSBuildPlatformsDir%' in str: if WINDOWS and '%MSBuildPlatformsDir%' in str:
str = str.replace('%MSBuildPlatformsDir%', find_msbuild_dir()) str = str.replace('%MSBuildPlatformsDir%', find_msbuild_dir())
if '%cmake_build_type%' in str:
str = str.replace('%cmake_build_type%', (self.cmake_build_type + '/') if WINDOWS else '')
if '%installation_dir%' in str: if '%installation_dir%' in str:
str = str.replace('%installation_dir%', sdk_path(self.installation_dir())) str = str.replace('%installation_dir%', sdk_path(self.installation_dir()))
str = str.replace('%.exe%', '.exe' if WINDOWS else '') str = str.replace('%.exe%', '.exe' if WINDOWS else '')

4
emsdk_manifest.json
View File

@@ -439,7 +439,7 @@
"version": "incoming", "version": "incoming",
"url": "git://github.com/kripken/emscripten.git", "url": "git://github.com/kripken/emscripten.git",
"git_branch": "incoming", "git_branch": "incoming",
"activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/tools/optimizer_build/RelWithDebInfo/optimizer%.exe%'", "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/tools/optimizer_build/%cmake_build_type%optimizer%.exe%'",
"activated_path": "%installation_dir%", "activated_path": "%installation_dir%",
"activated_env": "EMSCRIPTEN=%installation_dir%", "activated_env": "EMSCRIPTEN=%installation_dir%",
"cmake_build_type": "RelWithDebInfo", "cmake_build_type": "RelWithDebInfo",
@@ -450,7 +450,7 @@
"version": "master", "version": "master",
"url": "git://github.com/kripken/emscripten.git", "url": "git://github.com/kripken/emscripten.git",
"git_branch": "master", "git_branch": "master",
"activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/tools/optimizer_build/Release/optimizer%.exe%'", "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/tools/optimizer_build/%cmake_build_type%optimizer%.exe%'",
"activated_path": "%installation_dir%", "activated_path": "%installation_dir%",
"activated_env": "EMSCRIPTEN=%installation_dir%", "activated_env": "EMSCRIPTEN=%installation_dir%",
"cmake_build_type": "Release", "cmake_build_type": "Release",