From 58cb4fce5c2ccfe1165023e4c9ec2c6b4afce183 Mon Sep 17 00:00:00 2001 From: Peter Honeder Date: Wed, 10 Jun 2015 14:01:04 -0700 Subject: [PATCH] added run-debugclr target that uses the debug build of CoreCLR --- scripts/Makefile | 13 ++++++++++++- src/monad-ext | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index 92a8d1338..30c0d0384 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -146,7 +146,7 @@ prepare: nuget install System.Collections.Immutable nuget install Microsoft.Net.ToolsetCompilers -pre -run: dotnetlibs/powershell-run.exe dotnetlibs/corerun dotnetlibs/Microsoft.PowerShell.Commands.Management.dll dotnetlibs/Microsoft.PowerShell.Commands.Utility.dll +prepare-exec_env: rm -rf exec_env mkdir exec_env cp -r ../src/monad_app_base/app_base exec_env @@ -154,6 +154,10 @@ run: dotnetlibs/powershell-run.exe dotnetlibs/corerun dotnetlibs/Microsoft.Power cp -r dotnetlibs/*.exe exec_env/app_base cp -r dotnetlibs/lib* exec_env/app_base cp -r dotnetlibs/corerun exec_env/app_base + +run: dotnetlibs/powershell-run.exe dotnetlibs/corerun dotnetlibs/Microsoft.PowerShell.Commands.Management.dll dotnetlibs/Microsoft.PowerShell.Commands.Utility.dll prepare-exec_env + # check if corerun is the right one (could be the debug version) + if ! diff dotnetlibs/corerun $(MONAD_EXT)/coreclr/Release/corerun; then cp -r $(MONAD_EXT)/coreclr/Release/* dotnetlibs; fi #cd exec_env/app_base && PSMODULEPATH=. LD_LIBRARY_PATH=. ./corerun powershell-run.exe "\"test blah\"" #cd exec_env/app_base && PSMODULEPATH=. LD_LIBRARY_PATH=. ./corerun powershell-run.exe "get-module -listavailable" #cd exec_env/app_base && PSMODULEPATH=. LD_LIBRARY_PATH=. ./corerun powershell-run.exe "get-module -listavailable -all" @@ -161,6 +165,13 @@ run: dotnetlibs/powershell-run.exe dotnetlibs/corerun dotnetlibs/Microsoft.Power cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=. ./corerun powershell-run.exe "import-module -name Microsoft.PowerShell.Utility" '"a","b","c","a","a" | Select-Object -Unique' #LD_LIBRARY_PATH=exec_env/app_base exec_env/app_base/corerun exec_env/app_base/powershell-run.exe "\"Hello World!\" |out-default" +prepare-debugclr: + cp -r $(MONAD_EXT)/coreclr/Debug/* dotnetlibs + +run-debugclr: dotnetlibs/powershell-run.exe prepare-debugclr dotnetlibs/corerun dotnetlibs/Microsoft.PowerShell.Commands.Management.dll dotnetlibs/Microsoft.PowerShell.Commands.Utility.dll prepare-exec_env + #cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=. ./corerun powershell-run.exe "import-module -name Microsoft.PowerShell.Utility" '"a","b","c","a","a" | Select-Object -Unique' + cd exec_env/app_base && PAL_DBG_CHANNELS="+LOADER.TRACE" PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=. ./corerun powershell-run.exe "\"test blah\"" + trace: cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=. strace -e trace=file ./corerun powershell-run.exe "import-module -name Microsoft.PowerShell.Utility" '"a","b","c","a","a" | Select-Object -Unique' diff --git a/src/monad-ext b/src/monad-ext index fd4beee8d..9fb89ce1d 160000 --- a/src/monad-ext +++ b/src/monad-ext @@ -1 +1 @@ -Subproject commit fd4beee8d70dba4e97a79fd74b975c6118f0968a +Subproject commit 9fb89ce1df302c38fff19acc47f8974d495b6814