[build] Ensure submodules init'd before using them #131
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
`make jenkins` after a fresh checkout was failing: $ make jenkins cp Configuration.Java.Interop.Override.props external/Java.Interop/Configuration.Override.props ./build-tools/scripts/generate-os-info Configuration.OperatingSystem.props cp `xbuild /p:Configuration=Debug /nologo /v:minimal /t:GetMonoSourceFullPath build-tools/scripts/Paths.targets`/mcs/class/msfinal.pub . cp: /Volumes/Seagate4TB/work/xamarin-android/external/mono/mcs/class/msfinal.pub: No such file or directory make: *** [prepare-props] Error 1 The reason it failed is because `make prepare-props` ran *before* `git submodule update` ran, meaning the file `external/mono/mcs/class/msfinal.pub` didn't exist yet. Move the git submodule initialization logic into a new `make prepare-external` target, which is run before `make prepare-props`. This ensures that required files exist before they are used. Additionally, fix the `make prepare-external` logic so that if the `$(JavaInteropSourceDirectory)` MSBuild property is overridden, we run `nuget restore` from the appropriate directory.
radical
pushed a commit
that referenced
this pull request
May 8, 2018
) Fixes: dotnet/java-interop#129 The System.Double/Single ["Round-trip Format Specifier"][0] varies by culture, so cultures which use `,` as the decimal separator character use `,` within e.g. `42.0.ToString("r")`. For example, the Java declaration: class E { public static final double V = 42.5; } on french systems would result in `class-parse` emitting: <field name="V" value="42,5" .../> which, when run through `generator`, emits: public const double V = (double) 42,5; ...which promptly fails with a CS1001. Oops. Fix our `double` and `float` serialization in `XmlClassDeclarationBuilder` so that `CultureInfo.InvariantCulture` is used, which ensures that `.` is the decimal separator character, ensuring that `class-parse` and `generator` output is as expected. [0]: https://msdn.microsoft.com/en-us/library/dwhawy9k(v=vs.110).aspx#RFormatString
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Aug 27, 2021
Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1314263 Changes: dotnet/android-tools@efc9b67...9b658b2 * dotnet/android-tools@9b658b2: Merge pull request dotnet#133 from xamarin/ndk-r23 * dotnet/android-tools@ff73f92: [build] Use GitInfo to generate $(Version) (dotnet#131) * dotnet/android-tools@4c2e36c: [Xamarin.Android.Tools.AndroidSdk] Eclipse Adoptium support (dotnet#132) * dotnet/android-tools@eaec4e3: [Xamarin.Android.Tools.AndroidSdk] More Microsoft Dist JDK Support (dotnet#130) * dotnet/android-tools@f9c1b0d: [BaseTasks] improve Task settings in AsyncTaskExtensions (dotnet#129) * dotnet/android-tools@02f7ae7: [NDK] Properly detect 64-bit NDK
jonpryor
added a commit
that referenced
this pull request
Aug 27, 2021
Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1314263 Changes: dotnet/android-tools@efc9b67...9b658b2 * dotnet/android-tools@9b658b2: Merge pull request #133 from xamarin/ndk-r23 * dotnet/android-tools@ff73f92: [build] Use GitInfo to generate $(Version) (#131) * dotnet/android-tools@4c2e36c: [Xamarin.Android.Tools.AndroidSdk] Eclipse Adoptium support (#132) * dotnet/android-tools@eaec4e3: [Xamarin.Android.Tools.AndroidSdk] More Microsoft Dist JDK Support (#130) * dotnet/android-tools@f9c1b0d: [BaseTasks] improve Task settings in AsyncTaskExtensions (#129) * dotnet/android-tools@02f7ae7: [NDK] Properly detect 64-bit NDK
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
make jenkinsafter a fresh checkout was failing:The reason it failed is because
make prepare-propsran beforegit submodule updateran, meaning the fileexternal/mono/mcs/class/msfinal.pubdidn't exist yet.Move the git submodule initialization logic into a new
make prepare-externaltarget, which is run beforemake prepare-props. This ensures that required files exist beforethey are used.
Additionally, fix the
make prepare-externallogic so that if the$(JavaInteropSourceDirectory)MSBuild property is overridden, we runnuget restorefrom the appropriate directory.