diff --git a/scripts/Makefile b/scripts/Makefile index 499aead303..7171cbc7bd 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) $< @@ -114,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 @@ -149,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)