[javadoc-to-mdoc] Fix $(OutputPath) value
#712
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Commit 97f08f7 "broke" the `javadoc2mdoc.csproj` build by causing it to use was using the wrong `$(OutputPath)` value, as `Configuration.props` wasn't `<Import/>`ed, and thus `$(XAInstallPrefix)` was undefined. Consequently, instead of `javadoc-to-mdoc.exe` being built into `bin/$(Configuration)/lib/xamarin.android/xbuild/Xamarin/Android`, as was desired, it was instead built into `tools/javadoc2mdoc/xbuild/Xamarin/Android`. Add the appropriate `<Import/>` so `javadoc-to-mdoc.exe` is placed into the correct directory.
jonpryor
force-pushed
the
jonp-javadoc2mdoc-build
branch
from
18853b1 to
35e6de6
Compare
jonpryor
added a commit
that referenced
this pull request
Oct 27, 2017
I have been told that the `prepare-image-dependencies.sh` script should also install `mono`, to ensure that the required mono exists. Add a `@PKG_URLS@` variable to `prepare-image-dependencies.sh.in` to support downloading and installing our minimum specified mono version. Additionally, I discovered that `xbuild` bugs are still around; I just keep forgetting their specifics. Case in point: [Jenkins build #712][xa712] uploaded [`prepare-image-dependencies.sh`][sh], and it's not good: [xa712]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/ [sh]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/712/Azure/processDownloadRequest/xamarin-android/prepare-image-dependencies.sh https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip sdk/build-tools\$(XABuildToolsFolder) ... https://dl.google.com/android/repository/android-15_r03.zip sdk/platforms\android-15 MSBuild properties contained within item metadata -- specifically `%(AndroidSdkItem.DestDir)` -- aren't fully expanded, resulting in the above value of `$(XABuildToolsFolder)`, which *should* be `26.0.1`. Similarly, some install paths are using `\` (backslash) when they should contain `/` (forward slash). Jenkins has been updated to explicitly use `msbuild`: $ make prepare-image-dependencies MSBUILD=msbuild However, `\r` characters now appear in `prepare-image-dependencies.sh`. Fix this by having the `PrepareImageDependencies` target emit the MSBuild-generated file into an intermediate file, then fix it up using **tr**(1). Finally, correct the `brew install` command so that any errors are ignored, for if a brew package is already installed, re-installing it will result in an error.
Redth
pushed a commit
to Redth/xamarin-android
that referenced
this pull request
Oct 30, 2017
I have been told that the `prepare-image-dependencies.sh` script should also install `mono`, to ensure that the required mono exists. Add a `@PKG_URLS@` variable to `prepare-image-dependencies.sh.in` to support downloading and installing our minimum specified mono version. Additionally, I discovered that `xbuild` bugs are still around; I just keep forgetting their specifics. Case in point: [Jenkins build dotnet#712][xa712] uploaded [`prepare-image-dependencies.sh`][sh], and it's not good: [xa712]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/ [sh]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/712/Azure/processDownloadRequest/xamarin-android/prepare-image-dependencies.sh https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip sdk/build-tools\$(XABuildToolsFolder) ... https://dl.google.com/android/repository/android-15_r03.zip sdk/platforms\android-15 MSBuild properties contained within item metadata -- specifically `%(AndroidSdkItem.DestDir)` -- aren't fully expanded, resulting in the above value of `$(XABuildToolsFolder)`, which *should* be `26.0.1`. Similarly, some install paths are using `\` (backslash) when they should contain `/` (forward slash). Jenkins has been updated to explicitly use `msbuild`: $ make prepare-image-dependencies MSBUILD=msbuild However, `\r` characters now appear in `prepare-image-dependencies.sh`. Fix this by having the `PrepareImageDependencies` target emit the MSBuild-generated file into an intermediate file, then fix it up using **tr**(1). Finally, correct the `brew install` command so that any errors are ignored, for if a brew package is already installed, re-installing it will result in an error.
jonpryor
pushed a commit
that referenced
this pull request
Oct 20, 2020
Fixes: dotnet/java-interop#461 Fixes: dotnet/java-interop#682 Fixes: dotnet/java-interop#717 Fixes: dotnet/java-interop#719 Fixes: dotnet/java-interop#728 Changes: dotnet/java-interop@ac914ce...b991bb8 * dotnet/java-interop@b991bb86: [generator] Revert change to use auto-properties in EventArgs classes (#736) * dotnet/java-interop@ee50d89b: Bump to xamarin/xamarin-android-tools/master@f2af06f2 (#733) * dotnet/java-interop@a0b895c1: [build] Suppress NuGet warnings (#730) * dotnet/java-interop@8b1b0507: [generator] Fix parsing of complex generic types (#729) * dotnet/java-interop@ee7afeed: [generator] Prevent generating duplicate EventArgs classes (#726) * dotnet/java-interop@1f21f38c: [generator] Use GC.KeepAlive for reference type method parameters. (#725) * dotnet/java-interop@5136ef98: [Xamarin.Android.Tools.Bytecode] Hide Kotlin nested types inside (#723) * dotnet/java-interop@53d60513: [jnimarshalmethod-gen] Fix registration on Windows (#721) * dotnet/java-interop@5a834d42: [jnimarshalmethod-gen] Avoid creating AppDomains (#720) * dotnet/java-interop@a76edb8c: [Xamarin.Android.Tools.ApiXmlAdjuster] Find app.android.IntentService (#718) * dotnet/java-interop@6cde0877: [Java.Interop] Emit a reference assembly for Java.Interop.dll (#716) * dotnet/java-interop@b858dc59: [generator] Provide line/col numbers for api.xml warnings (#715) * dotnet/java-interop@9be92a04: [ci] Don't kick off CI for documentation only changes. (#712) * dotnet/java-interop@03c22722: [jnimarshalmethod-gen] Fix type resolution crash (#706)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
javadoc2mdoc.csprojwas using the wrong$(OutputPath)value,because it wasn't importing
Configuration.props, and thus$(XAInstallPrefix)was undefined.Consequently, instead of
javadoc-to-mdoc.exebeing built intobin/$(Configuration)/lib/xamarin.android/xbuild/Xamarin/Android, itwas instead built into
tools/javadoc2mdoc/xbuild/Xamarin/Android.Add the appropriate
<Import/>sojavadoc-to-mdoc.exeis placedinto the correct directory.