diff --git a/Makefile b/Makefile index 06c3078f549..85c28361c68 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ --include bin/configuration.mk - V ?= 0 prefix = /usr/local CONFIGURATION ?= Debug diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Unix.cs b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Unix.cs deleted file mode 100644 index 4389ac9e0b6..00000000000 --- a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Unix.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; - -namespace Xamarin.Android.Prepare -{ - partial class Step_GenerateFiles - { - sealed class GeneratedConfigurationFile : GeneratedFile - { - public GeneratedConfigurationFile (string outputPath) : - base(outputPath) - {} - - public override void Generate (Context context) - { - if (context == null) - throw new ArgumentNullException (nameof (context)); - - using (StreamWriter sw = Utilities.OpenStreamWriter (OutputPath)) { - sw.WriteLine ("# This file is used by both Make and shell scripts"); - sw.WriteLine ($"CONFIGURATION={context.Configuration}"); - sw.Flush (); - } - } - } - - partial void AddUnixPostBuildSteps (Context context, List steps) - { - steps.Add (new GeneratedConfigurationFile (Path.Combine (Configurables.Paths.BinDirRoot, "configuration.mk"))); - } - } -} diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs index b7f75ef39f1..255c181ee75 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs @@ -81,12 +81,10 @@ protected override async Task Execute (Context context) }; AddOSSpecificSteps (context, steps); - AddUnixPostBuildSteps (context, steps); return steps; } - partial void AddUnixPostBuildSteps (Context context, List steps); partial void AddOSSpecificSteps (Context context, List steps); GeneratedFile Get_Cmake_XA_Build_Configuration (Context context)