From c60a49439ae36a3ea134e6d3f9e4e62062d8ac9c Mon Sep 17 00:00:00 2001 From: lateralusX Date: Mon, 9 May 2016 16:27:22 +0200 Subject: Added support to split GC builds into different build folders. --- msvc/.gitignore | 2 +- msvc/genmdesc.vcxproj | 305 ---------------------------------------------- msvc/install.bat | 8 ++ msvc/libmono.vcxproj | 10 -- msvc/mono.props | 45 ++++--- msvc/package.bat | 4 + scripts/ci/run-jenkins.sh | 8 +- 7 files changed, 43 insertions(+), 339 deletions(-) diff --git a/msvc/.gitignore b/msvc/.gitignore index 8ed2c2f48bb..bcd711d0f5a 100644 --- a/msvc/.gitignore +++ b/msvc/.gitignore @@ -12,4 +12,4 @@ mono.VC.db /include/ /package/ /build/ -/distribution/ +/dist/ diff --git a/msvc/genmdesc.vcxproj b/msvc/genmdesc.vcxproj index 5971a147e45..b67bdcf3a37 100644 --- a/msvc/genmdesc.vcxproj +++ b/msvc/genmdesc.vcxproj @@ -1,14 +1,6 @@  - - Debug - Win32 - - - Debug - x64 - Debug Win32 @@ -17,14 +9,6 @@ Debug x64 - - Release - Win32 - - - Release - x64 - Release Win32 @@ -46,48 +30,24 @@ Unicode v140 - - Application - false - Unicode - v120 - Application false Unicode v140 - - Application - false - Unicode - v120 - Application false Unicode v140 - - Application - false - Unicode - v120 - Application false Unicode v140 - - Application - false - Unicode - v120 - @@ -95,49 +55,29 @@ - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\ - $(Platform)\bin\ - $(Platform)\obj\$(ProjectName)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\ - $(Platform)\bin\ - $(Platform)\obj\$(ProjectName)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\ - $(Platform)\bin\ - $(Platform)\obj\$(ProjectName)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\ - $(Platform)\bin\ - $(Platform)\obj\$(ProjectName)\ true @@ -189,49 +129,6 @@ runmdesc.bat "$(TargetPath)" $(Platform) - - - - - - - .\./VSDependancies/genmdesc___Win32_Debug/genmdesc.tlb - - - - - Disabled - ..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - true - EditAndContinue - CompileAsC - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - false - - - eglib.lib;libmonoutils.lib;%(AdditionalDependencies) - true - $(Platform)\lib;%(AdditionalLibraryDirectories) - true - Console - MachineX86 - - - runmdesc.bat "$(TargetPath)" $(Platform) - - @@ -277,50 +174,6 @@ runmdesc.bat "$(TargetPath)" $(Platform) - - - - - - - X64 - .\./VSDependancies/genmdesc___Win32_Debug/genmdesc.tlb - - - - - Disabled - ..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories) - _DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - true - ProgramDatabase - CompileAsC - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - false - - - eglib.lib;libmonoutils.lib;%(AdditionalDependencies) - true - $(Platform)\lib;%(AdditionalLibraryDirectories) - true - Console - MachineX64 - - - runmdesc.bat "$(TargetPath)" $(Platform) - - @@ -364,48 +217,6 @@ runmdesc.bat "$(TargetPath)" $(Platform) - - - - - - - .\Release/genmdesc.tlb - - - - - MinSpace - OnlyExplicitInline - ..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories) - NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - false - - - eglib.lib;libmonoutils.lib;%(AdditionalDependencies) - true - $(Platform)\lib;%(AdditionalLibraryDirectories) - Console - MachineX86 - true - - - runmdesc.bat "$(TargetPath)" $(Platform) - - @@ -451,50 +262,6 @@ runmdesc.bat "$(TargetPath)" $(Platform) - - - - - - - X64 - .\Release/genmdesc.tlb - - - - - MinSpace - OnlyExplicitInline - ..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories) - NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - Level3 - true - CompileAsC - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - false - - - eglib.lib;libmonoutils.lib;%(AdditionalDependencies) - true - $(Platform)\lib;%(AdditionalLibraryDirectories) - Console - MachineX64 - true - - - runmdesc.bat "$(TargetPath)" $(Platform) - - %(AdditionalIncludeDirectories) @@ -502,37 +269,19 @@ true - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) true - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - %(AdditionalIncludeDirectories) @@ -540,37 +289,19 @@ true - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) true - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - %(AdditionalIncludeDirectories) @@ -578,37 +309,19 @@ true - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) true - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - %(AdditionalIncludeDirectories) @@ -616,37 +329,19 @@ true - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) true - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - diff --git a/msvc/install.bat b/msvc/install.bat index e9344e20f89..0baa5857f74 100644 --- a/msvc/install.bat +++ b/msvc/install.bat @@ -33,10 +33,18 @@ IF "\" == "%BUILD_DIR:~-1%" ( SET BUILD_DIR=%BUILD_DIR:~0,-1% ) +IF "/" == "%BUILD_DIR:~-1%" ( + SET BUILD_DIR=%BUILD_DIR:~0,-1% +) + IF "\" == "%INSTALL_DIR:~-1%" ( SET INSTALL_DIR=%INSTALL_DIR:~0,-1% ) +IF "/" == "%INSTALL_DIR:~-1%" ( + SET INSTALL_DIR=%INSTALL_DIR:~0,-1% +) + IF NOT EXIST %BUILD_DIR% ( ECHO Error: '%BUILD_DIR%', directory doesn't eixst. GOTO ON_ERROR diff --git a/msvc/libmono.vcxproj b/msvc/libmono.vcxproj index 6e9a9e8e7c4..05fd05d73ff 100644 --- a/msvc/libmono.vcxproj +++ b/msvc/libmono.vcxproj @@ -36,9 +36,7 @@ true - true true - true @@ -48,9 +46,7 @@ true - true true - true @@ -63,9 +59,7 @@ true - true true - true true @@ -111,9 +105,7 @@ true - true true - true true @@ -121,9 +113,7 @@ true - true true - true diff --git a/msvc/mono.props b/msvc/mono.props index 1c450324927..fb0a15dd866 100644 --- a/msvc/mono.props +++ b/msvc/mono.props @@ -4,26 +4,14 @@ $(MSBuildProjectDirectory)/./build/ - $(MSBuildProjectDirectory)/./distribution/ - - true + $(MSBuildProjectDirectory)/./dist/ + + sgen true + + true - - - $(MONO_BUILD_DIR_PREFIX) - - - $(MONO_INSTALL_DIR_PREFIX) - - - $(MONO_USE_SGEN) - - - $(MONO_USE_TARGET_SUFFIX) - - $(MSBuildProjectDirectory)/.. $(top_srcdir) @@ -37,23 +25,42 @@ $(MONO_LIBGC_INCLUDE_DIR) $(MONO_EGLIB_SOURCE_DIR) - + HAVE_SGEN_GC;HAVE_MOVING_COLLECTOR;HAVE_WRITE_BARRIERS $(SGEN_DEFINES) libgcmonosgen.lib monosgen.def -sgen + $(MONO_BUILD_DIR_PREFIX)sgen/ - + HAVE_BOEHM_GC $(BOEHM_DEFINES) libgc.lib mono.def -boehm + $(MONO_BUILD_DIR_PREFIX)boehm/ $(ProgramFiles)/Intel/VTune Amplifier XE 2013/include + + + $(MONO_BUILD_DIR_PREFIX) + + + $(MONO_INSTALL_DIR_PREFIX) + + + $(MONO_TARGET_GC) + + + $(MONO_USE_TARGET_SUFFIX) + + + $(MONO_USE_SEPARATE_BUILD_DIR) + + MONO_DLL_EXPORT diff --git a/msvc/package.bat b/msvc/package.bat index d9eb9e020c3..e3bf41a008a 100644 --- a/msvc/package.bat +++ b/msvc/package.bat @@ -31,6 +31,10 @@ IF "\" == "%BUILD_DIR:~-1%" ( SET BUILD_DIR=%BUILD_DIR:~0,-1% ) +IF "/" == "%BUILD_DIR:~-1%" ( + SET BUILD_DIR=%BUILD_DIR:~0,-1% +) + IF NOT EXIST %BUILD_DIR%\%PLATFORM%\lib\%CONFIG% ( ECHO Error: No lib directory available for %PLATFORM% %CONFIG% at '%BUILD_DIR%'. Any build availalbe for platform, configuration pair? GOTO ON_ERROR diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index 590dad3bb92..05a872b8025 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -9,8 +9,8 @@ if [[ ${CI_TAGS} == *'coop-gc'* ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} - if [[ ${label} == 'osx-i386' ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib --build=i386-apple-darwin11.2.0"; fi if [[ ${label} == 'osx-amd64' ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib "; fi -if [[ ${label} == 'w32' ]]; then PLATFORM=Win32; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=i686-w64-mingw32"; export MONO_EXECUTABLE="`cygpath -u ${WORKSPACE}\\\msvc\\\Win32\\\bin\\\Release_SGen\\\mono-sgen.exe`";fi -if [[ ${label} == 'w64' ]]; then PLATFORM=x64; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=x86_64-w64-mingw32 --disable-boehm"; export MONO_EXECUTABLE="`cygpath -u ${WORKSPACE}\\\msvc\\\x64\\\bin\\\Release_SGen\\\mono-sgen.exe`"; fi +if [[ ${label} == 'w32' ]]; then PLATFORM=Win32; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=i686-w64-mingw32"; export MONO_EXECUTABLE="`cygpath -u ${WORKSPACE}\\\msvc\\\build\\\sgen\\\Win32\\\bin\\\Release\\\mono-sgen.exe`"; fi +if [[ ${label} == 'w64' ]]; then PLATFORM=x64; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=x86_64-w64-mingw32"; export MONO_EXECUTABLE="`cygpath -u ${WORKSPACE}\\\msvc\\\build\\\sgen\\\x64\\\bin\\\Release\\\mono-sgen.exe`"; fi if [[ ${CI_TAGS} == 'mobile_static' ]]; then @@ -33,8 +33,8 @@ fi ${TESTCMD} --label=configure --timeout=60m --fatal ./autogen.sh $EXTRA_CONF_FLAGS if [[ ${label} == w* ]]; then - ${TESTCMD} --label=make-msvc --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=${PLATFORM} /p:Configuration=Release msvc/mono.sln - ${TESTCMD} --label=make-msvc-sgen --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=${PLATFORM} /p:Configuration=Release_SGen msvc/mono.sln + ${TESTCMD} --label=make-msvc --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=${PLATFORM} /p:Configuration=Release /p:MONO_TARGET_GC=boehm msvc/mono.sln + ${TESTCMD} --label=make-msvc-sgen --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=${PLATFORM} /p:Configuration=Release /p:MONO_TARGET_GC=sgen msvc/mono.sln fi ${TESTCMD} --label=make --timeout=300m --fatal make -w V=1 if [[ -n "${ghprbPullId}" ]] && [[ ${label} == w* ]]; -- cgit v1.2.3