Attachment #243875 for bug #272961

View | Details | Raw Unified | Return to bug 272961 | Differences between
Collapse All | Expand All




SHEBANG_FILES=	*.sh artifacts/mono-msbuild/msbuild build.sh build/*.sh

MAKE_ENV=	GIT_COMMIT=3c930fa8721935cf0e381fd349f6f50cf2bc223d
MAKE_JOBS_UNSAFE=MSBuild has not implemented concurrent builds on non Windows platforms
ALL_TARGET=	all-mono
TEST_TARGET=	test-mono


	${MKDIR} ${WRKSRC}/artifacts
	${MV} ${WRKDIR}/msbuild ${WRKSRC}/artifacts/mono-msbuild

post-patch:
	${REINPLACE_CMD} \
		-e '/DisableNerdbankVersioning/s/Versioning=[^"]*"/Versioning=true"/' \
		-e '/^ *StopProcesses/s/StopProcesses/:/' \
		-e "/ToolsetProj)/s#\"/m #\"/m:${MAKE_JOBS_NUMBER} #" \
		-e "/commonMSBuildArgs=/s#\"/m #\"/m:${MAKE_JOBS_NUMBER} #" \
		${WRKSRC}/build/build.sh
	${REINPLACE_CMD} \
		-e "s#/m #/m:${MAKE_JOBS_NUMBER} #" \
		${WRKSRC}/Directory.Build.rsp

do-build:
	(cd ${WRKSRC}; \
		${SETENV} ${MAKE_ENV} ./build/build.sh -host mono -configuration Release -skipTests build)




--- build/build.sh.orig	2018-06-25 18:50:41 UTC
+++ build/build.sh
@@ -151,7 +151,7 @@ function ExitIfError {
   then
     echo "$2"
 
-    if [[ "$ci" != "true" && "$dotnetBuildFromSource" != "true" ]]; # kill command not permitted on CI machines or in source-build
+    if [[ "$ci" != "true" && "$dotnetBuildFromSource" != "true" && "$hostType" != "mono" ]]; # kill command not permitted on CI machines or in source-build
     then
       StopProcesses
     fi
@@ -343,7 +343,7 @@ function Build {
 
   local logCmd=$(GetLogCmd Build)
 
-  commonMSBuildArgs="/m /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=$dotnetBuildFromSource"
+  commonMSBuildArgs="/m /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=true"
 
   # Only enable warnaserror on CI runs.
   if $ci
- 

Return to bug 272961

Lines 24-30 GH_TAGNAME= 0.06 Link Here

(-)b/devel/msbuild/Makefile (-1 / +11 lines)
24	SHEBANG_FILES= .sh artifacts/mono-msbuild/msbuild build.sh build/.sh	24	SHEBANG_FILES= .sh artifacts/mono-msbuild/msbuild build.sh build/.sh
25		25
26	MAKE_ENV= GIT_COMMIT=3c930fa8721935cf0e381fd349f6f50cf2bc223d	26	MAKE_ENV= GIT_COMMIT=3c930fa8721935cf0e381fd349f6f50cf2bc223d
27	MAKE_JOBS_UNSAFE=MSBuild has not implemented concurrent builds on non Windows platforms
28	ALL_TARGET= all-mono	27	ALL_TARGET= all-mono
29	TEST_TARGET= test-mono	28	TEST_TARGET= test-mono
30		29
Lines 32-37 post-extract: Link Here
32	${MKDIR} ${WRKSRC}/artifacts	31	${MKDIR} ${WRKSRC}/artifacts
33	${MV} ${WRKDIR}/msbuild ${WRKSRC}/artifacts/mono-msbuild	32	${MV} ${WRKDIR}/msbuild ${WRKSRC}/artifacts/mono-msbuild
34		33
		34	post-patch:
		35	${REINPLACE_CMD} \
		36	-e '/DisableNerdbankVersioning/s/Versioning=[^"]*"/Versioning=true"/' \
		37	-e '/^ *StopProcesses/s/StopProcesses/:/' \
		38	-e "/ToolsetProj)/s#\"/m #\"/m:${MAKE_JOBS_NUMBER} #" \
		39	-e "/commonMSBuildArgs=/s#\"/m #\"/m:${MAKE_JOBS_NUMBER} #" \
		40	${WRKSRC}/build/build.sh
		41	${REINPLACE_CMD} \
		42	-e "s#/m #/m:${MAKE_JOBS_NUMBER} #" \
		43	${WRKSRC}/Directory.Build.rsp
		44
35	do-build:	45	do-build:
36	(cd ${WRKSRC}; \	46	(cd ${WRKSRC}; \
37	${SETENV} ${MAKE_ENV} ./build/build.sh -host mono -configuration Release -skipTests build)	47	${SETENV} ${MAKE_ENV} ./build/build.sh -host mono -configuration Release -skipTests build)

Removed Link Here

(-)a/devel/msbuild/files/patch-build_build.sh (-21 lines)
1	--- build/build.sh.orig 2018-06-25 18:50:41 UTC
2	+++ build/build.sh
3	@@ -151,7 +151,7 @@ function ExitIfError {
4	then
5	echo "$2"
6
7	- if [[ "$ci" != "true" && "$dotnetBuildFromSource" != "true" ]]; # kill command not permitted on CI machines or in source-build
8	+ if [[ "$ci" != "true" && "$dotnetBuildFromSource" != "true" && "$hostType" != "mono" ]]; # kill command not permitted on CI machines or in source-build
9	then
10	StopProcesses
11	fi
12	@@ -343,7 +343,7 @@ function Build {
13
14	local logCmd=$(GetLogCmd Build)
15
16	- commonMSBuildArgs="/m /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=$dotnetBuildFromSource"
17	+ commonMSBuildArgs="/m /clp:Summary /v:$verbosity /p:Configuration=$configuration /p:SolutionPath=$(QQ $MSBuildSolution) /p:CIBuild=$ci /p:DisableNerdbankVersioning=true"
18
19	# Only enable warnaserror on CI runs.
20	if $ci
21	-