From d12052cdc01f6eeb5aaa0c5ac025f92452590d98 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 2 Nov 2015 15:52:50 -0800 Subject: [PATCH] Move custom host Makefile out of monad-build --- src/host/host.mk | 18 ++++++++++++++++++ src/monad-build | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/host/host.mk diff --git a/src/host/host.mk b/src/host/host.mk new file mode 100644 index 000000000..e2676fb4d --- /dev/null +++ b/src/host/host.mk @@ -0,0 +1,18 @@ +# This is the makefile for all kinds of powershell hosts +# +# Currently there is powershell-run.exe, which is a very generic interactive and +# non-interactive host + +POWERSHELL_RUN_FOLDER=$(MONAD)/src/powershell-run +POWERSHELL_RUN_SRCS=$(addprefix $(POWERSHELL_RUN_FOLDER)/, main.cs host.cs ui.cs rawui.cs readline.cs powershell-run.assembly-info.cs) +POWERSHELL_SIMPLE_SRCS=$(addprefix $(POWERSHELL_RUN_FOLDER)/, powershell-simple.cs powershell-simple.assembly-info.cs) + +# direct dependencies to be linked in +POWERSHELL_RUN_DEPS=$(addprefix $(PSLIB)/, System.Management.Automation.dll Microsoft.PowerShell.Commands.Management.dll $(ASSEMBLY_LOAD_CONTEXT_TARGET)) +POWERSHELL_RUN_REFS=$(addprefix -r:, $(POWERSHELL_RUN_DEPS)) + +$(PSLIB)/powershell-run.exe: $(POWERSHELL_RUN_SRCS) $(POWERSHELL_RUN_DEPS) + $(CSC) -out:$@ -noconfig -nostdlib -target:exe $(POWERSHELL_RUN_REFS) $(COREREF) $(POWERSHELL_RUN_SRCS) + +$(PSLIB)/powershell-simple.exe: $(POWERSHELL_SIMPLE_SRCS) $(POWERSHELL_RUN_DEPS) + $(CSC) -out:$@ -noconfig -nostdlib -target:exe $(POWERSHELL_RUN_REFS) $(COREREF) $(POWERSHELL_SIMPLE_SRCS) diff --git a/src/monad-build b/src/monad-build index 2b2ea2820..658ea2625 160000 --- a/src/monad-build +++ b/src/monad-build @@ -1 +1 @@ -Subproject commit 2b2ea2820b2dfce1742e4e81023dde9c324f9fa9 +Subproject commit 658ea2625dbeecdd8be73aef16d5497292ee71e6