Skip to content

Commit

Permalink
[tools/scripts] Add mono-symbolicate to the build system. (#335)
Browse files Browse the repository at this point in the history
Bump to mono/mono-4.8.0-branch/1e31bd78.

We were missing `mono-symbolicate` as a result release builds would
often fail when it tries to symbolicate the assemblies.

This commit adds a new Target to build `mono-symbolicate.exe` from
the mono tree and place it into

	bin\$(Configuration)\lib\mandroid

it also adds two scripts, one for unix based systems and one for windows.
These scripts will end up in

	bin\$(Configuration)\bin

and will be run by the build tasks from that location.
  • Loading branch information
dellis1972 authored and jonpryor committed Dec 15, 2016
1 parent a05f22b commit 0147bc7
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<BuildDependsOn>
$(BuildDependsOn);
_CopyExtractedMultiDexJar;
_BuildMonoSymbolicate;
</BuildDependsOn>
<_AndroidSdkLocation>$(ANDROID_SDK_PATH)</_AndroidSdkLocation>
<_AndroidSdkLocation Condition="'$(_AndroidSdkLocation)'==''">$(AndroidToolchainDirectory)\sdk</_AndroidSdkLocation>
Expand Down Expand Up @@ -56,4 +57,19 @@
SourceFiles="$(_AndroidSdkLocation)\$(_SupportLicenseInAndroidSdk)"
DestinationFiles="$(OutputPath)..\..\..\mandroid\MULTIDEX_JAR_LICENSE" />
</Target>

<Target Name="_BuildMonoSymbolicate">
<MSBuild
Projects="..\..\external\mono\mcs\tools\mono-symbolicate\monosymbolicate.csproj"
Properties="OutputPath=..\..\..\..\..\bin\$(Configuration)\lib\mandroid\;Configuration=$(Configuration);AssemblyName=mono-symbolicate"
/>
<Copy
SourceFiles="..\..\tools\scripts\mono-symbolicate"
DestinationFiles="$(OutputPath)..\..\..\..\bin\mono-symbolicate"
/>
<Copy
SourceFiles="..\..\tools\scripts\mono-symbolicate.cmd"
DestinationFiles="$(OutputPath)..\..\..\..\bin\mono-symbolicate.cmd"
/>
</Target>
</Project>
6 changes: 6 additions & 0 deletions tools/scripts/mono-symbolicate
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh
BINDIR=`dirname "$0"`
MANDROID_DIR="$BINDIR/../lib/mandroid"

unset MONO_PATH
exec mono $MONO_OPTIONS "$MANDROID_DIR/mono-symbolicate.exe" "$@"
2 changes: 2 additions & 0 deletions tools/scripts/mono-symbolicate.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
%~dp0\..\lib\mandroid\mono-symbolicate.exe %*

0 comments on commit 0147bc7

Please sign in to comment.