Skip to content

[mono-runtimes] Bundle Consts.cs, use correct opt.exe install location #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Aug 14, 2016
Merged

[mono-runtimes] Bundle Consts.cs, use correct opt.exe install location #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build-tools/bundle/bundle.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<Target Name="GetBundlePath"
DependsOnTargets="_GetHashes">
<PropertyGroup>
<_BundlePath>$(OutputPath)bundle-v1-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</_BundlePath>
<_BundlePath>$(OutputPath)bundle-v2-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</_BundlePath>
</PropertyGroup>
</Target>
<Target Name="Clean"
Expand All @@ -54,6 +54,7 @@
<_Archive Include="@(_InstallUnstrippedMonoPosixHelperOutput)" />
<_Archive Include="@(_RuntimeEglibHeaderOutput)" />
<_Archive Include="@(_LibZipTarget->'$(OutputPath)lib\xbuild\Xamarin\Android\%(OutputLibrary)')" />
<_Archive Include="@(_MonoConstsOutput)" />
<_Archive Include="$(OutputPath)%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)"
Condition=" '@(_MonoCrossRuntime)' != '' "
/>
Expand Down
4 changes: 4 additions & 0 deletions build-tools/mono-runtimes/mono-runtimes.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@
<BuildEnvironment></BuildEnvironment>
<ExeSuffix></ExeSuffix>
<InstallBinaries>true</InstallBinaries>
<InstallPath>bin/</InstallPath>
</_LlvmRuntime>

<_LlvmRuntime Include="llvm64" Condition=" '$(_LlvmNeeded)' != '' And '$(_LlvmCanBuild64)' == 'yes' ">
Expand All @@ -238,6 +239,7 @@
<BuildEnvironment></BuildEnvironment>
<ExeSuffix></ExeSuffix>
<InstallBinaries>true</InstallBinaries>
<InstallPath>bin/</InstallPath>
</_LlvmRuntime>

<_LlvmRuntime Include="llvmwin32" Condition=" '$(_LlvmNeeded)' != '' And $(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win32:')) ">
Expand All @@ -248,6 +250,7 @@
<BuildEnvironment>PATH="$(AndroidMxeFullPath)\bin:$(PATH)"</BuildEnvironment>
<ExeSuffix>.exe</ExeSuffix>
<InstallBinaries>true</InstallBinaries>
<InstallPath>lib/mandroid/</InstallPath>
</_LlvmRuntime>

<_LlvmRuntime Include="llvmwin64" Condition=" '$(_LlvmNeeded)' != '' And $(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:')) ">
Expand All @@ -258,6 +261,7 @@
<BuildEnvironment>PATH="$(AndroidMxeFullPath)\bin:$(PATH)"</BuildEnvironment>
<ExeSuffix>.exe</ExeSuffix>
<InstallBinaries>false</InstallBinaries>
<InstallPath>lib/mandroid/</InstallPath>
</_LlvmRuntime>
</ItemGroup>

Expand Down
16 changes: 14 additions & 2 deletions build-tools/mono-runtimes/mono-runtimes.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@
<_LlvmArchive Include="$(_LlvmOutputDirTop)\%(_LlvmRuntime.BuildDir)\Release\lib\*.a" />

<_LlvmSourceBinary Include="@(_LlvmRuntime->'$(_LlvmOutputDirTop)\%(BuildDir)\Release\bin\opt%(ExeSuffix)')" Condition=" '%(_LlvmRuntime.InstallBinaries)' == 'true' " />
<_LlvmTargetBinary Include="@(_LlvmRuntime->'$(OutputPath)\bin\opt%(ExeSuffix)')" Condition=" '%(_LlvmRuntime.InstallBinaries)' == 'true' "/>
<_LlvmTargetBinary Include="@(_LlvmRuntime->'$(OutputPath)\%(InstallPath)opt%(ExeSuffix)')" Condition=" '%(_LlvmRuntime.InstallBinaries)' == 'true' "/>

<_LlvmSourceBinary Include="@(_LlvmRuntime->'$(_LlvmOutputDirTop)\%(BuildDir)\Release\bin\llc%(ExeSuffix)')" Condition=" '%(_LlvmRuntime.InstallBinaries)' == 'true' " />
<_LlvmTargetBinary Include="@(_LlvmRuntime->'$(OutputPath)\bin\llc%(ExeSuffix)')" Condition=" '%(_LlvmRuntime.InstallBinaries)' == 'true' " />
<_LlvmTargetBinary Include="@(_LlvmRuntime->'$(OutputPath)\%(InstallPath)llc%(ExeSuffix)')" Condition=" '%(_LlvmRuntime.InstallBinaries)' == 'true' " />
</ItemGroup>
</Target>

Expand Down Expand Up @@ -206,6 +206,14 @@
Condition=" '%(_MonoRuntime.DoBuild)' == 'True' "
Include="@(_MonoRuntime->'$(OutputPath)include\%(Identity)\eglib\config.h');@(_MonoRuntime->'$(OutputPath)include\%(Identity)\eglib\eglib-config.h')"
/>
<_MonoConstsSource
Condition=" '%(_MonoRuntime.DoBuild)' == 'True' "
Include="$(MonoSourceFullPath)\mcs\build\common\Consts.cs"
/>
<_MonoConstsOutput
Condition=" '%(_MonoRuntime.DoBuild)' == 'True' "
Include="$(OutputPath)include\Consts.cs"
/>
<_RuntimeBuildStamp Condition=" '%(_MonoRuntime.DoBuild)' == 'true' " Include="@(_MonoRuntime->'$(IntermediateOutputPath)%(Identity)\.stamp')" />
</ItemGroup>
</Target>
Expand Down Expand Up @@ -238,6 +246,10 @@
SourceFiles="@(_RuntimeEglibHeaderSource)"
DestinationFiles="@(_RuntimeEglibHeaderOutput)"
/>
<Copy
SourceFiles="@(_MonoConstsSource)"
DestinationFiles="@(_MonoConstsOutput)"
/>
<Copy
SourceFiles="@(_RuntimeSource)"
DestinationFiles="@(_InstallRuntimeOutput)"
Expand Down
2 changes: 1 addition & 1 deletion src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
<Compile Include="$(MonoSourceDirectory)\mcs\build\common\Locale.cs">
<Link>Locale.cs</Link>
</Compile>
<Compile Include="$(MonoSourceDirectory)\mcs\build\common\Consts.cs">
<Compile Include="$(OutputPath)..\..\..\..\include\Consts.cs">
<Link>Consts.cs</Link>
</Compile>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Mono.Posix/Mono.Posix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
<Compile Include="$(MonoSourceDirectory)\mcs\build\common\Locale.cs">
<Link>Locale.cs</Link>
</Compile>
<Compile Include="$(MonoSourceDirectory)\mcs\build\common\Consts.cs">
<Compile Include="$(OutputPath)..\..\..\..\include\Consts.cs">
<Link>Consts.cs</Link>
</Compile>
</ItemGroup>
Expand Down