Skip to content

Conversation

dellis1972
Copy link
Contributor

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=42566

The problem was that we did not UPDATE the ndk-stack.exe property
to be ndk-stack.cmd once we had verified that the ndk was valid.

This commit adds support for changing the ndk-stack extension to
one of the "known" extentions on Windows if it exists.

public override string JarSigner { get { return "jarsigner.exe"; } }
public override string KeyTool { get { return "keytool.exe"; } }
public override string NdkStack { get { return "ndk-stack.exe"; } }
public override string NdkStack { get { return ndkstack; } }
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps instead of fixing up just ndk-stack, we should fix all of then, and unify this logic with the Unix logic.

Rephrased, most of these properties should not be override; AndroidSdkBase could be handling these.

@dellis1972 dellis1972 force-pushed the Bug42566a branch 2 times, most recently from b99cb37 to be86764 Compare August 26, 2016 14:58
public abstract string KeyTool { get; }

public abstract string NdkStack { get; }
public virtual string Adb { get; protected set; } = "adb";
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't you love C#6? :-)

@dellis1972 dellis1972 force-pushed the Bug42566a branch 3 times, most recently from ba0f07a to 431caa4 Compare August 30, 2016 12:48
…ndk-stack.exe is now ndk-stack.cmd

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=42566

The problem was that we did not UPDATE the ndk-stack.exe property
to be ndk-stack.cmd once we had verified that the ndk was valid.
Seeing as this is not the first time google has changed an extension
on a executable we need to do some re-work on these classes.

Firstly we'll default all the values to the 'unix' ones. We will
then use the new Executables method to search for the other exe's
on initalization and update the properties accordinly.

However because some of the files (the java related ones) are in
other paths (like build-tools/x.x.x.x) we will override those
on windows to give them the exepcted .exe extension.
@jonpryor jonpryor merged commit d5c277f into dotnet:master Aug 30, 2016
dellis1972 added a commit that referenced this pull request Aug 31, 2016
…ack.exe is now ndk-stack.cmd (#188)

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=42566

The problem was that we did not UPDATE the ndk-stack.exe property
to be ndk-stack.cmd once we had verified that the ndk was valid.
Seeing as this is not the first time google has changed an extension
on a executable we need to do some re-work on these classes.

Firstly we'll default all the values to the 'unix' ones. We will
then use the new Executables method to search for the other exe's
on initalization and update the properties accordinly.

However because some of the files (the java related ones) are in
other paths (like build-tools/x.x.x.x) we will override those
on windows to give them the exepcted .exe extension.
radical pushed a commit that referenced this pull request May 8, 2018
Originally when `JavaDocletType._ApiXml` was added, I forgot to put
some logic in the method which determines what kind of doclet type to
use from the file path itself, which this addresses.
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Aug 24, 2022
Changes: TODO Java.Interop

Changes: dotnet/android-tools@9c641b3...7cfe683

  * dotnet/android-tools@7cfe683: [ci] Use Microsoft.SourceLink.GitHub (dotnet#192)
  * dotnet/android-tools@01a0dde: [Localization] Import translated resx files (dotnet#189)
  * dotnet/android-tools@cc715d9: [Xamarin.Android.Tools.AndroidSdk] Permit NDK r25 (dotnet#190)
  * dotnet/android-tools@3c55e9a: Avoid `Environment.SpecialFolder.ApplicationData` (dotnet#188)
  * dotnet/android-tools@0d55472: LEGO: Merge pull request 187
  * dotnet/android-tools@6946512: Juno: check in to juno/hb_befb220e-87ce-47e9-a9e6-10ea592b2337_20220729154833425. (dotnet#186)
  * dotnet/android-tools@6e3433a: Juno: check in to juno/hb_befb220e-87ce-47e9-a9e6-10ea592b2337_20220729025332507. (dotnet#185)
  * dotnet/android-tools@73c4388: [Xamarin.Android.Tools.AndroidSdk] Update SDK component for API-33 (dotnet#184)
  * dotnet/android-tools@da3653e: [Xamarin.Android.Tools.AndroidSdk] Add API-33 to KnownVersions
  * dotnet/android-tools@327d433: [ci] Run OneLocBuild on a schedule (dotnet#180)
  * dotnet/android-tools@8ab60e4: [ci] Use latest macOS and Windows images (dotnet#181)
  * dotnet/android-tools@4dd3292: LEGO: Merge pull request 182
  * dotnet/android-tools@56b61f1: [Localization] Add OneLocBuild job (dotnet#175)
  * dotnet/android-tools@14076a6: [Xamarin.Android.Tools.AndroidSdk] Add API-32 to KnownVersions
jonpryor pushed a commit that referenced this pull request Aug 26, 2022
…7309)

Changes: mono/mono.posix@e1269a5...d8994ca

  * mono/mono.posix@d8994ca: Remove Windows support completely for now

    Fixes an issue in which Mono.Unix would try to resolve `libc`
    P/Invokes by looking for the `msvcrt` library on Unix machines.

  * mono/mono.posix@74d504f: Fix yaml template path
  * mono/mono.posix@127cf9e: [build] Don't rebuild managed code on packaging time on Windows

Changes: dotnet/android-libzipsharp@2.0.4...2.0.7

  * dotnet/android-libzipsharp@98e9173: Bump version to 2.0.7
  * dotnet/android-libzipsharp@6e1e1b3: Localized file check-in by OneLocBuild Task: Build definition ID 11678: Build ID 6581869 (#119)
  * dotnet/android-libzipsharp@1c05430: LEGO: Merge pull request 118
  * dotnet/android-libzipsharp@06d44d8: Localized file check-in by OneLocBuild Task: Build definition ID 11678: Build ID 6570668 (#117)
  * dotnet/android-libzipsharp@37f3894: LEGO: Merge pull request 116
  * dotnet/android-libzipsharp@6c0edc5: Update libzip and zlib submodules (#115)
  * dotnet/android-libzipsharp@acd9a54: [Localization] Switch from xlf to resx files  (#112)
  * dotnet/android-libzipsharp@3cece80: LEGO: Merge pull request 114
  * dotnet/android-libzipsharp@fe336b4: LEGO: Merge pull request 113
  * dotnet/android-libzipsharp@9aee99a: [Localization] Add OneLocBuild job (#111)
  * dotnet/android-libzipsharp@bdfa9f8: Bump Mono.Unix to 7.1.0-final.1.21458.1 (#110)

Changes: xamarin/monodroid@210073e...100ccf9

  * xamarin/monodroid@100ccf969: Bump to xamarin/androidtools@81486ab, xamarin/android-sdk-installer@8cac7ea (#1264)

Changes: dotnet/android-tools@9c641b3...29f11f2

  * dotnet/android-tools@29f11f2 Bump to mono/mono.posix@d8994ca, dotnet/android-libzipsharp@98e9173 (#193)
  * dotnet/android-tools@7cfe683 [ci] Use Microsoft.SourceLink.GitHub (#192)
  * dotnet/android-tools@01a0dde [Localization] Import translated resx files (#189)
  * dotnet/android-tools@cc715d9 [Xamarin.Android.Tools.AndroidSdk] Permit NDK r25 (#190)
  * dotnet/android-tools@3c55e9a Avoid `Environment.SpecialFolder.ApplicationData` (#188)
  * dotnet/android-tools@0d55472 LEGO: Merge pull request 187
  * dotnet/android-tools@6946512 Juno: check in to juno/hb_befb220e-87ce-47e9-a9e6-10ea592b2337_20220729154833425. (#186)
  * dotnet/android-tools@6e3433a Juno: check in to juno/hb_befb220e-87ce-47e9-a9e6-10ea592b2337_20220729025332507. (#185)
  * dotnet/android-tools@73c4388 [Xamarin.Android.Tools.AndroidSdk] Update SDK component for API-33 (#184)
  * dotnet/android-tools@da3653e [Xamarin.Android.Tools.AndroidSdk] Add API-33 to KnownVersions
  * dotnet/android-tools@327d433 [ci] Run OneLocBuild on a schedule (#180)
  * dotnet/android-tools@8ab60e4 [ci] Use latest macOS and Windows images (#181)
  * dotnet/android-tools@4dd3292 LEGO: Merge pull request 182
  * dotnet/android-tools@56b61f1 [Localization] Add OneLocBuild job (#175)
  * dotnet/android-tools@14076a6 [Xamarin.Android.Tools.AndroidSdk] Add API-32 to KnownVersions
@github-actions github-actions bot locked and limited conversation to collaborators Feb 6, 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.

3 participants