From 13a56ffb956f21f3284c6fa5728d23e5949b96cd Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 17 Mar 2020 15:49:39 +0100 Subject: [PATCH] [mtouch/mmp] Rework how we find developer tools. Partial fix for #4634 and fixes #8005. (#8121) Partial fix for https://github.com/xamarin/xamarin-macios/issues/4634. Fixes https://github.com/xamarin/xamarin-macios/issues/8005. --- tests/mmptest/src/MMPTest.cs | 2 +- tests/mmptest/src/NativeReferencesTests.cs | 2 +- tools/common/Driver.cs | 179 ++++++++++++++++++--- tools/mmp/Application.cs | 1 + tools/mmp/driver.cs | 41 ++--- tools/mmp/mmp.csproj | 1 + tools/mtouch/Application.cs | 4 +- tools/mtouch/Target.cs | 2 +- tools/mtouch/errors.Designer.cs | 26 +-- tools/mtouch/errors.resx | 17 +- tools/mtouch/mtouch.cs | 71 -------- tools/mtouch/xlf/Errors.cs.xlf | 48 ++++-- tools/mtouch/xlf/Errors.de.xlf | 48 ++++-- tools/mtouch/xlf/Errors.es.xlf | 48 ++++-- tools/mtouch/xlf/Errors.fr.xlf | 48 ++++-- tools/mtouch/xlf/Errors.it.xlf | 48 ++++-- tools/mtouch/xlf/Errors.ja.xlf | 48 ++++-- tools/mtouch/xlf/Errors.ko.xlf | 48 ++++-- tools/mtouch/xlf/Errors.pl.xlf | 48 ++++-- tools/mtouch/xlf/Errors.pt-BR.xlf | 48 ++++-- tools/mtouch/xlf/Errors.ru.xlf | 48 ++++-- tools/mtouch/xlf/Errors.tr.xlf | 48 ++++-- tools/mtouch/xlf/Errors.zh-Hans.xlf | 48 ++++-- tools/mtouch/xlf/Errors.zh-Hant.xlf | 48 ++++-- 24 files changed, 620 insertions(+), 350 deletions(-) diff --git a/tests/mmptest/src/MMPTest.cs b/tests/mmptest/src/MMPTest.cs index c337dbeb2a..18f32ac95c 100644 --- a/tests/mmptest/src/MMPTest.cs +++ b/tests/mmptest/src/MMPTest.cs @@ -26,7 +26,7 @@ namespace Xamarin.MMP.Tests TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir) { CSProjConfig = projectConfig }; string buildOutput = TI.TestUnifiedExecutable (test).BuildOutput; string [] splitBuildOutput = TI.TestUnifiedExecutable (test).BuildOutput.Split (new string[] { Environment.NewLine }, StringSplitOptions.None); - string clangInvocation = splitBuildOutput.Single (x => x.Contains ("clang")); + string clangInvocation = splitBuildOutput.Single (x => x.Contains ("usr/bin/clang")); return clangInvocation.Split (new string[] { " " }, StringSplitOptions.None); } diff --git a/tests/mmptest/src/NativeReferencesTests.cs b/tests/mmptest/src/NativeReferencesTests.cs index df26108803..a21db75a7d 100644 --- a/tests/mmptest/src/NativeReferencesTests.cs +++ b/tests/mmptest/src/NativeReferencesTests.cs @@ -112,7 +112,7 @@ namespace Xamarin.MMP.Tests MMPTests.RunMMPTest (tmpDir => { TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir) { ItemGroup = CreateSingleNativeRef (SimpleStaticPath, "Static") }; NativeReferenceTestCore (tmpDir, test, "Unified_WithNativeReferences_InMainProjectWorks - Static", null, true, false, s => { - string clangLine = s.Split ('\n').First (x => x.Contains ("xcrun -sdk macosx clang")); + string clangLine = s.Split ('\n').First (x => x.Contains ("usr/bin/clang")); return clangLine.Contains ("SimpleClassStatic.a"); }); }); diff --git a/tools/common/Driver.cs b/tools/common/Driver.cs index 0b52171bf0..5ffeb043b5 100644 --- a/tools/common/Driver.cs +++ b/tools/common/Driver.cs @@ -754,28 +754,6 @@ namespace Xamarin.Bundler { Driver.Log (1, "Using Xcode {0} ({2}) found in {1}", XcodeVersion, sdk_root, XcodeProductVersion); } - public static int XcodeRun (string command, params string [] arguments) - { - return XcodeRun (command, (IList) arguments, null); - } - - public static int XcodeRun (string command, IList arguments, StringBuilder output = null) - { - string [] env = DeveloperDirectory != String.Empty ? new string [] { "DEVELOPER_DIR", DeveloperDirectory } : null; - var args = new List (); - args.Add ("-sdk"); - args.Add ("macosx"); - args.Add (command); - args.AddRange (arguments); - int ret = RunCommand ("xcrun", args, env, output); - if (ret != 0 && Verbosity > 1) { - StringBuilder debug = new StringBuilder (); - RunCommand ("xcrun", new [] { "--find", command }, env, debug); - Console.WriteLine ("failed using `{0}` from: {1}", command, debug); - } - return ret; - } - internal static bool TryParseBool (string value, out bool result) { if (string.IsNullOrEmpty (value)) { @@ -809,5 +787,162 @@ namespace Xamarin.Bundler { return result; } + static readonly Dictionary tools = new Dictionary (); + static string FindTool (string tool) + { + string path; + + lock (tools) { + if (tools.TryGetValue (tool, out path)) + return path; + } + + path = LocateTool (tool); + static string LocateTool (string tool) + { + if (XcrunFind (tool, out var path)) + return path; + + // either /Developer (Xcode 4.2 and earlier), /Applications/Xcode.app/Contents/Developer (Xcode 4.3) or user override + path = Path.Combine (DeveloperDirectory, "usr", "bin", tool); + if (File.Exists (path)) + return path; + + // Xcode 4.3 (without command-line tools) also has a copy of 'strip' + path = Path.Combine (DeveloperDirectory, "Toolchains", "XcodeDefault.xctoolchain", "usr", "bin", tool); + if (File.Exists (path)) + return path; + + // Xcode "Command-Line Tools" install a copy in /usr/bin (and it can be there afterward) + path = Path.Combine ("/usr", "bin", tool); + if (File.Exists (path)) + return path; + + return null; + } + + // We can end up finding the same tool multiple times. + // That's not a problem. + lock (tools) + tools [tool] = path; + + if (path == null) + throw ErrorHelper.CreateError (5307, Errors.MX5307 /* Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component */, tool); + + return path; + } + + static bool XcrunFind (string tool, out string path) + { + return XcrunFind (ApplePlatform.None, false, tool, out path); + } + + static bool XcrunFind (ApplePlatform platform, bool is_simulator, string tool, out string path) + { + var env = new List (); + // Unset XCODE_DEVELOPER_DIR_PATH. See https://github.com/xamarin/xamarin-macios/issues/3931. + env.Add ("XCODE_DEVELOPER_DIR_PATH"); + env.Add (null); + // Set DEVELOPER_DIR if we have it + if (!string.IsNullOrEmpty (DeveloperDirectory)) { + env.Add ("DEVELOPER_DIR"); + env.Add (DeveloperDirectory); + } + + path = null; + + var args = new List (); + if (platform != ApplePlatform.None) { + args.Add ("-sdk"); + switch (platform) { + case ApplePlatform.iOS: + args.Add (is_simulator ? "iphonesimulator" : "iphoneos"); + break; + case ApplePlatform.MacOSX: + args.Add ("macosx"); + break; + case ApplePlatform.TVOS: + args.Add (is_simulator ? "appletvsimulator" : "appletvos"); + break; + case ApplePlatform.WatchOS: + args.Add (is_simulator ? "watchsimulator" : "watchos"); + break; + default: + throw ErrorHelper.CreateError (71, Errors.MX0071 /* Unknown platform: {0}. This usually indicates a bug in {1}; please file a bug report at https://github.com/xamarin/xamarin-macios/issues/new with a test case. */, platform.ToString (), PRODUCT); + } + } + args.Add ("-f"); + args.Add (tool); + + var output = new StringBuilder (); + int ret = RunCommand ("xcrun", args, env.ToArray (), output); + + if (ret == 0) { + path = output.ToString ().Trim (); + } else { + Log (1, "Failed to locate the developer tool '{0}', 'xcrun {1}' returned with the exit code {2}:\n{3}", tool, string.Join (" ", args), ret, output.ToString ()); + } + + return ret == 0; + } + + public static void RunXcodeTool (string tool, params string[] arguments) + { + RunXcodeTool (tool, (IList) arguments); + } + + public static void RunXcodeTool (string tool, IList arguments) + { + var executable = FindTool (tool); + var rv = RunCommand (executable, arguments); + if (rv != 0) + throw ErrorHelper.CreateError (5309, Errors.MX5309 /* Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. */, tool, rv); + } + + public static void RunClang (IList arguments) + { + RunXcodeTool ("clang", arguments); + } + + public static void RunInstallNameTool (IList arguments) + { + RunXcodeTool ("install_name_tool", arguments); + } + + public static void RunBitcodeStrip (IList arguments) + { + RunXcodeTool ("bitcode_strip", arguments); + } + + public static void RunLipo (string output, IEnumerable inputs) + { + var sb = new List (); + sb.AddRange (inputs); + sb.Add ("-create"); + sb.Add ("-output"); + sb.Add (output); + RunLipo (sb); + } + + public static void RunLipo (IList options) + { + RunXcodeTool ("lipo", options); + } + + public static void CreateDsym (string output_dir, string appname, string dsym_dir) + { + RunDsymUtil (Path.Combine (output_dir, appname), "-num-threads", "4", "-z", "-o", dsym_dir); + RunCommand ("/usr/bin/mdimport", dsym_dir); + } + + public static void RunDsymUtil (params string [] options) + { + RunXcodeTool ("dsymutil", options); + } + + public static void RunStrip (IList options) + { + RunXcodeTool ("strip", options); + } } } diff --git a/tools/mmp/Application.cs b/tools/mmp/Application.cs index e9a1b28716..ed94cdd383 100644 --- a/tools/mmp/Application.cs +++ b/tools/mmp/Application.cs @@ -9,6 +9,7 @@ namespace Xamarin.Bundler { public bool Is32Build => false; public bool Is64Build => true; public bool IsDualBuild => false; + public bool IsSimulatorBuild => false; bool RequiresXcodeHeaders => Driver.Registrar == RegistrarMode.Static && LinkMode == LinkMode.None; diff --git a/tools/mmp/driver.cs b/tools/mmp/driver.cs index f9b3d2839c..e3fe5106e7 100644 --- a/tools/mmp/driver.cs +++ b/tools/mmp/driver.cs @@ -758,17 +758,9 @@ namespace Xamarin.Bundler { Watch ("Copy Dependencies", 1); // MDK check - var ret = Compile (); + Compile (); Watch ("Compile", 1); - if (ret != 0) { - if (ret == 1) - throw new MonoMacException (5109, true, Errors.MM5109); - if (ret == 69) - throw new MonoMacException (5308, true, Errors.MM5308); - // if not then the compilation really failed - throw new MonoMacException (5103, true, Errors.MM5103, ret); - } - + if (generate_plist) GeneratePList (); @@ -1032,10 +1024,8 @@ namespace Xamarin.Bundler { throw ErrorHelper.CreateError (1, Errors.MM0001, MonoVersions.MinimumMonoVersion, mono_version); } - static int Compile () + static void Compile () { - int ret = 1; - string [] cflags = Array.Empty (); string mainSource = GenerateMain (); @@ -1270,13 +1260,10 @@ namespace Xamarin.Bundler { sourceFiles.Add (main); args.AddRange (sourceFiles); - - ret = XcodeRun ("clang", args, null); + RunClang (args); } catch (Win32Exception e) { throw new MonoMacException (5103, true, e, Errors.MM5103, "driver"); } - - return ret; } static string RunPkgConfig (string option, bool force_system_mono = false) @@ -1425,9 +1412,7 @@ namespace Xamarin.Bundler { string libName = Path.GetFileName (linkWith); string finalLibPath = Path.Combine (mmp_dir, libName); Application.UpdateFile (linkWith, finalLibPath); - int ret = XcodeRun ("install_name_tool", new [] { "-id", "@executable_path/../" + BundleName + "/" + libName, finalLibPath }); - if (ret != 0) - throw new MonoMacException (5310, true, Errors.MM5310, ret); + RunInstallNameTool (new [] { "-id", "@executable_path/../" + BundleName + "/" + libName, finalLibPath }); native_libraries_copied_in.Add (libName); } } @@ -1455,10 +1440,7 @@ namespace Xamarin.Bundler { } // if required update the paths inside the .dylib that was copied if (sb.Count > 0) { - sb.Add (library); - int ret = XcodeRun ("install_name_tool", sb); - if (ret != 0) - throw new MonoMacException (5310, true, Errors.MM5310, ret); + RunInstallNameTool (sb); sb.Clear (); } } @@ -1595,11 +1577,8 @@ namespace Xamarin.Bundler { LipoLibrary (name, dest); if (native_references.Contains (real_src)) { - if (!isStaticLib) { - int ret = XcodeRun ("install_name_tool", new [] { "-id", "@executable_path/../" + BundleName + "/" + name, dest }); - if (ret != 0) - throw new MonoMacException (5310, true, Errors.MM5310, ret); - } + if (!isStaticLib) + RunInstallNameTool (new [] { "-id", "@executable_path/../" + BundleName + "/" + name, dest }); native_libraries_copied_in.Add (name); } @@ -1631,9 +1610,7 @@ namespace Xamarin.Bundler { if (existingArchs.Count () < 2) return; - int ret = XcodeRun ("lipo", new [] { dest, "-thin", arch, "-output", dest }); - if (ret != 0) - throw new MonoMacException (5311, true, Errors.MM5311, ret); + RunLipo (new [] { dest, "-thin", arch, "-output", dest }); if (name != "MonoPosixHelper" && name != "libmono-native-unified" && name != "libmono-native-compat") ErrorHelper.Warning (2108, Errors.MM2108, name, arch); } diff --git a/tools/mmp/mmp.csproj b/tools/mmp/mmp.csproj index 7397568acc..ccb3e752f9 100644 --- a/tools/mmp/mmp.csproj +++ b/tools/mmp/mmp.csproj @@ -9,6 +9,7 @@ mmp mmp v4.6 + 8.0 True diff --git a/tools/mtouch/Application.cs b/tools/mtouch/Application.cs index e9c97a0508..8a8b2c5ba4 100644 --- a/tools/mtouch/Application.cs +++ b/tools/mtouch/Application.cs @@ -1811,7 +1811,7 @@ namespace Xamarin.Bundler { Driver.RunLipo (targetPath, files); } if (LibMonoLinkMode == AssemblyBuildTarget.Framework) - Driver.XcodeRun ("install_name_tool", "-change", "@rpath/libmonosgen-2.0.dylib", "@rpath/Mono.framework/Mono", targetPath); + Driver.RunInstallNameTool (new [] { "-change", "@rpath/libmonosgen-2.0.dylib", "@rpath/Mono.framework/Mono", targetPath }); // Remove architectures we don't care about. if (IsDeviceBuild) @@ -1863,7 +1863,7 @@ namespace Xamarin.Bundler { } sb.Add ("-o"); sb.Add (macho_file); - Driver.XcodeRun ("bitcode_strip", sb); + Driver.RunBitcodeStrip (sb); } // Returns true if is up-to-date diff --git a/tools/mtouch/Target.cs b/tools/mtouch/Target.cs index 8a64d4eeba..a038257013 100644 --- a/tools/mtouch/Target.cs +++ b/tools/mtouch/Target.cs @@ -1716,7 +1716,7 @@ namespace Xamarin.Bundler } if (sb.Count > 0) { sb.Add (output); - Driver.XcodeRun ("install_name_tool", sb); + Driver.RunInstallNameTool (sb); sb.Clear (); } } diff --git a/tools/mtouch/errors.Designer.cs b/tools/mtouch/errors.Designer.cs index 8db5b28826..4293438bbf 100644 --- a/tools/mtouch/errors.Designer.cs +++ b/tools/mtouch/errors.Designer.cs @@ -2243,12 +2243,6 @@ namespace Xamarin.Bundler { } } - internal static string MM5301 { - get { - return ResourceManager.GetString("MM5301", resourceCulture); - } - } - internal static string MT5302 { get { return ResourceManager.GetString("MT5302", resourceCulture); @@ -2267,9 +2261,9 @@ namespace Xamarin.Bundler { } } - internal static string MT5305 { + internal static string MX5305 { get { - return ResourceManager.GetString("MT5305", resourceCulture); + return ResourceManager.GetString("MX5305", resourceCulture); } } @@ -2279,21 +2273,33 @@ namespace Xamarin.Bundler { } } + internal static string MX5307 { + get { + return ResourceManager.GetString("MX5307", resourceCulture); + } + } + internal static string MM5308 { get { return ResourceManager.GetString("MM5308", resourceCulture); } } + internal static string MX5309 { + get { + return ResourceManager.GetString("MX5309", resourceCulture); + } + } + internal static string MM5310 { get { return ResourceManager.GetString("MM5310", resourceCulture); } } - internal static string MM5311 { + internal static string MX5311 { get { - return ResourceManager.GetString("MM5311", resourceCulture); + return ResourceManager.GetString("MX5311", resourceCulture); } } diff --git a/tools/mtouch/errors.resx b/tools/mtouch/errors.resx index 24c7e89baa..8731ac7062 100644 --- a/tools/mtouch/errors.resx +++ b/tools/mtouch/errors.resx @@ -2598,7 +2598,7 @@ - + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component @@ -2612,6 +2612,13 @@ + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + Xcode license agreement may not have been accepted. Please launch Xcode. @@ -2619,6 +2626,12 @@ + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + install_name_tool failed with an error code '{0}'. Check build log for details. @@ -2626,7 +2639,7 @@ - + lipo failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/mtouch.cs b/tools/mtouch/mtouch.cs index 2e4c1b822a..9ccde4a5f3 100644 --- a/tools/mtouch/mtouch.cs +++ b/tools/mtouch/mtouch.cs @@ -1390,77 +1390,6 @@ namespace Xamarin.Bundler } } - // workaround issues like: - // * Xcode 4.x versus 4.3 (location of /Developer); and - // * the (optional) installation of "Command-Line Tools" by Xcode - public static void RunStrip (IList options) - { - // either /Developer (Xcode 4.2 and earlier), /Applications/Xcode.app/Contents/Developer (Xcode 4.3) or user override - string strip = FindTool ("strip"); - if (strip == null) - throw new MonoTouchException (5301, Errors.MT5301); - - if (RunCommand (strip, options) != 0) - throw new MonoTouchException (5304, true, Errors.MT5304); - } - - static string FindTool (string tool) - { - // either /Developer (Xcode 4.2 and earlier), /Applications/Xcode.app/Contents/Developer (Xcode 4.3) or user override - var path = Path.Combine (DeveloperDirectory, "usr", "bin", tool); - if (File.Exists (path)) - return path; - - // Xcode "Command-Line Tools" install a copy in /usr/bin (and it can be there afterward) - path = Path.Combine ("/usr", "bin", tool); - if (File.Exists (path)) - return path; - - // Xcode 4.3 (without command-line tools) also has a copy of 'strip' - path = Path.Combine (DeveloperDirectory, "Toolchains", "XcodeDefault.xctoolchain", "usr", "bin", tool); - if (File.Exists (path)) - return path; - - return null; - } - - public static void CreateDsym (string output_dir, string appname, string dsym_dir) - { - RunDsymUtil (Path.Combine (output_dir, appname), "-num-threads", "4", "-z", "-o", dsym_dir); - RunCommand ("/usr/bin/mdimport", dsym_dir); - } - - public static void RunLipo (string output, IEnumerable inputs) - { - var sb = new List (); - sb.AddRange (inputs); - sb.Add ("-create"); - sb.Add ("-output"); - sb.Add (output); - RunLipo (sb); - } - - public static void RunLipo (IList options) - { - string lipo = FindTool ("lipo"); - if (lipo == null) - throw new MonoTouchException (5305, true, Errors.MT5305); - if (RunCommand (lipo, options) != 0) - throw new MonoTouchException (5306, true, Errors.MT5305); - } - - static void RunDsymUtil (params string[] options) - { - // either /Developer (Xcode 4.2 and earlier), /Applications/Xcode.app/Contents/Developer (Xcode 4.3) or user override - string dsymutil = FindTool ("dsymutil"); - if (dsymutil == null) { - ErrorHelper.Warning (5302, Errors.MT5302); - return; - } - if (RunCommand (dsymutil, options) != 0) - throw new MonoTouchException (5303, true, Errors.MT5303); - } - static string GetFrameworkDir (string platform, Version iphone_sdk) { return Path.Combine (PlatformsDirectory, platform + ".platform", "Developer", "SDKs", platform + iphone_sdk.ToString () + ".sdk"); diff --git a/tools/mtouch/xlf/Errors.cs.xlf b/tools/mtouch/xlf/Errors.cs.xlf index 8d99854fc1..3047fdca94 100644 --- a/tools/mtouch/xlf/Errors.cs.xlf +++ b/tools/mtouch/xlf/Errors.cs.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.de.xlf b/tools/mtouch/xlf/Errors.de.xlf index 8aec5d9120..ae523cc847 100644 --- a/tools/mtouch/xlf/Errors.de.xlf +++ b/tools/mtouch/xlf/Errors.de.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.es.xlf b/tools/mtouch/xlf/Errors.es.xlf index bf42873217..f7236a65e1 100644 --- a/tools/mtouch/xlf/Errors.es.xlf +++ b/tools/mtouch/xlf/Errors.es.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.fr.xlf b/tools/mtouch/xlf/Errors.fr.xlf index 23f38cf0df..b1e6184754 100644 --- a/tools/mtouch/xlf/Errors.fr.xlf +++ b/tools/mtouch/xlf/Errors.fr.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.it.xlf b/tools/mtouch/xlf/Errors.it.xlf index d66af5922b..0edba083c8 100644 --- a/tools/mtouch/xlf/Errors.it.xlf +++ b/tools/mtouch/xlf/Errors.it.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.ja.xlf b/tools/mtouch/xlf/Errors.ja.xlf index 2a687b6ba5..6a15d17f77 100644 --- a/tools/mtouch/xlf/Errors.ja.xlf +++ b/tools/mtouch/xlf/Errors.ja.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.ko.xlf b/tools/mtouch/xlf/Errors.ko.xlf index f429e5c70b..8ff1f7ab85 100644 --- a/tools/mtouch/xlf/Errors.ko.xlf +++ b/tools/mtouch/xlf/Errors.ko.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.pl.xlf b/tools/mtouch/xlf/Errors.pl.xlf index 2029bf4588..135df8c0fe 100644 --- a/tools/mtouch/xlf/Errors.pl.xlf +++ b/tools/mtouch/xlf/Errors.pl.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.pt-BR.xlf b/tools/mtouch/xlf/Errors.pt-BR.xlf index 64f4649393..78ebb166f7 100644 --- a/tools/mtouch/xlf/Errors.pt-BR.xlf +++ b/tools/mtouch/xlf/Errors.pt-BR.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.ru.xlf b/tools/mtouch/xlf/Errors.ru.xlf index f16d9edc0c..287e5ba4b3 100644 --- a/tools/mtouch/xlf/Errors.ru.xlf +++ b/tools/mtouch/xlf/Errors.ru.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.tr.xlf b/tools/mtouch/xlf/Errors.tr.xlf index f496ad3309..3616ba9141 100644 --- a/tools/mtouch/xlf/Errors.tr.xlf +++ b/tools/mtouch/xlf/Errors.tr.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.zh-Hans.xlf b/tools/mtouch/xlf/Errors.zh-Hans.xlf index 8f2b4ddea3..e09a34e9a9 100644 --- a/tools/mtouch/xlf/Errors.zh-Hans.xlf +++ b/tools/mtouch/xlf/Errors.zh-Hans.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details. diff --git a/tools/mtouch/xlf/Errors.zh-Hant.xlf b/tools/mtouch/xlf/Errors.zh-Hant.xlf index 518e88a19b..3b36793122 100644 --- a/tools/mtouch/xlf/Errors.zh-Hant.xlf +++ b/tools/mtouch/xlf/Errors.zh-Hant.xlf @@ -354,14 +354,6 @@ - - lipo failed with an error code '{0}'. Check build log for details. - - lipo failed with an error code '{0}'. Check build log for details. - - - - Unexpected error - Please fill a bug report at https://github.com/xamarin/xamarin-macios/issues/new @@ -2658,14 +2650,6 @@ - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component - - - - Failed to create the a fat library. Please review the build log. @@ -2994,6 +2978,38 @@ + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + Missing 'lipo' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + Missing '{0}' tool. Please install Xcode 'Command-Line Tools' component + + + + + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + Failed to execute the tool '{0}', it failed with an error code '{1}'. Please check the build log for details. + + + + + + lipo failed with an error code '{0}'. Check build log for details. + + lipo failed with an error code '{0}'. Check build log for details. + + + + pkg-config failed with an error code '{0}'. Check build log for details.