Skip to content

Commit

Permalink
Cherry-picking of the conslidated changes (#20)
Browse files Browse the repository at this point in the history
  • Loading branch information
ViktorHofer authored Nov 11, 2019
1 parent a6679bf commit 4b621c8
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 16 deletions.
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
<InstallerProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer'))</InstallerProjectRoot>

<DocsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'docs'))</DocsDir>
<ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages'))</ManPagesDir>
<ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'installer', 'manpages'))</ManPagesDir>
</PropertyGroup>

<!-- Packaging properties -->
<PropertyGroup>
<!--
This name is used to create a GIT repository URL https://github.com/dotnet/$(GitHubRepositoryName) used
This name is used to create a GIT repository URL https://github.com/dotnet/$(GitHubRepositoryName) used
to find source code for debugging. It is also used to name the build output manifest for orchestrated builds.
-->
<GitHubRepositoryName>runtime</GitHubRepositoryName>
Expand All @@ -45,4 +45,4 @@
<LicenseUrl>https://github.com/dotnet/runtime/blob/master/LICENSE.TXT</LicenseUrl>
</PropertyGroup>

</Project>
</Project>
1 change: 0 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ done

scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
"$scriptroot/eng/build.sh" $@
exit $?
5 changes: 5 additions & 0 deletions eng/Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
signing that isn't (can't be?) supported by Arcade's single pass, such as MSIs and bundles:
https://github.com/dotnet/arcade/issues/388
-->

<PropertyGroup>
<SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Subsets.props" />

<Target Name="CheckSpecifiedSubsetValidity"
Expand Down
8 changes: 2 additions & 6 deletions eng/Subsets.props
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,8 @@
artifacts to the test layout, then running the test subset.
-->

<PropertyGroup>
<SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
</PropertyGroup>

<!-- Import only when imported by Arcade's Build.proj as we import Directory.Build.props ourselves. -->
<Import Project="$(RepoRoot)Directory.Build.props" Condition="'$(MSBuildProjectFile)' == 'Build.proj'" />
<Import Project="$(RepoRoot)Directory.Build.props" Condition="'$(SkipImportArcadeSdkFromRoot)' == 'true'" />

<PropertyGroup>
<DefaultSubsetCategories>libraries-installer</DefaultSubsetCategories>
Expand All @@ -69,7 +65,7 @@

<ItemGroup>
<!-- Global -->
<SubsetName Include="RegenerateReadmeTable" Category="" OnDemand="true" Description="Regenerates the table of asset links in the README.md file." />
<SubsetName Include="RegenerateReadmeTable" Category="" OnDemand="true" Description="Regenerates the table of asset links in the README.md file." />

<!-- Libraries -->
<SubsetName Include="All" Category="Libraries" Description="The .NET libraries comprising the shared framework." />
Expand Down
9 changes: 5 additions & 4 deletions eng/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ build=false
buildtests=false
subsetCategory=''

# Check if an action is passed in
declare -a actions=("r" "restore" "b" "build" "rebuild" "t" "test" "buildtests")
actInt=($(comm -12 <(printf '%s\n' "${actions[@]/#/-}" | sort) <(printf '%s\n' "${@/#--/-}" | sort)))

while [[ $# > 0 ]]; do
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
case "$opt" in
Expand Down Expand Up @@ -127,14 +131,11 @@ if [[ "$buildtests" == true ]]; then
fi
fi

# Check if an action is passed in
declare -a actions=("r" "restore" "b" "build" "rebuild" "t" "test" "buildtests")
actInt=($(comm -12 <(printf '%s\n' "${actions[@]/#/-}" | sort) <(printf '%s\n' "${@/#--/-}" | sort)))
if [ ${#actInt[@]} -eq 0 ] || [ "$subsetCategory" != "libraries" ]; then
arguments="-restore -build $arguments"
echo "${#actInt[@]}"
fi

arguments="$arguments $extraargs"

"$scriptroot/common/build.sh" $arguments
exit $?
1 change: 0 additions & 1 deletion installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ done

scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
"$scriptroot/build.sh" --subsetCategory installer $@
exit $?
1 change: 0 additions & 1 deletion libraries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ done

scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
"$scriptroot/build.sh" --subsetCategory libraries $@
exit $?

0 comments on commit 4b621c8

Please sign in to comment.