Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/ikvmnet/ikvm into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
wasabii committed Jan 3, 2025
2 parents 2775c09 + 7d02804 commit 068fd7b
Show file tree
Hide file tree
Showing 16 changed files with 65 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Directory.Build.props
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-x64;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-x64;android-arm64</SupportedImageRuntimes>
<EnabledImageRuntimes Condition=" '$(EnabledImageRuntimes)' == '' ">$(SupportedImageRuntimes)</EnabledImageRuntimes>
<SupportedImageBinRuntimes>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</SupportedImageBinRuntimes>
<EnabledImageBinRuntimes Condition=" '$(EnabledImageBinRuntimes)' == '' ">$(SupportedImageBinRuntimes)</EnabledImageBinRuntimes>
Expand Down
6 changes: 6 additions & 0 deletions IKVM.sln
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,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-x64", "src\IKVM.Image.runtime.android-x64\IKVM.Image.runtime.android-x64.csproj", "{BE63E873-381D-423D-93F6-F3B25AEF4C57}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -910,6 +912,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
{BE63E873-381D-423D-93F6-F3B25AEF4C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE63E873-381D-423D-93F6-F3B25AEF4C57}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE63E873-381D-423D-93F6-F3B25AEF4C57}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE63E873-381D-423D-93F6-F3B25AEF4C57}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<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-x64</ImageRuntimeIdentifier>
</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-x64/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# IKVM.Image

Native requirements for IKVM.Image.
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-x64\**\*">
<TargetFramework>any</TargetFramework>
<RuntimeIdentifier>android-x64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net6.0\android-x64\**\*">
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>android-x64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net8.0\android-x64\**\*">
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>android-x64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
</ItemGroup>

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

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

1 change: 1 addition & 0 deletions src/IKVM.Image.runtime.android-x64/lib/net8.0/_._
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
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-x64\IKVM.Image.runtime.android-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';android-x64;'))" />
<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
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-x64;android-arm64" />
</ItemGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/IKVM.Java/IKVM.Java.runtime.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

<PropertyGroup>
<OpenJdkTargetOsApiDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'win' Or '$(IkvmJavaRuntimeIdentifier)' == 'ref' ">windows</OpenJdkTargetOsApiDir>
<OpenJdkTargetOsApiDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'linux' Or '$(IkvmJavaRuntimeIdentifier)' == 'osx' Or '$(IkvmJavaRuntimeIdentifier)' == 'android'">solaris</OpenJdkTargetOsApiDir>
<OpenJdkTargetOsApiDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'linux' Or '$(IkvmJavaRuntimeIdentifier)' == 'osx' ">solaris</OpenJdkTargetOsApiDir>
<OpenJdkTargetOsDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'win' Or '$(IkvmJavaRuntimeIdentifier)' == 'ref' ">windows</OpenJdkTargetOsDir>
<OpenJdkTargetOsDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'linux' Or '$(IkvmJavaRuntimeIdentifier)' == 'android' ">linux</OpenJdkTargetOsDir>
<OpenJdkTargetOsDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'linux' ">linux</OpenJdkTargetOsDir>
<OpenJdkTargetOsDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'osx' ">macosx</OpenJdkTargetOsDir>
</PropertyGroup>

Expand Down
1 change: 1 addition & 0 deletions src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj
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-x64\IKVM.Image.runtime.android-x64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';android-x64;'))" />
<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
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-x64\IKVM.Image.runtime.android-x64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';android-x64;'))" />
<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
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-x64\IKVM.Image.runtime.android-x64.csproj" Condition="$(_EnabledImageRuntimes.Contains(';android-x64;'))">
<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/libnet/libnet.clangproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<ItemGroup Condition="!$(TargetIdentifier.StartsWith('win-'))">
<LibNetDirs Include="$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\sun\net\sdp" />
</ItemGroup>
<ItemGroup Condition="!$(TargetIdentifier.StartsWith('linux-')) Or $(TargetIdentifier.StartsWith('android-'))">
<ItemGroup Condition="!$(TargetIdentifier.StartsWith('linux-')) And !$(TargetIdentifier.StartsWith('android-'))">
<LibNetExclude Include="linux_close.c" />
</ItemGroup>
<ItemGroup Condition="!$(TargetIdentifier.StartsWith('osx-'))">
Expand Down
1 change: 1 addition & 0 deletions targets/lib.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<TargetTriple Condition=" '$(TargetIdentifier)' == 'linux-musl-arm' ">arm-unknown-linux-musleabihf</TargetTriple>
<TargetTriple Condition=" '$(TargetIdentifier)' == 'osx-x64' ">x86_64-apple-macosx</TargetTriple>
<TargetTriple Condition=" '$(TargetIdentifier)' == 'osx-arm64' ">arm64-apple-macosx</TargetTriple>
<TargetTriple Condition=" '$(TargetIdentifier)' == 'android-x64' ">x86_64-linux-android</TargetTriple>
<TargetTriple Condition=" '$(TargetIdentifier)' == 'android-arm' ">arm-linux-androideabi</TargetTriple>
<TargetTriple Condition=" '$(TargetIdentifier)' == 'android-arm64' ">aarch64-linux-android</TargetTriple>
</PropertyGroup>
Expand Down

0 comments on commit 068fd7b

Please sign in to comment.