Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corert.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaurav Khanna <gkhanna@microsoft.com>2016-01-09 05:42:43 +0300
committerGaurav Khanna <gkhanna@microsoft.com>2016-01-09 06:15:00 +0300
commit52cf315e05fe595b53fdff9ef9d58de8b8b9ce56 (patch)
tree24ed03d7323fdc9bc2ff40a10e273bfe4c045cad /build.sh
parent01cdef0f099e507230e4bfa26e576dfd62a61306 (diff)
Fix issue 612
If Bin folder is a symlink, then nuget package creation fails due to relative path constructs. The fix is to specify BasePath for nuget package creation, to be the repo root path, and construct nuspec file entries relative to it.
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index 6e93c4c6b..58675efa5 100755
--- a/build.sh
+++ b/build.sh
@@ -186,7 +186,7 @@ build_managed_corert()
ToolchainMilestone=testing
fi
- MONO29679=1 ReferenceAssemblyRoot=$__referenceassemblyroot mono $__msbuildpath "$__buildproj" /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Build /p:CleanedTheBuild=$__CleanBuild /p:SkipTests=true /p:TestNugetRuntimeId=$__TestNugetRuntimeId /p:ToolNugetRuntimeId=$__ToolNugetRuntimeId /p:OSEnvironment=Unix /p:OSGroup=$__BuildOS /p:Configuration=$__BuildType /p:Platform=$__BuildArch /p:UseRoslynCompiler=true /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) /p:ToolchainMilestone=${ToolchainMilestone} $__UnprocessedBuildArgs
+ MONO29679=1 ReferenceAssemblyRoot=$__referenceassemblyroot mono $__msbuildpath "$__buildproj" /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Build /p:RepoPath=$__ProjectRoot /p:RelativeProductBinDir=$__RelativeProductBinDir /p:CleanedTheBuild=$__CleanBuild /p:SkipTests=true /p:TestNugetRuntimeId=$__TestNugetRuntimeId /p:ToolNugetRuntimeId=$__ToolNugetRuntimeId /p:OSEnvironment=Unix /p:OSGroup=$__BuildOS /p:Configuration=$__BuildType /p:Platform=$__BuildArch /p:UseRoslynCompiler=true /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) /p:ToolchainMilestone=${ToolchainMilestone} $__UnprocessedBuildArgs
BUILDERRORLEVEL=$?
echo
@@ -404,6 +404,7 @@ fi
# Set the remaining variables based upon the determined build configuration
__IntermediatesDir="$__rootbinpath/obj/Native/$__BuildOS.$__BuildArch.$__BuildType"
__ProductBinDir="$__rootbinpath/Product/$__BuildOS.$__BuildArch.$__BuildType"
+__RelativeProductBinDir="bin/Product/$__BuildOS.$__BuildArch.$__BuildType"
# Make the directories necessary for build if they don't exist