From 335f5b37922727a17c7abe5cc4b5be3613e517af Mon Sep 17 00:00:00 2001 From: Paul Allen Date: Fri, 16 Oct 2015 10:50:10 -0700 Subject: [PATCH 1/7] Update the omi and provider submodules so that they build --- src/monad-omi-provider | 2 +- src/omi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/monad-omi-provider b/src/monad-omi-provider index 7c7307925b..c78817be4b 160000 --- a/src/monad-omi-provider +++ b/src/monad-omi-provider @@ -1 +1 @@ -Subproject commit 7c7307925b81420bb6d8520a51bc759b4d52ea0a +Subproject commit c78817be4b9f488ad05184c733a69770a1d849aa diff --git a/src/omi b/src/omi index 1f81decc6a..f53150ab26 160000 --- a/src/omi +++ b/src/omi @@ -1 +1 @@ -Subproject commit 1f81decc6a74f1de619659a4dd8359b66814189b +Subproject commit f53150ab260c3ad4e5907d335c7963057d9ee322 From 36ff3d0678bd291c83dcd83e0ffe50bdfac88be8 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 16 Oct 2015 11:43:08 -0700 Subject: [PATCH 2/7] Add OMI targets to Makefile Recursively builds OMI and the TestShell provider. The OMI tests currently do not pass and so have not been added to `make test`. --- scripts/Makefile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scripts/Makefile b/scripts/Makefile index 499aead303..949762aeb2 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -224,6 +224,26 @@ trace: $(RUN_TARGETS) prepare run-debugclr: $(RUN_TARGETS) prepare PAL_DBG_CHANNELS="+LOADER.TRACE" $(APP_BASE)/runps-simple.sh get-location +# OMI +OMI=$(MONAD)/src/omi/Unix/ +OMI_FLAGS=--dev --enable-debug +$(OMI)/GNUmakefile: + cd $(OMI) && ./configure $(OMI_FLAGS) + +$(OMI)/output: $(OMI)/GNUmakefile + $(MAKE) -j -C $(OMI) + +omi: $(OMI)/output + +MONAD_PROVIDER=$(MONAD)/src/monad-omi-provider +$(OMI)/output/lib/libTestShell.so: omi + $(MAKE) -j -C $(MONAD_PROVIDER) + +psrp: $(OMI)/output/lib/libTestShell.so + +psrp-tests: omi + $(MAKE) -C $(OMI) tests + # quoting here is a bit special if strings are passed in, because lldb # seems to forward arguments strangely debug: $(RUN_TARGETS) prepare From 39a89925e07d3ff9859a74f37b0dba41acf9b6d3 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 16 Oct 2015 12:24:48 -0700 Subject: [PATCH 3/7] Fix OMI dependency for provider --- scripts/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index 949762aeb2..466523c73a 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -225,15 +225,15 @@ run-debugclr: $(RUN_TARGETS) prepare PAL_DBG_CHANNELS="+LOADER.TRACE" $(APP_BASE)/runps-simple.sh get-location # OMI -OMI=$(MONAD)/src/omi/Unix/ +OMI=$(MONAD)/src/omi/Unix OMI_FLAGS=--dev --enable-debug $(OMI)/GNUmakefile: cd $(OMI) && ./configure $(OMI_FLAGS) -$(OMI)/output: $(OMI)/GNUmakefile +$(OMI)/output/bin/omiserver: $(OMI)/GNUmakefile $(MAKE) -j -C $(OMI) -omi: $(OMI)/output +omi: $(OMI)/output/bin/omiserver MONAD_PROVIDER=$(MONAD)/src/monad-omi-provider $(OMI)/output/lib/libTestShell.so: omi From f7242038252e0145497b743b164a8ca322d70c8b Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 16 Oct 2015 12:25:17 -0700 Subject: [PATCH 4/7] Add cleaning targets for PSRP --- scripts/Makefile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index 466523c73a..efa21b852b 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -250,7 +250,16 @@ debug: $(RUN_TARGETS) prepare $(APP_BASE)/runps-simple-debug.sh get-location # Cleaning -.PHONY: clean-native clean cleanall +clean-provider: + $(MAKE) -j -C $(MONAD_PROVIDER) clean + +clean-omi: + -$(MAKE) -j -C $(OMI) clean + +distclean-omi: + -$(MAKE) -j -C $(OMI) distclean + +clean-psrp: clean-provider clean-omi clean-native: rm -rf $(LIBPS_BUILD) @@ -258,9 +267,11 @@ clean-native: clean: rm -rf dotnetlibs/* exec_env powershell.inc *-tests.xml -cleanall: clean clean-native +distclean: clean clean-native distclean-omi clean-provider rm -rf buildtemp +cleanall: distclean + # Shell-in-a-box Docker setup docker-build: From 61222055a660437c6e8fd1adc94d13ff61e3018e Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 16 Oct 2015 12:28:59 -0700 Subject: [PATCH 5/7] Ignore errors from clean targets --- scripts/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index efa21b852b..93f3431699 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -251,7 +251,7 @@ debug: $(RUN_TARGETS) prepare # Cleaning clean-provider: - $(MAKE) -j -C $(MONAD_PROVIDER) clean + -$(MAKE) -j -C $(MONAD_PROVIDER) clean clean-omi: -$(MAKE) -j -C $(OMI) clean @@ -262,13 +262,13 @@ distclean-omi: clean-psrp: clean-provider clean-omi clean-native: - rm -rf $(LIBPS_BUILD) + -rm -rf $(LIBPS_BUILD) clean: - rm -rf dotnetlibs/* exec_env powershell.inc *-tests.xml + -rm -rf dotnetlibs/* exec_env powershell.inc *-tests.xml distclean: clean clean-native distclean-omi clean-provider - rm -rf buildtemp + -rm -rf buildtemp cleanall: distclean From 4d63ee46d8636aff42b76cf25569ff3b3ce669be Mon Sep 17 00:00:00 2001 From: Paul Allen Date: Mon, 19 Oct 2015 15:27:53 -0700 Subject: [PATCH 6/7] Pick up omi fixes for options --- src/omi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/omi b/src/omi index f53150ab26..7ddc081ca0 160000 --- a/src/omi +++ b/src/omi @@ -1 +1 @@ -Subproject commit f53150ab260c3ad4e5907d335c7963057d9ee322 +Subproject commit 7ddc081ca010ac830ae09691a7f4f17244c6cd30 From 5e9085d013e51a8db8d2069cfeee7678431a9dcd Mon Sep 17 00:00:00 2001 From: Paul Allen Date: Mon, 19 Oct 2015 15:57:33 -0700 Subject: [PATCH 7/7] Added omi tests to master rule --- scripts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile b/scripts/Makefile index 93f3431699..050632d62b 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -214,7 +214,7 @@ pester-tests: $(RUN_TARGETS) prepare hashbang-tests: all prepare PATH=$(PATH):$(MONAD)/scripts/$(APP_BASE) $(MONAD)/scripts/3rdparty/hashbang/script.ps1 -test: native-tests xunit-tests pester-tests hashbang-tests +test: native-tests xunit-tests pester-tests hashbang-tests psrp-tests # debug/trace targets