Skip to content

Commit

Permalink
Initial add.
Browse files Browse the repository at this point in the history
  • Loading branch information
@wasabii
wasabii committed Dec 19, 2024
1 parent ef8d98d commit 92ef4fc
Show file tree
Hide file tree
Showing 15 changed files with 64 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup Label="Runtime Info">
<SupportedRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-arm64</SupportedRuntimes>
<SupportedRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-arm;android-arm64</SupportedRuntimes>
<EnabledRuntimes Condition=" '$(EnabledRuntimes)' == '' ">$(SupportedRuntimes)</EnabledRuntimes>
<SupportedImageRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-arm64</SupportedImageRuntimes>
<SupportedImageRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-arm;android-arm64</SupportedImageRuntimes>
<EnabledImageRuntimes Condition=" '$(EnabledImageRuntimes)' == '' ">$(SupportedImageRuntimes)</EnabledImageRuntimes>
<SupportedToolRuntimes>win-x64;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64</SupportedToolRuntimes>
<EnabledToolRuntimes Condition=" '$(EnabledToolRuntimes)' == '' ">$(SupportedToolRuntimes)</EnabledToolRuntimes>
Expand Down
6 changes: 6 additions & 0 deletions IKVM.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Benchmarks.Java", "src
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Image.runtime.android-arm64", "src\IKVM.Image.runtime.android-arm64\IKVM.Image.runtime.android-arm64.csproj", "{843B0704-DA5E-4357-B683-3D6F64DEF57B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Image.runtime.android-arm", "src\IKVM.Image.runtime.android-arm\IKVM.Image.runtime.android-arm.csproj", "{72994D7F-A9A8-45F9-A74B-0718DD192943}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -945,6 +947,10 @@ Global
{843B0704-DA5E-4357-B683-3D6F64DEF57B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{843B0704-DA5E-4357-B683-3D6F64DEF57B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{843B0704-DA5E-4357-B683-3D6F64DEF57B}.Release|Any CPU.Build.0 = Release|Any CPU
{72994D7F-A9A8-45F9-A74B-0718DD192943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{72994D7F-A9A8-45F9-A74B-0718DD192943}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72994D7F-A9A8-45F9-A74B-0718DD192943}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72994D7F-A9A8-45F9-A74B-0718DD192943}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Image-bin/IKVM.Image-bin.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libjsound\libjsound.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libjsoundds\libjsoundds.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libjsoundalsa\libjsoundalsa.clangproj" SupportedRuntimes="linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libsctp\libsctp.clangproj" SupportedRuntimes="linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64;android-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libsctp\libsctp.clangproj" SupportedRuntimes="linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64;android-arm;android-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libmlib_image\libmlib_image.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libawt_xawt\libawt_xawt.clangproj" SupportedRuntimes="linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\liblcms\liblcms.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64;linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64;osx-x64;osx-arm64" />
Expand Down
17 changes: 17 additions & 0 deletions src/IKVM.Image.runtime.android-arm/IKVM.Image.runtime.android-arm.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>
<Import Sdk="Microsoft.Build.NoTargets" Project="Sdk.props" />

<PropertyGroup>
<TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM Runtime Image</Description>
<IncludeSymbols>false</IncludeSymbols>
<ImageRuntimeIdentifier>android-arm</ImageRuntimeIdentifier>
<SupportedImageTargetFrameworks>net6.0;net8.0</SupportedImageTargetFrameworks>
</PropertyGroup>

<Import Sdk="Microsoft.Build.NoTargets" Project="Sdk.targets" />
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\IKVM.Image.runtime.targets" />
</Project>

3 changes: 3 additions & 0 deletions src/IKVM.Image.runtime.android-arm/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# IKVM.Image

Native requirements for IKVM.Image.
24 changes: 24 additions & 0 deletions src/IKVM.Image.runtime.android-arm/buildTransitive/IKVM.Image.runtime.android-arm.props
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\any\android-arm\**\*">
<TargetFramework>any</TargetFramework>
<RuntimeIdentifier>android-arm</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net6.0\android-arm\**\*">
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>android-arm</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net8.0\android-arm\**\*">
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>android-arm</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions src/IKVM.Image.runtime.android-arm/lib/net472/_._
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions src/IKVM.Image.runtime.android-arm/lib/net6.0/_._
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions src/IKVM.Image.runtime.android-arm/lib/net8.0/_._
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions src/IKVM.Image/IKVM.Image.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<ProjectReference Include="..\IKVM.Image.runtime.linux-musl-arm64\IKVM.Image.runtime.linux-musl-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-musl-arm64;'))" />
<ProjectReference Include="..\IKVM.Image.runtime.osx-x64\IKVM.Image.runtime.osx-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';osx-x64;'))" />
<ProjectReference Include="..\IKVM.Image.runtime.osx-arm64\IKVM.Image.runtime.osx-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';osx-arm64;'))" />
<ProjectReference Include="..\IKVM.Image.runtime.android-arm\IKVM.Image.runtime.android-arm.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';android-arm;'))" />
<ProjectReference Include="..\IKVM.Image.runtime.android-arm64\IKVM.Image.runtime.android-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';android-arm64;'))" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Image/buildTransitive/IKVM.Image.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<ItemGroup>
<IkvmImageAvailableTargetFrameworks Include="net472;net6.0;net8.0" />
<IkvmImageAvailableRuntimeIdentifiers Include="win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-arm64" />
<IkvmImageAvailableRuntimeIdentifiers Include="win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-arm;android-arm64" />
</ItemGroup>

<Choose>
Expand Down
1 change: 1 addition & 0 deletions src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<PackageProjectReference Include="..\IKVM.Image.runtime.linux-musl-arm64\IKVM.Image.runtime.linux-musl-arm64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';linux-musl-arm64;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.osx-x64\IKVM.Image.runtime.osx-x64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';osx-x64;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.osx-arm64\IKVM.Image.runtime.osx-arm64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';osx-arm64;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.android-arm\IKVM.Image.runtime.android-arm.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';android-arm;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.android-arm64\IKVM.Image.runtime.android-arm64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';android-arm64;'))" />
<PackageProjectReference Include="..\IKVM.Image.JRE\IKVM.Image.JRE.csproj" PackageTargetPath="nuget" />
<PackageProjectReference Include="..\IKVM.Image.JRE.runtime.win-x64\IKVM.Image.JRE.runtime.win-x64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';win-x64;'))" />
Expand Down
1 change: 1 addition & 0 deletions src/IKVM.NET.Sdk.Tests/IKVM.NET.Sdk.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<PackageProjectReference Include="..\IKVM.Image.runtime.linux-musl-arm64\IKVM.Image.runtime.linux-musl-arm64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';linux-musl-arm64;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.osx-x64\IKVM.Image.runtime.osx-x64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';osx-x64;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.osx-arm64\IKVM.Image.runtime.osx-arm64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';osx-arm64;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.android-arm\IKVM.Image.runtime.android-arm.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';android-arm;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.android-arm64\IKVM.Image.runtime.android-arm64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';android-arm64;'))" />
<PackageProjectReference Include="..\IKVM.Image.JRE\IKVM.Image.JRE.csproj" PackageTargetPath="nuget" />
<PackageProjectReference Include="..\IKVM.Image.JRE.runtime.win-x64\IKVM.Image.JRE.runtime.win-x64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';win-x64;'))" />
Expand Down
3 changes: 3 additions & 0 deletions src/dist-nuget/dist-nuget.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<PackageProjectReference Include="..\IKVM.Image.runtime.osx-arm64\IKVM.Image.runtime.osx-arm64.csproj" Condition="$(_EnabledImageRuntimes.Contains(';osx-arm64;'))">
<PackageTargetPath>.</PackageTargetPath>
</PackageProjectReference>
<PackageProjectReference Include="..\IKVM.Image.runtime.android-arm\IKVM.Image.runtime.android-arm.csproj" Condition="$(_EnabledImageRuntimes.Contains(';android-arm;'))">
<PackageTargetPath>.</PackageTargetPath>
</PackageProjectReference>
<PackageProjectReference Include="..\IKVM.Image.runtime.android-arm64\IKVM.Image.runtime.android-arm64.csproj" Condition="$(_EnabledImageRuntimes.Contains(';android-arm64;'))">
<PackageTargetPath>.</PackageTargetPath>
</PackageProjectReference>
Expand Down
2 changes: 1 addition & 1 deletion src/libsctp/libsctp.clangproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PropertyGroup>
<TargetName>sctp</TargetName>
<OutputType>dll</OutputType>
<TargetIdentifiers>linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;android-arm64</TargetIdentifiers>
<TargetIdentifiers>linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;android-arm;android-arm64</TargetIdentifiers>
<LanguageStandard>c99</LanguageStandard>
</PropertyGroup>
<ItemGroup>
Expand Down

0 comments on commit 92ef4fc

Please sign in to comment.