diff options
| author | Rodrigo Kumpera <kumpera@gmail.com> | 2018-08-24 00:09:17 +0300 |
|---|---|---|
| committer | Rodrigo Kumpera <kumpera@gmail.com> | 2018-08-24 00:09:17 +0300 |
| commit | ec054f873c6269013c91cd3db8f831eafec0de97 (patch) | |
| tree | 5973bc6d4a6017a2c0942e45be9ee5a643a2c9b9 | |
| parent | f147414dd74547230dc289cb2fac98f72597885b (diff) | |
[wasm] Make the wasm sdk not depends on desktop sdk.
The issue was that packager.exe was using Mono.Cecil from net_4_x, which is only built/installed if the desktop sdk is built. We replace
Finally, we change the CI script to disable desktop as well to ensure we don't regress in that scenario.
| -rwxr-xr-x | scripts/ci/run-jenkins.sh | 1 | ||||
| -rw-r--r-- | sdks/wasm/Makefile | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index ee772408836..2c1693e04f7 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -145,6 +145,7 @@ if [[ ${CI_TAGS} == *'webassembly'* ]]; then echo "DISABLE_ANDROID=1" > sdks/Make.config echo "DISABLE_IOS=1" >> sdks/Make.config + echo "DISABLE_DESKTOP=1" >> sdks/Make.config ${TESTCMD} --label=runtimes --timeout=60m --fatal make -j4 -C sdks/builds package-wasm-interp ${TESTCMD} --label=bcl --timeout=60m --fatal make -j4 -C sdks/builds package-bcl ${TESTCMD} --label=wasm-build --timeout=60m --fatal make -j4 -C sdks/wasm build diff --git a/sdks/wasm/Makefile b/sdks/wasm/Makefile index 6df8f6ad561..1ada064794e 100644 --- a/sdks/wasm/Makefile +++ b/sdks/wasm/Makefile @@ -118,8 +118,9 @@ Simple.Dependency.dll: dependency.cs sample.dll: Simple.Dependency.dll sample.cs $(CSC) /debug:portable /noconfig /nostdlib /target:library -out:$@ /r:Simple.Dependency.dll /r:$(WASM_BCL_DIR)/mscorlib.dll /r:$(WASM_BCL_DIR)/System.Core.dll sample.cs -Mono.Cecil.dll: $(TOP)/sdks/out/bcl/net_4_x/Mono.Cecil.dll - cp $< $@ +Mono.Cecil.dll: Makefile + nuget install -version 0.10.0 Mono.Cecil + cp Mono.Cecil.0.10.0/lib/net40/Mono.Cecil.dll $@ # We use system csc as this is a desktop program packager.exe: packager.cs Mono.Cecil.dll @@ -236,7 +237,7 @@ package: build build-dbg-proxy cp Mono.WebAssembly.DebuggerProxy/bin/Debug/netstandard2.0/Mono.WebAssembly.DebuggerProxy.dll tmp/ cp Mono.WebAssembly.DebuggerProxy/bin/Debug/netstandard2.0/Mono.WebAssembly.DebuggerProxy.pdb tmp/ mkdir tmp/dbg-proxy - cp ProxyDriver/bin/Debug/netcoreapp2.1/* tmp/dbg-proxy/ + cp -r ProxyDriver/bin/Debug/netcoreapp2.1/ tmp/dbg-proxy/ (cd tmp; zip -r9 ../mono-wasm-$(shell git rev-parse --short HEAD).zip .) rm -rf tmp |