Skip to content

Commit

Permalink
fix: Adjust python encoding
Browse files Browse the repository at this point in the history
  • Loading branch information
jeromelaban committed Jul 16, 2020
1 parent ed306da commit 3f2c153
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
parameters:
jobName: Linux_netcore3_1
netcore_version: 3.1.x
linux_container: unoplatform/wasm-build:2.1.1
linux_container: unoplatform/wasm-build:2.3

- job: macOS

Expand Down
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ During the first use of WSL, if the environment is not properly setup, you will

The emscripten installation is automatically done as part of the build.

The installation of emscripten is by default in the project's `obj` folder, but can be globally overriden by setting the `WASMSHELL_EMSDK` environment variable.
The boostrapper uses its own installation of emscripten, installed by default in `$HOME/.uno/emsdk` in the WSL filesystem. This can be globally overriden by setting the `WASMSHELL_WSLEMSDK` environment variable.

### Special considerations for CI servers (GitHub Actions, Azure Devops)
When building an application on Windows based CI servers, WSL is generally not enabled in base images. This can cause builds to fail if they require the use of static linking and/or AOT.
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Wasm.Bootstrap/Packager/packager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ int Run (string[] args) {
ninja.WriteLine ("cross = $runtimepack_dir/native/cross/mono-aot-cross");
else
ninja.WriteLine ("cross = $mono_sdkdir/wasm-cross-release/bin/wasm32-unknown-none-mono-sgen");
ninja.WriteLine ("emcc = source $emsdk_env && emcc");
ninja.WriteLine ("emcc = source $emsdk_env && PYTHONUTF8=1 LC_ALL=C.UTF-8 emcc");
ninja.WriteLine ("wasm_opt = $emscripten_sdkdir/upstream/bin/wasm-opt");
ninja.WriteLine ($"emcc_flags = -Oz -g {emcc_flags}-s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_TABLE_GROWTH=1 -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_MEMORY=134217728 -s NO_EXIT_RUNTIME=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s \\\"EXTRA_EXPORTED_RUNTIME_METHODS=[\'ccall\', \'cwrap\', \'setValue\', \'getValue\', \'UTF8ToString\', \'addFunction\']\\\" -s \\\"EXPORTED_FUNCTIONS=[\'___cxa_is_pointer_type\', \'___cxa_can_catch\']\\\" -s \\\"DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=[\'setThrew\', \'memset\']\\\"");
ninja.WriteLine ($"aot_base_args = llvmonly,asmonly,no-opt,static,direct-icalls,deterministic,{aot_args}");
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Wasm.Bootstrap/ShellTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ private void RunPackager()
throw new Exception("Failed to generate wasm layout (More details are available in diagnostics mode or using the MSBuild /bl switch)");
}

var ninjaResult = RunProcess("ninja", "-j 1", workAotPath);
var ninjaResult = RunProcess("ninja", "", workAotPath);

if (ninjaResult.exitCode != 0)
{
Expand Down

0 comments on commit 3f2c153

Please sign in to comment.