admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

bumping to latest monad changes, updated makefiles

Browse Source
This commit is contained in:
Peter Honeder
2015-06-30 19:24:53 -07:00
parent a32bb7a5c5
commit 05ad29f3cf
11 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/Makefile
+4 -4
View File
@@ -42,7 +42,7 @@ MI_REF=-r:$(MI_ASSEMBLY)
PRODUCT_BASE_REFS=${COREREF}
PRODUCT_MI_REFS=${COREREF} ${MI_NATIVE_REF}
PRODUCT_PS_REFS=${COREREF} ${MI_REF_ASSEMBLY} -r:dotnetlibs/$(ASSEMBLY_LOAD_CONTEXT_TARGET)
PRODUCT_PS_REFS=${COREREF} ${MI_REF} -r:dotnetlibs/$(ASSEMBLY_LOAD_CONTEXT_TARGET)
PRODUCT_COMMANDS_REFS=${COREREF} -r:dotnetlibs/System.Management.Automation.dll
MCSOPTS_BASE=-unsafe -nostdlib -noconfig -define:CORECLR -define:_CORECLR
@@ -172,14 +172,14 @@ internal-prepare-debugclr:
run-debugclr: dotnetlibs/powershell-run.exe internal-prepare-debugclr dotnetlibs/corerun dotnetlibs/Microsoft.PowerShell.Commands.Management.dll dotnetlibs/Microsoft.PowerShell.Commands.Utility.dll dotnetlibs/api-ms-win-core-registry-l1-1-0.dll internal-prepare-exec_env
#cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=. ./corerun powershell-run.exe "import-module -name Microsoft.PowerShell.Utility" '"a","b","c","a","a" | Select-Object -Unique'
cd exec_env/app_base && PAL_DBG_CHANNELS="+LOADER.TRACE" PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=. ./corerun powershell-run.exe "\"test blah\""
cd exec_env/app_base && PAL_DBG_CHANNELS="+LOADER.TRACE" PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=. ./corerun powershell-simple.exe "\"test blah\""
trace:
cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=. strace -e trace=file ./corerun powershell-run.exe "import-module -name Microsoft.PowerShell.Utility" '"a","b","c","a","a" | Select-Object -Unique'
cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=. strace -e trace=file ./corerun powershell-simple.exe "import-module -name Microsoft.PowerShell.Utility" '"a","b","c","a","a" | Select-Object -Unique'
debug: dotnetlibs/powershell-run.exe dotnetlibs/corerun internal-prepare-exec_env dotnetlibs/api-ms-win-core-registry-l1-1-0.dll
#LD_LIBRARY_PATH=dotnetlibs lldb-3.6 dotnetlibs/corerun dotnetlibs/powershell-run.exe
cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=.:/usr/lib/llvm-3.6/lib lldb-3.6 ./corerun powershell-run.exe "\"hello world\""
cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=.:/usr/lib/llvm-3.6/lib lldb-3.6 ./corerun powershell-simple.exe "\"hello world\""
clean:
rm -f dotnetlibs/System.Management.Automation.dll dotnetlibs/Microsoft.PowerShell.Commands.Management.dll dotnetlibs/powershell-run.exe dotnetlibs/Microsoft.Management.Infrastructure.Native.dll CorePsTypeCatalog.cs TypeCatalogGen.exe string-resources.dll test.dll System.Reflection.Metadata.dll System.Collections.Immutable.dll
scripts/gen/SYS_AUTO/modules.cs → scripts/gen/SYS_AUTO/Modules.cs
+3 -3
View File
@@ -23,14 +23,14 @@ using System.Reflection;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class modules {
internal class Modules {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal modules() {
internal Modules() {
}
/// <summary>
@@ -40,7 +40,7 @@ internal class modules {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("modules", typeof(modules).GetTypeInfo().Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Modules", typeof(Modules).GetTypeInfo().Assembly);
resourceMan = temp;
}
return resourceMan;
scripts/gen/SYS_AUTO/modules.resources → scripts/gen/SYS_AUTO/Modules.resources
View File
scripts/gen/SYS_AUTO/MshSnapinCmdletResources.cs → scripts/gen/SYS_AUTO/MshSnapInCmdletResources.cs
+3 -3
View File
@@ -23,14 +23,14 @@ using System.Reflection;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class MshSnapinCmdletResources {
internal class MshSnapInCmdletResources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal MshSnapinCmdletResources() {
internal MshSnapInCmdletResources() {
}
/// <summary>
@@ -40,7 +40,7 @@ internal class MshSnapinCmdletResources {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MshSnapinCmdletResources", typeof(MshSnapinCmdletResources).GetTypeInfo().Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MshSnapInCmdletResources", typeof(MshSnapInCmdletResources).GetTypeInfo().Assembly);
resourceMan = temp;
}
return resourceMan;
scripts/gen/SYS_AUTO/MshSnapinCmdletResources.resources → scripts/gen/SYS_AUTO/MshSnapInCmdletResources.resources
View File
scripts/gen/SYS_AUTO/remotingerroridstrings.cs → scripts/gen/SYS_AUTO/RemotingErrorIdStrings.cs
+3 -3
View File
@@ -23,14 +23,14 @@ using System.Reflection;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class remotingerroridstrings {
internal class RemotingErrorIdStrings {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal remotingerroridstrings() {
internal RemotingErrorIdStrings() {
}
/// <summary>
@@ -40,7 +40,7 @@ internal class remotingerroridstrings {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("remotingerroridstrings", typeof(remotingerroridstrings).GetTypeInfo().Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RemotingErrorIdStrings", typeof(RemotingErrorIdStrings).GetTypeInfo().Assembly);
resourceMan = temp;
}
return resourceMan;
scripts/gen/SYS_AUTO/remotingerroridstrings.resources → scripts/gen/SYS_AUTO/RemotingErrorIdStrings.resources
View File
scripts/system-automation.mk
+12 -12
View File
@@ -1187,12 +1187,12 @@ SYS_AUTO_RESX_SRCS=\
../../../jws/pswin/admin/monad/src/engine/resources/SuggestionStrings.resx \
../../../jws/pswin/admin/monad/src/engine/resources/MiniShellErrors.resx \
../../../jws/pswin/admin/monad/src/engine/resources/MshHostRawUserInterfaceStrings.resx \
../../../jws/pswin/admin/monad/src/engine/resources/MshSnapinCmdletResources.resx \
../../../jws/pswin/admin/monad/src/engine/resources/MshSnapInCmdletResources.resx \
../../../jws/pswin/admin/monad/src/engine/resources/MshSnapinInfo.resx \
../../../jws/pswin/admin/monad/src/engine/resources/TypesXmlStrings.resx \
../../../jws/pswin/admin/monad/src/engine/resources/TransactionStrings.resx \
../../../jws/pswin/admin/monad/src/engine/resources/WildcardPatternStrings.resx \
../../../jws/pswin/admin/monad/src/engine/resources/remotingerroridstrings.resx \
../../../jws/pswin/admin/monad/src/engine/resources/RemotingErrorIdStrings.resx \
../../../jws/pswin/admin/monad/src/engine/resources/DebuggerStrings.resx \
../../../jws/pswin/admin/monad/src/engine/resources/FormatAndOut_MshParameter.resx \
../../../jws/pswin/admin/monad/src/engine/resources/FormatAndOut_format_xxx.resx \
@@ -1202,7 +1202,7 @@ SYS_AUTO_RESX_SRCS=\
../../../jws/pswin/admin/monad/src/engine/resources/TabCompletionStrings.resx \
../../../jws/pswin/admin/monad/src/engine/resources/HelpErrors.resx \
../../../jws/pswin/admin/monad/src/engine/resources/CoreClrStubResources.resx \
../../../jws/pswin/admin/monad/src/engine/resources/modules.resx \
../../../jws/pswin/admin/monad/src/engine/resources/Modules.resx \
SYS_AUTO_RES_SRCS=\
@@ -1256,12 +1256,12 @@ SYS_AUTO_RES_SRCS=\
gen/SYS_AUTO/SuggestionStrings.resources \
gen/SYS_AUTO/MiniShellErrors.resources \
gen/SYS_AUTO/MshHostRawUserInterfaceStrings.resources \
gen/SYS_AUTO/MshSnapinCmdletResources.resources \
gen/SYS_AUTO/MshSnapInCmdletResources.resources \
gen/SYS_AUTO/MshSnapinInfo.resources \
gen/SYS_AUTO/TypesXmlStrings.resources \
gen/SYS_AUTO/TransactionStrings.resources \
gen/SYS_AUTO/WildcardPatternStrings.resources \
gen/SYS_AUTO/remotingerroridstrings.resources \
gen/SYS_AUTO/RemotingErrorIdStrings.resources \
gen/SYS_AUTO/DebuggerStrings.resources \
gen/SYS_AUTO/FormatAndOut_MshParameter.resources \
gen/SYS_AUTO/FormatAndOut_format_xxx.resources \
@@ -1271,7 +1271,7 @@ SYS_AUTO_RES_SRCS=\
gen/SYS_AUTO/TabCompletionStrings.resources \
gen/SYS_AUTO/HelpErrors.resources \
gen/SYS_AUTO/CoreClrStubResources.resources \
gen/SYS_AUTO/modules.resources \
gen/SYS_AUTO/Modules.resources \
SYS_AUTO_RES_CS_SRCS=\
@@ -1325,12 +1325,12 @@ SYS_AUTO_RES_CS_SRCS=\
gen/SYS_AUTO/SuggestionStrings.cs \
gen/SYS_AUTO/MiniShellErrors.cs \
gen/SYS_AUTO/MshHostRawUserInterfaceStrings.cs \
gen/SYS_AUTO/MshSnapinCmdletResources.cs \
gen/SYS_AUTO/MshSnapInCmdletResources.cs \
gen/SYS_AUTO/MshSnapinInfo.cs \
gen/SYS_AUTO/TypesXmlStrings.cs \
gen/SYS_AUTO/TransactionStrings.cs \
gen/SYS_AUTO/WildcardPatternStrings.cs \
gen/SYS_AUTO/remotingerroridstrings.cs \
gen/SYS_AUTO/RemotingErrorIdStrings.cs \
gen/SYS_AUTO/DebuggerStrings.cs \
gen/SYS_AUTO/FormatAndOut_MshParameter.cs \
gen/SYS_AUTO/FormatAndOut_format_xxx.cs \
@@ -1340,7 +1340,7 @@ SYS_AUTO_RES_CS_SRCS=\
gen/SYS_AUTO/TabCompletionStrings.cs \
gen/SYS_AUTO/HelpErrors.cs \
gen/SYS_AUTO/CoreClrStubResources.cs \
gen/SYS_AUTO/modules.cs \
gen/SYS_AUTO/Modules.cs \
SYS_AUTO_RES_REF=\
@@ -1394,12 +1394,12 @@ SYS_AUTO_RES_REF=\
-resource:gen/SYS_AUTO/SuggestionStrings.resources \
-resource:gen/SYS_AUTO/MiniShellErrors.resources \
-resource:gen/SYS_AUTO/MshHostRawUserInterfaceStrings.resources \
-resource:gen/SYS_AUTO/MshSnapinCmdletResources.resources \
-resource:gen/SYS_AUTO/MshSnapInCmdletResources.resources \
-resource:gen/SYS_AUTO/MshSnapinInfo.resources \
-resource:gen/SYS_AUTO/TypesXmlStrings.resources \
-resource:gen/SYS_AUTO/TransactionStrings.resources \
-resource:gen/SYS_AUTO/WildcardPatternStrings.resources \
-resource:gen/SYS_AUTO/remotingerroridstrings.resources \
-resource:gen/SYS_AUTO/RemotingErrorIdStrings.resources \
-resource:gen/SYS_AUTO/DebuggerStrings.resources \
-resource:gen/SYS_AUTO/FormatAndOut_MshParameter.resources \
-resource:gen/SYS_AUTO/FormatAndOut_format_xxx.resources \
@@ -1409,7 +1409,7 @@ SYS_AUTO_RES_REF=\
-resource:gen/SYS_AUTO/TabCompletionStrings.resources \
-resource:gen/SYS_AUTO/HelpErrors.resources \
-resource:gen/SYS_AUTO/CoreClrStubResources.resources \
-resource:gen/SYS_AUTO/modules.resources \
-resource:gen/SYS_AUTO/Modules.resources \
SYS_AUTO_make_rule_RES_SRCS: $(SYS_AUTO_RES_SRCS)
src/assembly-info/Microsoft.Management.Infrastructure.assembly-info.cs
+1 -1
View File
@@ -1,3 +1,3 @@
using System.Runtime.CompilerServices;
//[assembly:InternalsVisibleTo("System.Management.Automation.dll")]
[assembly:InternalsVisibleTo("System.Management.Automation")]
src/monad
+1 -1
Submodule src/monad updated: e30d7b3cbb...1c5e42eeb7
src/win-dll/lib-api-ms-win-core-registry-l1-1-0.c
+5
View File
@@ -5,3 +5,8 @@ int32_t RegCloseKey(void* handle)
return 0;
}
int32_t RegOpenKeyExW(void* hKey,uint16_t* lpSubKey,uint32_t ulOptions,uint32_t samDesired,void* phkResult)
{
return 1;
}