projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d966314)
Added support for 64 toolchain + default log level masks.
authorlateralusX <lateralusx.github@gmail.com>
Mon, 25 Apr 2016 14:34:57 +0000 (16:34 +0200)
committerlateralusX <lateralusx.github@gmail.com>
Wed, 15 Jun 2016 07:40:06 +0000 (09:40 +0200)
msvc/.gitignore patch | blob | history
msvc/mono-mini-regression-aot-test.vcxproj patch | blob | history
msvc/mono-mini-regression-test.vcxproj patch | blob | history
msvc/mono-regression-test-x64.props patch | blob | history
msvc/mono-regression-test.props patch | blob | history

diff --git a/msvc/.gitignore b/msvc/.gitignore
index 9e32d8ffcb986d8ef274801a864c63d1ad8d58dd..52b65fe7365137238c54b50c4e79e978fe0615cc 100644 (file)
--- a/msvc/.gitignore
+++ b/msvc/.gitignore
@@ -5,6 +5,7 @@
 /*.sdf
 /*.opensdf
 /*.opendb
+mono.VC.db
 /ipch/
 /Win32/
 /x64/
diff --git a/msvc/mono-mini-regression-aot-test.vcxproj b/msvc/mono-mini-regression-aot-test.vcxproj
index bb409fbb50994312d8c47b592c51c8de34677161..6029392a94712a2a129739acd1c660be6abd416a 100644 (file)
--- a/msvc/mono-mini-regression-aot-test.vcxproj
+++ b/msvc/mono-mini-regression-aot-test.vcxproj
@@ -27,28 +27,28 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>Utility</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
-    <PlatformToolset>v140</PlatformToolset>\r
     <CharacterSet>MultiByte</CharacterSet>\r
+    <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
     <ConfigurationType>Utility</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
-    <PlatformToolset>v140</PlatformToolset>\r
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
     <CharacterSet>MultiByte</CharacterSet>\r
+    <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
     <ConfigurationType>Utility</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
-    <PlatformToolset>v140</PlatformToolset>\r
     <CharacterSet>MultiByte</CharacterSet>\r
+    <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>Utility</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
-    <PlatformToolset>v140</PlatformToolset>\r
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
     <CharacterSet>MultiByte</CharacterSet>\r
+    <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
@@ -108,6 +108,8 @@
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
@@ -118,6 +120,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
@@ -128,6 +132,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
@@ -138,6 +144,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
diff --git a/msvc/mono-mini-regression-test.vcxproj b/msvc/mono-mini-regression-test.vcxproj
index 66d62f1584f5f4e410c1ef319fec8be16db461ee..81b48977d64afb2921b13e21d10df4ca689f52c5 100644 (file)
--- a/msvc/mono-mini-regression-test.vcxproj
+++ b/msvc/mono-mini-regression-test.vcxproj
@@ -108,6 +108,8 @@
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>\r
   </PropertyGroup>\r
@@ -119,6 +121,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
@@ -129,6 +133,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
@@ -139,6 +145,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
diff --git a/msvc/mono-regression-test-x64.props b/msvc/mono-regression-test-x64.props
index 655a9ba4501794639b7ad214ee08bbcb4ae37cd8..a2724a9ca5e5440eb6f2e4b3f26e32e05a79d24b 100644 (file)
--- a/msvc/mono-regression-test-x64.props
+++ b/msvc/mono-regression-test-x64.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <MONO_TOOLCHAIN_PREFIX />
+    <MONO_TOOLCHAIN_PREFIX>x86_64-w64-mingw32-</MONO_TOOLCHAIN_PREFIX>
     <MONO_TOOLCHAIN_PATH>C:/ProgramData/chocolatey/lib/Cygwin/tools/cygwin/bin</MONO_TOOLCHAIN_PATH>
   </PropertyGroup>
   <PropertyGroup />
diff --git a/msvc/mono-regression-test.props b/msvc/mono-regression-test.props
index eb56303a745c42f870029683df51e118b50cce1b..d4e6bf6e28b05bf17ed59a979781f7f91c18d2a6 100644 (file)
--- a/msvc/mono-regression-test.props
+++ b/msvc/mono-regression-test.props
@@ -12,6 +12,8 @@
     <MONO_PATH_ENV>MONO_PATH=$(MONO_PATH)</MONO_PATH_ENV>
     <MONO_CFG_DIR_ENV>MONO_CFG_DIR=$(MONO_CFG_DIR)</MONO_CFG_DIR_ENV>
     <MONO_TOOLCHAIN_PATH_ENV>PATH=$(MONO_TOOLCHAIN_PATH)</MONO_TOOLCHAIN_PATH_ENV>
+    <MONO_LOG_LEVEL_ENV>MONO_LOG_LEVEL=debug</MONO_LOG_LEVEL_ENV>
+    <MONO_LOG_MASK_ENV>MONO_LOG_MASK=asm,aot</MONO_LOG_MASK_ENV>
   </PropertyGroup>
   <ItemGroup>
     <BuildMacro Include="MONO_PATH">
@@ -44,6 +46,12 @@
     <BuildMacro Include="MONO_TOOLCHAIN_PATH_ENV">
       <Value>$(MONO_TOOLCHAIN_PATH_ENV)</Value>
     </BuildMacro>
+    <BuildMacro Include="MONO_LOG_LEVEL_ENV">
+      <Value>$(MONO_LOG_LEVEL_ENV)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_LOG_MASK_ENV">
+      <Value>$(MONO_LOG_MASK_ENV)</Value>
+    </BuildMacro>
   </ItemGroup>
   <ItemDefinitionGroup />
 </Project>
\ No newline at end of file
my mono mirror. check out Moved to http://github.com/mono/mono