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.

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

[Java.Interop.BootstrapTasks] Use JdkInfo #349

Merged
merged 1 commit into from Jul 27, 2018

Conversation

jonpryor
Copy link
Member

Context: xamarin/xamarin-android-tools#29 (comment)

Bumps to xamarin/xamarin-android-tools:master@75530565

The <JdkInfo/> task within Java.Interop.BootstrapTasks.dll isn't
the only thing that needs to determine the path of an installed JDK.
The IDEs could also use such functionality, as could xamarin-android.

Add a submodule reference to xamarin-android-tools, and use
Xamarin.Android.Tools.JdkInfo to find the preferred JDK, instead of
having lots of custom probing with the <JdkInfo/> task.

Finally, for consistency, move src/Java.Interop.BootstrapTasks to
build-tools/Java.Interop.BootstrapTasks, as the
Java.Interop.BootstrapTasks.dll assembly is only intended for in
building Java.Interop itself, and not for "downlevel" distribution.

Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think something is happening on Windows:

build-tools\scripts\PrepareWindows.targets(15,5): Error MSB3202: The project file "E:\A\_work\4\s\build-tools\scripts\..\..\src\Java.Interop.BootstrapTasks\Java.Interop.BootstrapTasks.csproj" was not found.

Process 'msbuild.exe' exited with code '1'.

Oh, this path changed:

<MSBuild Projects="$(MSBuildThisFileDirectory)..\..\src\Java.Interop.BootstrapTasks\Java.Interop.BootstrapTasks.csproj" />

Context: xamarin/xamarin-android-tools#29 (comment)

Bumps to xamarin/xamarin-android-tools:master@75530565

The `<JdkInfo/>` task within `Java.Interop.BootstrapTasks.dll` isn't
the *only* thing that needs to determine the path of an installed JDK.
The IDEs could also use such functionality, as could xamarin-android.

Add a submodule reference to xamarin-android-tools, and use
`Xamarin.Android.Tools.JdkInfo` to find the preferred JDK, instead of
having lots of custom probing with the `<JdkInfo/>` task.

Finally, for consistency, move `src/Java.Interop.BootstrapTasks` to
`build-tools/Java.Interop.BootstrapTasks`, as the
`Java.Interop.BootstrapTasks.dll` assembly is only intended for in
building Java.Interop *itself*, and not for "downlevel" distribution.
@jonpryor jonpryor merged commit 32f0c9c into xamarin:master Jul 27, 2018
jonathanpeppers added a commit to jonathanpeppers/xamarin-android that referenced this pull request Aug 25, 2018
Context: xamarin/java.interop@78f7301...893562c

Use JdkInfo during the build:
xamarin/java.interop#349

Optimize type lookups:
xamarin/java.interop#350

[jnimarshalmethod-gen] --types option:
xamarin/java.interop@d174fa6

Remove unused XAIntegration $(Configuration):
xamarin/java.interop#361

Option to build Java.Interop as non-PCL:
xamarin/java.interop#360
dellis1972 pushed a commit to xamarin/xamarin-android that referenced this pull request Aug 26, 2018
Context: xamarin/java.interop@78f7301...893562c

Use JdkInfo during the build:
xamarin/java.interop#349

Optimize type lookups:
xamarin/java.interop#350

[jnimarshalmethod-gen] --types option:
xamarin/java.interop@d174fa6

Remove unused XAIntegration $(Configuration):
xamarin/java.interop#361

Option to build Java.Interop as non-PCL:
xamarin/java.interop#360
@github-actions github-actions bot locked and limited conversation to collaborators Apr 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants