diff options
| author | Alexis Christoforides <alexis@thenull.net> | 2017-02-13 13:32:56 +0300 |
|---|---|---|
| committer | Alexis Christoforides <alexis@thenull.net> | 2017-02-13 14:35:02 +0300 |
| commit | 7100d9311742a79b2eb8ed66e93b399b20552945 (patch) | |
| tree | f7b663c64ff8717b12f57402e21c9bf8a6079c60 /packaging | |
| parent | 7e96bcfa3864795f77a262cadf6aac880e9bec45 (diff) | |
[MacSDK] Update MSBuild
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/MacSDK/msbuild.py | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/packaging/MacSDK/msbuild.py b/packaging/MacSDK/msbuild.py index 0e16af1fa79..3d123952f35 100644 --- a/packaging/MacSDK/msbuild.py +++ b/packaging/MacSDK/msbuild.py @@ -5,7 +5,7 @@ class MSBuild (GitHubPackage): def __init__(self): GitHubPackage.__init__(self, 'mono', 'msbuild', '15.0', - git_branch='xplat-c8p') + git_branch='xplat-master') def build(self): self.sh('./cibuild.sh --scope Compile --target Mono --host Mono') @@ -27,6 +27,17 @@ class MSBuild (GitHubPackage): self.sh('cp msbuild-mono-deploy.in %s/msbuild' % bindir) + xbuild_dir = os.path.join(self.staged_prefix, 'lib/mono/xbuild') + new_xbuild_tv_dir = os.path.join(xbuild_dir, self.version) + os.makedirs(new_xbuild_tv_dir) + + self.sh('mv %s/Microsoft.Common.props %s' % + (new_location, new_xbuild_tv_dir)) + self.sh('cp -R nuget-support/tv/ %s' % new_xbuild_tv_dir) + self.sh('cp -R nuget-support/tasks-targets/ %s/' % xbuild_dir) + for dep in glob.glob("%s/Microsoft/NuGet/*" % xbuild_dir): + self.sh('ln -s %s %s' % (dep, xbuild_dir)) + for line in fileinput.input('%s/msbuild' % bindir, inplace=True): line = line.replace('@bindir@', '%s/bin' % self.staged_prefix) line = line.replace( @@ -35,10 +46,12 @@ class MSBuild (GitHubPackage): self.staged_prefix) print line - for excluded in glob.glob("%s/*UnitTests*" % new_location): - self.rm(excluded) + patterns = ["*UnitTests*", "*xunit*", "NuGet*", "System.Runtime.InteropServices.RuntimeInformation.dll", + "Roslyn/csc.exe*"] + + for pattern in patterns: + for excluded in glob.glob("%s/%s" % (new_location, pattern)): + self.rm(excluded) - for excluded in glob.glob("%s/*xunit*" % new_location): - self.rm(excluded) MSBuild() |