From 9d832b4b6d8dda0d1d41ac8c5e6f675630f92599 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 16 Oct 2015 12:41:44 -0700 Subject: [PATCH 1/2] Fix TypeCatalogGen.exe dependencies NuGet packages referenced as dependencies needed to depend on buildtemp as well. --- scripts/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/Makefile b/scripts/Makefile index 499aead303..b03d2842fd 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -84,6 +84,8 @@ dotnetlibs/Microsoft.Management.Infrastructure.Native.dll: $(MI_STUBS) buildtemp MPATH=/usr/lib/mono/4.5/Facades REFLECTION_METADATA=buildtemp/System.Reflection.Metadata.1.0.22/lib/dotnet/System.Reflection.Metadata.dll COLLECTIONS_IMMUTABLE=buildtemp/System.Collections.Immutable.1.1.37/lib/dotnet/System.Collections.Immutable.dll +$(REFLECTION_METADATA): buildtemp +$(COLLECTIONS_IMMUTABLE): buildtemp buildtemp/TypeCatalogGen.exe: $(ADMIN_GIT_ROOT)/monad/nttargets/assemblies/core/PSAssemblyLoadContext/TypeCatalogGen/TypeCatalogGen.cs $(REFLECTION_METADATA) $(COLLECTIONS_IMMUTABLE) buildtemp $(MCS) -out:$@ -target:exe -pkg:dotnet $(addprefix -r:, $(REFLECTION_METADATA) $(COLLECTIONS_IMMUTABLE) $(MPATH)/System.Runtime.dll $(MPATH)/System.Reflection.Primitives.dll $(MPATH)/System.IO.dll) $< From a1009ffd4ac318b82ea90f55f21eb6896930a5c0 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 16 Oct 2015 14:37:46 -0700 Subject: [PATCH 2/2] Fix build of monad-native Moved recursive make into phony target. This is okay because the called make does not rebuild things. The calling make no longer flails about when trying to make the three monad-native targets. --- scripts/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index b03d2842fd..7171cbc7bd 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -116,9 +116,11 @@ $(LIBPS_BUILD)/Makefile: $(MONAD_NATIVE)/CMakeLists.txt cd $(LIBPS_BUILD) && cmake $(MONAD_NATIVE) NATIVE_BINARIES=libps.so monad_native host_cmdline -$(addprefix dotnetlibs/, $(NATIVE_BINARIES)): $(LIBPS_BUILD)/Makefile +$(addprefix dotnetlibs/, $(NATIVE_BINARIES)): monad-native + +monad-native: $(LIBPS_BUILD)/Makefile $(MAKE) -j -C $(LIBPS_BUILD) - cp $(addprefix $(LIBPS_BUILD)/, $(notdir $@)) dotnetlibs + cp $(addprefix $(LIBPS_BUILD)/, $(NATIVE_BINARIES)) dotnetlibs # C++ tests for monad-native - results in native-tests.xml # see https://github.com/google/googletest @@ -151,7 +153,7 @@ buildtemp: nuget.exe APP_BASE=exec_env/app_base .PHONY: $(APP_BASE) -$(APP_BASE): runps.sh $(POWERSHELL_RUN_TARGETS) +$(APP_BASE): runps.sh $(RUN_TARGETS) rm -rf $@ mkdir -p $(APP_BASE)/Modules cp $(ADMIN_GIT_ROOT)/monad/miscfiles/display/*.ps1xml $(APP_BASE)