From 299083e1edec4da4b891c61a244f943556fe636c Mon Sep 17 00:00:00 2001 From: Peter Honeder Date: Wed, 10 Jun 2015 13:24:24 -0700 Subject: [PATCH] updated makefiles to newly generated versions of linux-only makefiles without the windows build rules, removed hack from master Makefile --- scripts/.gitignore | 5 +++++ scripts/Makefile | 3 --- scripts/commands-management.mk | 12 ------------ scripts/commands-utility.mk | 12 ------------ scripts/management-infrastructure.mk | 12 ------------ scripts/system-automation.mk | 12 ------------ 6 files changed, 5 insertions(+), 51 deletions(-) diff --git a/scripts/.gitignore b/scripts/.gitignore index 1958eff97..f84ff254e 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -14,3 +14,8 @@ xunit.runner.console.*/ TypeCatalogGen.exe System.Collections.Immutable.dll System.Reflection.Metadata.dll +commands-management-win.mk +commands-utility-win.mk +management-infrastructure-win.mk +system-automation-win.mk +CorePsTypeCatalog.cs diff --git a/scripts/Makefile b/scripts/Makefile index f256bf899..92a8d1338 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -145,9 +145,6 @@ prepare: nuget install System.Reflection.Metadata nuget install System.Collections.Immutable nuget install Microsoft.Net.ToolsetCompilers -pre - # this is a total hack (TODO linux), it's just needed because those .cs files are generated on windows, - # in fact the better solution probably is to eliminate the make rule for the linux builds - touch gen/*/*.cs run: dotnetlibs/powershell-run.exe dotnetlibs/corerun dotnetlibs/Microsoft.PowerShell.Commands.Management.dll dotnetlibs/Microsoft.PowerShell.Commands.Utility.dll rm -rf exec_env diff --git a/scripts/commands-management.mk b/scripts/commands-management.mk index 62ea46433..91d2266e9 100644 --- a/scripts/commands-management.mk +++ b/scripts/commands-management.mk @@ -134,21 +134,9 @@ COMMANDS_MANAGEMENT_RES_REF=\ -resource:gen/COMMANDS_MANAGEMENT/NavigationResources.resources \ -# this command below needs the make variable SHELL to be set to "cmd", this is best done -# as a command line option to make -$(COMMANDS_MANAGEMENT_RES_GEN_PATH)/%.resources: $(COMMANDS_MANAGEMENT_RES_BASE_PATH)/%.resx - mkdir $(COMMANDS_MANAGEMENT_RES_GEN_PATH_WIN) || exit /b 0 - resgen /useSourcePath $< $@ - -$(COMMANDS_MANAGEMENT_RES_GEN_PATH)/%.cs: $(COMMANDS_MANAGEMENT_RES_GEN_PATH)/%.resources - resgen /useSourcePath /str:cs $< - sed -i -- 's/using System;/using System;\r\nusing System.Reflection;/g' $@ - sed -i -- 's/)\.Assembly/).GetTypeInfo().Assembly/g' $@ - COMMANDS_MANAGEMENT_make_rule_RES_SRCS: $(COMMANDS_MANAGEMENT_RES_SRCS) COMMANDS_MANAGEMENT_make_rule_RES_CS_SRCS: $(COMMANDS_MANAGEMENT_RES_CS_SRCS) COMMANDS_MANAGEMENT_TARGET=Microsoft.PowerShell.Commands.Management - diff --git a/scripts/commands-utility.mk b/scripts/commands-utility.mk index 231df93f0..d82516aef 100644 --- a/scripts/commands-utility.mk +++ b/scripts/commands-utility.mk @@ -224,21 +224,9 @@ COMMANDS_UTILITY_RES_REF=\ -resource:gen/COMMANDS_UTILITY/AliasCommandStrings.resources \ -# this command below needs the make variable SHELL to be set to "cmd", this is best done -# as a command line option to make -$(COMMANDS_UTILITY_RES_GEN_PATH)/%.resources: $(COMMANDS_UTILITY_RES_BASE_PATH)/%.resx - mkdir $(COMMANDS_UTILITY_RES_GEN_PATH_WIN) || exit /b 0 - resgen /useSourcePath $< $@ - -$(COMMANDS_UTILITY_RES_GEN_PATH)/%.cs: $(COMMANDS_UTILITY_RES_GEN_PATH)/%.resources - resgen /useSourcePath /str:cs $< - sed -i -- 's/using System;/using System;\r\nusing System.Reflection;/g' $@ - sed -i -- 's/)\.Assembly/).GetTypeInfo().Assembly/g' $@ - COMMANDS_UTILITY_make_rule_RES_SRCS: $(COMMANDS_UTILITY_RES_SRCS) COMMANDS_UTILITY_make_rule_RES_CS_SRCS: $(COMMANDS_UTILITY_RES_CS_SRCS) COMMANDS_UTILITY_TARGET=Microsoft.PowerShell.Commands.Utility - diff --git a/scripts/management-infrastructure.mk b/scripts/management-infrastructure.mk index 5daf3d257..cb8a536cf 100644 --- a/scripts/management-infrastructure.mk +++ b/scripts/management-infrastructure.mk @@ -196,21 +196,9 @@ MAN_INFRA_RES_CS_SRCS=\ MAN_INFRA_RES_REF=\ -# this command below needs the make variable SHELL to be set to "cmd", this is best done -# as a command line option to make -$(MAN_INFRA_RES_GEN_PATH)/%.resources: $(MAN_INFRA_RES_BASE_PATH)/%.resx - mkdir $(MAN_INFRA_RES_GEN_PATH_WIN) || exit /b 0 - resgen /useSourcePath $< $@ - -$(MAN_INFRA_RES_GEN_PATH)/%.cs: $(MAN_INFRA_RES_GEN_PATH)/%.resources - resgen /useSourcePath /str:cs $< - sed -i -- 's/using System;/using System;\r\nusing System.Reflection;/g' $@ - sed -i -- 's/)\.Assembly/).GetTypeInfo().Assembly/g' $@ - MAN_INFRA_make_rule_RES_SRCS: $(MAN_INFRA_RES_SRCS) MAN_INFRA_make_rule_RES_CS_SRCS: $(MAN_INFRA_RES_CS_SRCS) MAN_INFRA_TARGET=Microsoft.Management.Infrastructure - diff --git a/scripts/system-automation.mk b/scripts/system-automation.mk index edd00b591..19306bb71 100644 --- a/scripts/system-automation.mk +++ b/scripts/system-automation.mk @@ -1298,21 +1298,9 @@ SYS_AUTO_RES_REF=\ -resource:gen/SYS_AUTO/Modules.resources \ -# this command below needs the make variable SHELL to be set to "cmd", this is best done -# as a command line option to make -$(SYS_AUTO_RES_GEN_PATH)/%.resources: $(SYS_AUTO_RES_BASE_PATH)/%.resx - mkdir $(SYS_AUTO_RES_GEN_PATH_WIN) || exit /b 0 - resgen /useSourcePath $< $@ - -$(SYS_AUTO_RES_GEN_PATH)/%.cs: $(SYS_AUTO_RES_GEN_PATH)/%.resources - resgen /useSourcePath /str:cs $< - sed -i -- 's/using System;/using System;\r\nusing System.Reflection;/g' $@ - sed -i -- 's/)\.Assembly/).GetTypeInfo().Assembly/g' $@ - SYS_AUTO_make_rule_RES_SRCS: $(SYS_AUTO_RES_SRCS) SYS_AUTO_make_rule_RES_CS_SRCS: $(SYS_AUTO_RES_CS_SRCS) SYS_AUTO_TARGET=System.Management.Automation -