Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 8023311

Browse files
gkhanna79gkhanna79
authored
Port: Default to portable build in dev and official builds (#12019)
1 parent e79937b commit 8023311

12 files changed

+50
-274
lines changed

‎build-packages.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
usage()
44
{
55
echo "Builds the NuGet packages from the binaries that were built in the Build product binaries step."
6-
echo "Usage: build-packages -BuildArch -BuildType [-portable]"
6+
echo "Usage: build-packages -BuildArch -BuildType"
77
echo "BuildArch can be x64, x86, arm, arm64 (default is x64)"
88
echo "BuildType can be release, checked, debug (default is debug)"
9-
echo "-portable - build for Portable Distribution"
109
echo
1110
exit 1
1211
}
1312

1413
__ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
15-
__PortableBuild=0
14+
__IsPortableBuild=1
1615

1716
# Use uname to determine what the OS is.
1817
OSName=$(uname -s)
@@ -71,8 +70,9 @@ while :; do
7170
__Arch=$(echo $1| cut -d'=' -f 2)
7271
;;
7372

74-
-portableBuild)
75-
__PortableBuild=1
73+
-PortableBuild=false)
74+
unprocessedBuildArgs="$unprocessedBuildArgs $1"
75+
__IsPortableBuild=0
7676
;;
7777
*)
7878
unprocessedBuildArgs="$unprocessedBuildArgs $1"
@@ -81,7 +81,7 @@ while :; do
8181
done
8282

8383
# Portable builds target the base RID
84-
if [ $__PortableBuild == 1 ]; then
84+
if [ $__IsPortableBuild == 1 ]; then
8585
if [ "$__BuildOS" == "Linux" ]; then
8686
export __DistroRid="linux-$__Arch"
8787
elif [ "$__BuildOS" == "OSX" ]; then

‎build.cmd‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ set __BuildPackages=1
9797
set __BuildNativeCoreLib=1
9898
set __RestoreOptData=1
9999

100-
REM Is this a portable build?
101-
set __IsPortableBuild=
102-
103100
:Arg_Loop
104101
if "%1" == "" goto ArgsDone
105102

@@ -117,8 +114,6 @@ if /i "%1" == "debug" (set __BuildTypeDebug=1&set processedArgs=!p
117114
if /i "%1" == "checked" (set __BuildTypeChecked=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
118115
if /i "%1" == "release" (set __BuildTypeRelease=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
119116

120-
if /i "%1" == "-portable" (set __IsPortableBuild=-portable&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
121-
122117
REM All arguments after this point will be passed through directly to build.cmd on nested invocations
123118
REM using the "all" argument, and must be added to the __PassThroughArgs variable.
124119
if [!__PassThroughArgs!]==[] (
@@ -468,7 +463,7 @@ if %__BuildPackages% EQU 1 (
468463
set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
469464

470465
REM The conditions as to what to build are captured in the builds file.
471-
@call %__ProjectDir%\run.cmd build -Project=%__SourceDir%\.nuget\packages.builds %__IsPortableBuild% -platform=%__BuildArch% -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! %__RunArgs% %__UnprocessedBuildArgs%
466+
@call %__ProjectDir%\run.cmd build -Project=%__SourceDir%\.nuget\packages.builds -platform=%__BuildArch% -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! %__RunArgs% %__UnprocessedBuildArgs%
472467

473468
if not !errorlevel! == 0 (
474469
echo %__MsgPrefix%Error: Nuget package generation failed build failed. Refer to the build log files for details:

‎build.sh‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ usage()
3838
echo "skiptests - skip the tests in the 'tests' subdirectory."
3939
echo "skipnuget - skip building nuget packages."
4040
echo "skiprestoreoptdata - skip restoring optimization data used by profile-based optimizations."
41-
echo "portable - build for portable RID."
4241
echo "verbose - optional argument to enable verbose build output."
4342
echo "-skiprestore: skip restoring packages ^(default: packages are restored during build^)."
4443
echo "-disableoss: Disable Open Source Signing for System.Private.CoreLib."
@@ -617,7 +616,7 @@ __DistroRid=""
617616
__cmakeargs=""
618617
__SkipGenerateVersion=0
619618
__DoCrossArchBuild=0
620-
__PortableBuild=0
619+
__PortableBuild=1
621620
__msbuildonunsupportedplatform=0
622621
__PgoOptDataVersion=""
623622
__IbcOptDataVersion=""
@@ -674,8 +673,8 @@ while :; do
674673
__CrossBuild=1
675674
;;
676675

677-
-portable)
678-
__PortableBuild=1
676+
-portablebuild=false)
677+
__PortableBuild=0
679678
;;
680679

681680
verbose)
@@ -832,12 +831,22 @@ if [[ $__ClangMajorVersion == 0 && $__ClangMinorVersion == 0 ]]; then
832831
__ClangMajorVersion=3
833832
__ClangMinorVersion=6
834833
fi
834+
835+
if [[ "$__BuildArch" == "armel" ]]; then
836+
# Armel cross build is Tizen specific and does not support Portable RID build
837+
__PortableBuild=0
838+
fi
839+
835840
else
836841
__ClangMajorVersion=3
837842
__ClangMinorVersion=5
838843
fi
839844
fi
840845

846+
if [ $__PortableBuild == 0 ]; then
847+
__RunArgs="$__RunArgs -PortableBuild=false"
848+
fi
849+
841850
# Set dependent variables
842851
__LogsDir="$__RootBinDir/Logs"
843852

‎buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
},
140140
"inputs": {
141141
"filename": "docker",
142-
"arguments": "run --rm -e ROOTFS_DIR $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) $(portableBuild) skipnuget cross -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"",
142+
"arguments": "run --rm -e ROOTFS_DIR $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget cross -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"",
143143
"workingFolder": "",
144144
"failOnStandardError": "false"
145145
}
@@ -157,7 +157,7 @@
157157
},
158158
"inputs": {
159159
"filename": "docker",
160-
"arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh $(portableBuild) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture)",
160+
"arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture)",
161161
"workingFolder": "",
162162
"failOnStandardError": "false"
163163
}
@@ -415,9 +415,6 @@
415415
"DockerCopyDest": {
416416
"value": "$(Build.BinariesDirectory)/docker_repo"
417417
},
418-
"portableBuild": {
419-
"value": ""
420-
},
421418
"ROOTFS_DIR": {
422419
"value": "/crossrootfs/$(Architecture)"
423420
},
@@ -450,7 +447,7 @@
450447
"deleteTestResults": true
451448
}
452449
],
453-
"buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(DockerTag)$(portableBuild)",
450+
"buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(DockerTag)",
454451
"jobAuthorizationScope": "projectCollection",
455452
"jobTimeoutInMinutes": 90,
456453
"repository": {

‎buildpipeline/DotNet-CoreClr-Trusted-Linux.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
},
122122
"inputs": {
123123
"filename": "docker",
124-
"arguments": "run --rm $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) $(portableBuild) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"",
124+
"arguments": "run --rm $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"",
125125
"workingFolder": "",
126126
"failOnStandardError": "false"
127127
}
@@ -139,7 +139,7 @@
139139
},
140140
"inputs": {
141141
"filename": "docker",
142-
"arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh $(portableBuild) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture)",
142+
"arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture)",
143143
"workingFolder": "",
144144
"failOnStandardError": "false"
145145
}
@@ -376,9 +376,6 @@
376376
"value": "HEAD",
377377
"allowOverride": true
378378
},
379-
"portableBuild": {
380-
"value": ""
381-
},
382379
"DockerVolumeName": {
383380
"value": "coreclr-$(Build.BuildId)"
384381
},
@@ -411,7 +408,7 @@
411408
"deleteTestResults": true
412409
}
413410
],
414-
"buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(DockerTag)$(portableBuild)",
411+
"buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(DockerTag)",
415412
"jobAuthorizationScope": "projectCollection",
416413
"jobTimeoutInMinutes": 90,
417414
"repository": {

‎buildpipeline/DotNet-CoreClr-Trusted-Mac.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
},
5050
"inputs": {
5151
"filename": "$(Agent.BuildDirectory)/s/build.sh",
52-
"arguments": "$(PB_BuildType) $(Architecture) $(portableBuild) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId)",
52+
"arguments": "$(PB_BuildType) $(Architecture) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId)",
5353
"workingFolder": "",
5454
"failOnStandardError": "false"
5555
}
@@ -67,7 +67,7 @@
6767
},
6868
"inputs": {
6969
"filename": "$(Agent.BuildDirectory)/s/build-packages.sh",
70-
"arguments": "-BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(portableBuild)",
70+
"arguments": "-BuildType=$(PB_BuildType) -BuildArch=$(Architecture)",
7171
"workingFolder": "",
7272
"failOnStandardError": "false"
7373
}
@@ -176,9 +176,6 @@
176176
},
177177
"Label": {
178178
"value": "$(Build.BuildNumber)"
179-
},
180-
"portableBuild": {
181-
"value": ""
182179
}
183180
},
184181
"demands": [

‎buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
},
8787
"inputs": {
8888
"filename": "build.cmd",
89-
"arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages -OfficialBuildId=$(OfficialBuildId) -skiprestore -Priority=$(Priority) $(portableBuild)",
89+
"arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages -OfficialBuildId=$(OfficialBuildId) -skiprestore -Priority=$(Priority)",
9090
"workingFolder": "",
9191
"failOnStandardError": "false"
9292
}
@@ -131,7 +131,7 @@
131131
},
132132
"inputs": {
133133
"filename": "build-packages.cmd",
134-
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) $(portableBuild)",
134+
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType)",
135135
"workingFolder": "",
136136
"failOnStandardError": "false"
137137
}
@@ -294,9 +294,6 @@
294294
"VsoPassword": {
295295
"value": null,
296296
"isSecret": true
297-
},
298-
"portableBuild": {
299-
"value": ""
300297
}
301298
},
302299
"retentionRules": [

‎buildpipeline/DotNet-CoreClr-Trusted-Windows.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
},
8787
"inputs": {
8888
"filename": "build.cmd",
89-
"arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages toolset_dir C:\\tools\\clr -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -disableoss $(portableBuild) -- /flp:\"v=diag\"",
89+
"arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages toolset_dir C:\\tools\\clr -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -disableoss -- /flp:\"v=diag\"",
9090
"workingFolder": "",
9191
"failOnStandardError": "false"
9292
}
@@ -131,7 +131,7 @@
131131
},
132132
"inputs": {
133133
"filename": "build-packages.cmd",
134-
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) $(portableBuild)",
134+
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType)",
135135
"workingFolder": "",
136136
"failOnStandardError": "false"
137137
}
@@ -284,9 +284,6 @@
284284
},
285285
"TeamName": {
286286
"value": "DotNetCore"
287-
},
288-
"portableBuild": {
289-
"value": ""
290287
}
291288
},
292289
"retentionRules": [

0 commit comments

Comments
 (0)