diff options
author | Ryan Lucia <rylucia@microsoft.com> | 2020-01-30 07:47:46 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-30 07:47:46 +0300 |
commit | e3624d356baa0747a8178fb22472661f685ad3ce (patch) | |
tree | 491dac439c860f2311472fd6f210cd668f47c28d | |
parent | cf5204021b1c766c7c8016c4220c42c4286788b0 (diff) |
[wasm] Finish renaming mono.js to dotnet.js (#18623)
This work mostly happened a while back, but this commit finishes the job.
-rw-r--r-- | sdks/wasm/.gitignore | 2 | ||||
-rw-r--r-- | sdks/wasm/README.md | 8 | ||||
-rw-r--r-- | sdks/wasm/aot-profile/index.html | 2 | ||||
-rw-r--r-- | sdks/wasm/docs/getting-started/sample.md | 4 | ||||
-rw-r--r-- | sdks/wasm/docs/packager.md | 4 | ||||
-rw-r--r-- | sdks/wasm/sample.html | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/sdks/wasm/.gitignore b/sdks/wasm/.gitignore index 657e82143b5..cfa9d2b35df 100644 --- a/sdks/wasm/.gitignore +++ b/sdks/wasm/.gitignore @@ -2,7 +2,7 @@ node_modules package-lock.json .stamp* *.wasm -mono.js +dotnet.js Mono.Cecil* emsdk_env.sh builds/threads-debug diff --git a/sdks/wasm/README.md b/sdks/wasm/README.md index 5fdc69c185e..b8438c19f42 100644 --- a/sdks/wasm/README.md +++ b/sdks/wasm/README.md @@ -10,7 +10,7 @@ |--- debug - Debug build of the runtime. |--- corebindings.o - Runtime linked lib - NOT DISTRIBUTED |--- driver.o - Runtime linked lib - NOT DISTRIBUTED - |--- mono.js - Mono WebAssembly implementations + |--- dotnet.js - Mono WebAssembly implementations |--- dotnet.wasm - Mono WebAssembly implementations |--- dotnet.wasm.map - Mono WebAssembly implementations |--- zlib-helper.o - Runtime linked lib - NOT DISTRIBUTED @@ -47,9 +47,9 @@ ``` - _Note:_ In the above directories the only files that need to be distributed are the ones prefixed with **mono.***. + _Note:_ In the above directories the only files that need to be distributed are the ones prefixed with **dotnet.***. - _Note:_ The **`mono.worker.js`** and **`mono.js.mem`** files must be deployed with the rest of the generated code files if using the runtimes for threads. + _Note:_ The **`dotnet.worker.js`** and **`dotnet.js.mem`** files must be deployed with the rest of the generated code files if using the runtimes for threads. - Core libraries to be used with the runtime. Generated by the bcl build step. @@ -233,7 +233,7 @@ During the main build two directories will be created: ``` -_Note:_ The **`mono.worker.js`** and **`mono.js.mem`** files must be deployed with the rest of the generated code files if using these two runtimes. +_Note:_ The **`dotnet.worker.js`** and **`dotnet.js.mem`** files must be deployed with the rest of the generated code files if using these two runtimes. # Dynamic Linking support diff --git a/sdks/wasm/aot-profile/index.html b/sdks/wasm/aot-profile/index.html index 0c3bc03722a..5946746e805 100644 --- a/sdks/wasm/aot-profile/index.html +++ b/sdks/wasm/aot-profile/index.html @@ -11,7 +11,7 @@ <script type="text/javascript" src="mono-config.js"></script> <script type="text/javascript" src="runtime.js"></script> - <script defer src="mono.js"></script> + <script defer src="dotnet.js"></script> </body> </html>
\ No newline at end of file diff --git a/sdks/wasm/docs/getting-started/sample.md b/sdks/wasm/docs/getting-started/sample.md index 1676bc79920..bd1f4c96f3d 100644 --- a/sdks/wasm/docs/getting-started/sample.md +++ b/sdks/wasm/docs/getting-started/sample.md @@ -58,8 +58,8 @@ You should now have the following directory structure |--- publish // Output from the `packager.exe` application |--- managed // Where to find the managed assemblies generated by packager.exe |--- mono-config.js // Configuration file referenced in `sample.html` and `runtime.js` - |--- mono.js // Mono WebAssembly implementations - |--- mono.wasm // Mono WebAssembly implementations + |--- dotnet.js // Mono WebAssembly implementations + |--- dotnet.wasm // Mono WebAssembly implementations |--- runtime.js // Handles the loading of the Mono WebAssembly modules |--- sample.html // sample html file |--- server.py // python test server diff --git a/sdks/wasm/docs/packager.md b/sdks/wasm/docs/packager.md index c1aa49a0341..7b43504c490 100644 --- a/sdks/wasm/docs/packager.md +++ b/sdks/wasm/docs/packager.md @@ -160,9 +160,9 @@ Steps of execution are: [27/46] cp linker-out/System.Numerics.dll ilstrip-out/System.Numerics.dll; mono-cil-strip ilstrip-out/System.Numerics.dll Mono CIL Stripper ``` -1. The WebAssembly modules mono.js, mono.wasm etc are then generated. +1. The WebAssembly modules dotnet.js, dotnet.wasm etc are then generated. ``` bash - emcc -Oz -g -s EMULATED_FUNCTION_POINTERS=1 -s DISABLE_EXCEPTION_CATCHING=0 -s ASSERTIONS=1 -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s BINARYEN=1 -s "BINARYEN_TRAP_MODE='clamp'" -s TOTAL_MEMORY=134217728 -s ALIASING_FUNCTION_POINTERS=0 -s NO_EXIT_RUNTIME=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s "EXTRA_EXPORTED_RUNTIME_METHODS=['ccall', 'cwrap', 'setValue', 'getValue', 'UTF8ToString']" -s "EXPORTED_FUNCTIONS=['___cxa_is_pointer_type', '___cxa_can_catch']" -o bin/aot-mini/mono.js --js-library sdks/wasm/library_mono.js --js-library sdks/wasm/binding_support.js --js-library sdks/wasm/dotnet_support.js driver.o mini_tests.dll.bc mscorlib.dll.bc System.dll.bc Mono.Security.dll.bc System.Xml.dll.bc System.Numerics.dll.bc System.Core.dll.bc nunitlite.dll.bc aot-dummy.dll.bc sdks/out/wasm-runtime-release/lib/libmonosgen-2.0.a sdks/out/wasm-runtime-release/lib/libmono-native.a' + emcc -Oz -g -s EMULATED_FUNCTION_POINTERS=1 -s DISABLE_EXCEPTION_CATCHING=0 -s ASSERTIONS=1 -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s BINARYEN=1 -s "BINARYEN_TRAP_MODE='clamp'" -s TOTAL_MEMORY=134217728 -s ALIASING_FUNCTION_POINTERS=0 -s NO_EXIT_RUNTIME=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s "EXTRA_EXPORTED_RUNTIME_METHODS=['ccall', 'cwrap', 'setValue', 'getValue', 'UTF8ToString']" -s "EXPORTED_FUNCTIONS=['___cxa_is_pointer_type', '___cxa_can_catch']" -o bin/aot-mini/dotnet.js --js-library sdks/wasm/library_mono.js --js-library sdks/wasm/binding_support.js --js-library sdks/wasm/dotnet_support.js driver.o mini_tests.dll.bc mscorlib.dll.bc System.dll.bc Mono.Security.dll.bc System.Xml.dll.bc System.Numerics.dll.bc System.Core.dll.bc nunitlite.dll.bc aot-dummy.dll.bc sdks/out/wasm-runtime-release/lib/libmonosgen-2.0.a sdks/out/wasm-runtime-release/lib/libmono-native.a' ``` ### Example 1: ``` bash diff --git a/sdks/wasm/sample.html b/sdks/wasm/sample.html index 1dbd91de56d..8117ef8ae6d 100644 --- a/sdks/wasm/sample.html +++ b/sdks/wasm/sample.html @@ -60,6 +60,6 @@ </script> <script type="text/javascript" src="mono-config.js"></script> <script type="text/javascript" src="runtime.js"></script> - <script async type="text/javascript" src="mono.js"></script> + <script async type="text/javascript" src="dotnet.js"></script> </body> </html>
\ No newline at end of file |