Skip to content
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

Platform Specific IO, Security, Base Libs #521

Merged
merged 92 commits into from
May 20, 2024
Merged

Platform Specific IO, Security, Base Libs #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
8199c46
Reference each of the individual IKVM.Java runtime projects. Combine …
wasabii Mar 27, 2024
8260704
Merge develop.
wasabii Mar 27, 2024
b7b0299
Fix extensions.
wasabii Mar 27, 2024
432af8b
Fix.
wasabii Mar 27, 2024
4a117e6
For RID specific builds, only include RID specific resource.
wasabii Mar 28, 2024
557c1c8
badsll.com expired cert. Again =(
wasabii Mar 28, 2024
9ec6d78
Generate a module initializer for CS and Java. Need to implement supp…
wasabii Mar 29, 2024
49f8176
Include fake ModuleInitializerAttribute.
wasabii Mar 29, 2024
c9ec54a
Add new ikvm.lang.ModuleInitializer annotation to play the same role …
wasabii Mar 29, 2024
223500e
Rename ModuleInit to RuntimeInit.
wasabii Mar 30, 2024
d2ca4c2
Properly track IsModuleInitializer on methods.
wasabii Mar 30, 2024
5335e0b
Add a new error for bad module initializer.
wasabii Mar 30, 2024
566159f
Better tests.
wasabii Mar 30, 2024
002473e
Alright, new strategy. ModuleInitializers aren't going to work. We'll…
wasabii Mar 30, 2024
f6f436e
Usings.
wasabii Mar 30, 2024
9285604
New docs.
wasabii Mar 31, 2024
a72b19d
PrivateAssets required to not add pacakge dep.
wasabii Mar 31, 2024
0c2c3f2
Get output working?
wasabii Mar 31, 2024
ac600b3
Add both lib and ref and runtimes for everything. This is probably ov…
wasabii Mar 31, 2024
ae62fd2
Add net8.0 tests.
wasabii Mar 31, 2024
f915a0a
Fix logging.
wasabii Mar 31, 2024
f94ce4d
Enable framework build tests. Not sure why these were off.
wasabii Mar 31, 2024
452f14d
Typo.
wasabii Mar 31, 2024
8391bde
Merge branch 'develop' into loadplat
wasabii Apr 3, 2024
d97dc00
Merge branch 'develop' into loadplat
wasabii Apr 3, 2024
b620750
Merge branch 'develop' into loadplat
wasabii Apr 4, 2024
1110f41
Merge branch 'loadplat' of https://github.com/ikvmnet/ikvm into loadplat
wasabii Apr 4, 2024
d2ae630
Merge branch 'develop' into loadplat
wasabii Apr 16, 2024
9701d0c
Update IKVM.Tools.Importer.Tests.csproj
wasabii Apr 16, 2024
bd13e57
Port Clang changes down from awt branch. Including a few openjdk code…
wasabii Apr 17, 2024
af189b0
Disable UNICODE by default. OpenJDK doesn't actually expect to build …
wasabii Apr 17, 2024
2c86b34
Add to this.
wasabii Apr 17, 2024
988d8f0
Upgrade a handful of packages.
wasabii Apr 18, 2024
0504134
Wasn't alllocating enough memory.
wasabii Apr 18, 2024
7e9f546
Specifically marshal as C string.
wasabii Apr 18, 2024
fc9f949
Update a bunch of dependencies.
wasabii Apr 18, 2024
15fb2ea
Update STJ.
wasabii Apr 18, 2024
cd9cda2
More reasonable version.
wasabii Apr 18, 2024
1b54abf
Rename clang reference group.
wasabii Apr 19, 2024
e646357
Search a bit better.
wasabii Apr 20, 2024
e02c545
Add jsound, remove fdlibm.
wasabii Apr 20, 2024
91d31a9
jsound doens't exist on osx.
wasabii Apr 20, 2024
6e114ab
Only a single arg to set.
wasabii Apr 20, 2024
629f201
Merge branch 'loadplat' into platio
wasabii Apr 21, 2024
db89801
Add nio, io and net native classes to their respective output.
wasabii Apr 22, 2024
2ba18f4
Use built in locale data for now.
wasabii Apr 22, 2024
5c373cf
Missing classes.
wasabii Apr 22, 2024
db91104
Fix.
wasabii Apr 22, 2024
e6ce25e
Remove socket code.
wasabii Apr 22, 2024
f8ead2f
Add more classes.
wasabii Apr 23, 2024
2634a10
Minor.
wasabii Apr 23, 2024
b5dbb44
Search base dir.
wasabii Apr 23, 2024
be1a01f
Override OSEnvironment.
wasabii Apr 23, 2024
7660553
Reintroduce overrides for VFS to java.io.
wasabii Apr 25, 2024
f822404
Add a ManualResetEvent to Thread.interrupt logic. This can be retriev…
wasabii Apr 28, 2024
478bafe
Delete properties.
wasabii Apr 28, 2024
e1ceec4
Add JVM_ActiveProcessorCount for native libs. Replace OperatingSystem…
wasabii May 3, 2024
31d8b52
Add libsctp on Linux.
wasabii May 3, 2024
629ad65
IKVM.Clang update, which allows per-item compile options to appear af…
wasabii May 4, 2024
1e18461
Fix.
wasabii May 4, 2024
b649727
canonicalizeWithPrefix0 implementation.
wasabii May 4, 2024
1fbe6f8
Implement canonicalize properly.
wasabii May 5, 2024
8832851
Fix libkrb5, who's name varies depending on platform.
wasabii May 5, 2024
0893145
Remove old.
wasabii May 5, 2024
bb0c794
Fix libpkcs11.
wasabii May 5, 2024
345dd96
libjaas
wasabii May 5, 2024
619d62d
Remove Solaris classes.
wasabii May 5, 2024
630cf2c
Use local map file so we can add JVM_Init.
wasabii May 5, 2024
02e1fc8
Expose __JNI methods.
wasabii May 5, 2024
a027205
Default to FORK on OSX, since it might work better.
wasabii May 5, 2024
2556609
Always export jni_util_md.
wasabii May 6, 2024
fac3cb9
Add a new libjnf, which is the JavaNativeFoundation code from Apple.
wasabii May 8, 2024
0d22848
Remove libjnf for x64.
wasabii May 8, 2024
e05cd69
Reinstate UNIXProcess interception on init to save/restore SIGCHLD ha…
wasabii May 10, 2024
3fd446b
Set export attributes.
wasabii May 10, 2024
f399008
Weird things.
wasabii May 11, 2024
d88c261
setReadOnly was calling wrong function. Add a test for it.
wasabii May 12, 2024
f4798c6
Wrong function.
wasabii May 13, 2024
6937300
Remove isolation code for netfx. Causes two loads of Java.
wasabii May 13, 2024
33a1376
Added new Microsoft.Testing.Platform support.
wasabii May 16, 2024
f56d981
Missing.
wasabii May 16, 2024
624d53f
Fix.
wasabii May 17, 2024
4d4e796
Remove central package versions for now. Needs more work to get right…
wasabii May 17, 2024
774fe88
Remove package version stuff.
wasabii May 17, 2024
5d9b466
Remove new testing framework. This isn't ready for prime time.
wasabii May 18, 2024
2cb9773
Exclude ServerSocketChannel.Basic on OSX. I don't have time to figure…
wasabii May 18, 2024
3d83628
Merged.
wasabii May 18, 2024
b75f623
Merge develop.
wasabii May 18, 2024
d13f471
Dupe
wasabii May 18, 2024
be91f06
Bad test name.
wasabii May 19, 2024
ed1e9fb
Disable osx test all around.
wasabii May 19, 2024
55499ff
Free disk space on release step.
wasabii May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .github/workflows/IKVM.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,12 @@ jobs:
- test
runs-on: ubuntu-latest
steps:
- name: Free Disk Space (Linux)
uses: jlumbroso/free-disk-space@main
with:
dotnet: false
swap-storage: false
large-packages: false
- name: Checkout Source
uses: actions/checkout@v4
with:
Expand Down
12 changes: 6 additions & 6 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<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</SupportedImageRuntimes>
<EnabledImageRuntimes Condition=" '$(EnabledImageRuntimes)' == '' ">$(SupportedImageRuntimes)</EnabledImageRuntimes>

<!--<EnabledRuntimes>win-x64</EnabledRuntimes>
<EnabledToolRuntimes>win-x64</EnabledToolRuntimes>
<EnabledImageRuntimes>win-x64</EnabledImageRuntimes>-->
<!--<EnabledRuntimes>win-x64;win-x86;linux-x64</EnabledRuntimes>
<EnabledToolRuntimes>win-x64;win-x86;linux-x64</EnabledToolRuntimes>
<EnabledImageRuntimes>win-x64;win-x86;linux-x64</EnabledImageRuntimes>-->

<_SupportedRuntimes>;$(SupportedRuntimes);</_SupportedRuntimes>
<_EnabledRuntimes>;$(EnabledRuntimes);</_EnabledRuntimes>
Expand Down Expand Up @@ -101,13 +101,13 @@
<IkvmToolReference Include="$(MSBuildThisFileDirectory)src\ikvmc\ikvmc.csproj" IsIkvmCompiler="true" />
<IkvmToolReference Include="$(MSBuildThisFileDirectory)src\ikvmstub\ikvmstub.csproj" IsIkvmExporter="true" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="IKVM.Core.MSBuild" Version="0.1.93">
<PackageReference Include="IKVM.Core.MSBuild" Version="0.1.102">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion IKVM.deps.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="System.Text.Json" Version="6.0.6" />
<PackageReference Include="System.Text.Json" Version="8.0.0" />
</ItemGroup>
</When>
<When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
Expand Down
10 changes: 5 additions & 5 deletions IKVM.libs.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project>
<ItemGroup>
<_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)src\libikvm\libikvm.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)src\libikvm\libikvm.clangproj" />
</ItemGroup>

<Target Name="GetClangProjectReferencesByRuntime" Inputs="@(_ReferencedClangProjects)" Outputs="%(_ReferencedClangProjects.Identity)\null" BeforeTargets="AssignClangProjectConfiguration">
<Target Name="GetDotNetClangProjectReferencesByRuntime" Inputs="@(DotNetClangProjectReference)" Outputs="%(DotNetClangProjectReference.Identity)\null" BeforeTargets="AssignClangProjectConfiguration">
<PropertyGroup>
<__SupportedRuntimes>%(_ReferencedClangProjects.SupportedRuntimes)</__SupportedRuntimes>
<__SupportedRuntimes>%(DotNetClangProjectReference.SupportedRuntimes)</__SupportedRuntimes>
<__SupportedRuntimes Condition=" '$(__SupportedRuntimes)' == '' ">$(_SupportedRuntimes)</__SupportedRuntimes>
</PropertyGroup>
<ItemGroup>
<__SupportedRuntimes Include="$(__SupportedRuntimes)" />
</ItemGroup>
<ItemGroup>
<_ReferencedClangProjectReference Remove="@(_ReferencedClangProjectReference)" />
<_ReferencedClangProjectReference Include="@(_ReferencedClangProjects)">
<_ReferencedClangProjectReference Include="@(DotNetClangProjectReference)">
<RuntimeIdentifier>%(__SupportedRuntimes.Identity)</RuntimeIdentifier>
</_ReferencedClangProjectReference>
<ClangProjectReference Include="@(_ReferencedClangProjectReference)" Condition="$(_EnabledRuntimes.Contains(';%(RuntimeIdentifier);'))">
Expand All @@ -25,7 +25,7 @@
<PropertyGroup>
<GetClangProjectReferencesDependsOn>
$(GetClangProjectReferencesDependsOn);
GetClangProjectReferencesByRuntime;
GetDotNetClangProjectReferencesByRuntime;
</GetClangProjectReferencesDependsOn>
</PropertyGroup>

Expand Down
Loading
Loading