Skip to content

[Xamarin.Android.Build.Tasks] not so many log messages! #2952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs
Original file line number Diff line number Diff line change
Expand Up @@ -211,25 +211,6 @@ void ProcessManifest (ITaskItem manifestFile)

public override bool Execute ()
{
Log.LogDebugMessage ("Aapt Task");
Log.LogDebugMessage (" AssetDirectory: {0}", AssetDirectory);
Log.LogDebugTaskItems (" ManifestFiles: ", ManifestFiles);
Log.LogDebugMessage (" ResourceDirectory: {0}", ResourceDirectory);
Log.LogDebugMessage (" JavaDesignerOutputDirectory: {0}", JavaDesignerOutputDirectory);
Log.LogDebugMessage (" PackageName: {0}", PackageName);
Log.LogDebugMessage (" UncompressedFileExtensions: {0}", UncompressedFileExtensions);
Log.LogDebugMessage (" ExtraPackages: {0}", ExtraPackages);
Log.LogDebugTaskItems (" AdditionalResourceDirectories: ", AdditionalResourceDirectories);
Log.LogDebugTaskItems (" AdditionalAndroidResourcePaths: ", AdditionalAndroidResourcePaths);
Log.LogDebugTaskItems (" LibraryProjectJars: ", LibraryProjectJars);
Log.LogDebugMessage (" ExtraArgs: {0}", ExtraArgs);
Log.LogDebugMessage (" CreatePackagePerAbi: {0}", CreatePackagePerAbi);
Log.LogDebugMessage (" ResourceNameCaseMap: {0}", ResourceNameCaseMap);
Log.LogDebugMessage (" VersionCodePattern: {0}", VersionCodePattern);
Log.LogDebugMessage (" VersionCodeProperties: {0}", VersionCodeProperties);
if (CreatePackagePerAbi)
Log.LogDebugMessage (" SupportedAbis: {0}", SupportedAbis);

resourceDirectory = ResourceDirectory.TrimEnd ('\\');
if (!Path.IsPathRooted (resourceDirectory))
resourceDirectory = Path.Combine (WorkingDirectory, resourceDirectory);
Expand Down
5 changes: 0 additions & 5 deletions src/Xamarin.Android.Build.Tasks/Tasks/Aapt2Compile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ public class Aapt2Compile : Aapt2 {

public override bool Execute ()
{
Log.LogDebugMessage ("Aapt2Compile Task");
Log.LogDebugMessage (" ResourceNameCaseMap: {0}", ResourceNameCaseMap);
Log.LogDebugMessage (" ResourceSymbolsTextFile: {0}", ResourceSymbolsTextFile);
Log.LogDebugTaskItems (" ResourceDirectories: ", ResourceDirectories);

Yield ();
try {
var task = this.RunTask (DoExecute);
Expand Down
3 changes: 0 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Tasks/Aapt2Link.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@ public class Aapt2Link : Aapt2 {

public override bool Execute ()
{
if (CreatePackagePerAbi)
Log.LogDebugMessage (" SupportedAbis: {0}", SupportedAbis);

Yield ();
try {
var task = this.RunTask (DoExecute);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ public class AdjustJavacVersionArguments : Task

public override bool Execute ()
{
Log.LogDebugMessage ($"{nameof (DefaultJdkVersion)}: {DefaultJdkVersion}");
Log.LogDebugMessage ("EnableProguard: {0}", EnableProguard);
Log.LogDebugMessage ("EnableMultiDex: {0}", EnableMultiDex);
Log.LogDebugMessage ($"{nameof (JdkVersion)}: {JdkVersion}");
Log.LogDebugMessage ("SkipJavacVersionCheck: {0}", SkipJavacVersionCheck);

if (JdkVersion.StartsWith ("9", StringComparison.OrdinalIgnoreCase)) {
TargetVersion = SourceVersion = DefaultJdkVersion;
}
Expand Down
6 changes: 0 additions & 6 deletions src/Xamarin.Android.Build.Tasks/Tasks/AndroidApkSigner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ public class AndroidApkSigner : JavaToolTask

public override bool Execute ()
{
Log.LogDebugMessage ("AndroidApkSigner:");
Log.LogDebugMessage (" ApkSignerJar: {0}", ApkSignerJar);
Log.LogDebugMessage (" ApkToSign: {0}", ApkToSign);
Log.LogDebugMessage (" ManifestFile: {0}", ManifestFile);
Log.LogDebugMessage (" AdditionalArguments: {0}", AdditionalArguments);

if (!File.Exists (GenerateFullPathToTool ())) {
Log.LogError ($"'{GenerateFullPathToTool ()}' does not exist. You need to install android-sdk build-tools 26.0.1 or above.");
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@ public AndroidCreateDebugKey ()
Validity = 30 * 365; // 30 years
}

public override bool Execute ()
{
Log.LogDebugMessage ("AndroidCreateDebugKey : {0}", Command);
Log.LogDebugMessage (" {0}",Validity);
Log.LogDebugMessage (" {0}",KeyAlgorithm);
return base.Execute ();
}

protected override CommandLineBuilder CreateCommandLine ()
{
var cmd = base.CreateCommandLine ();
Expand Down
11 changes: 0 additions & 11 deletions src/Xamarin.Android.Build.Tasks/Tasks/AndroidUpdateResDir.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@ public class AndroidComputeResPaths : Task

public override bool Execute ()
{
Log.LogDebugMessage (" IntermediateDir: {0}", IntermediateDir);
Log.LogDebugMessage (" Prefixes: {0}", Prefixes);
Log.LogDebugMessage (" ProjectDir: {0}", ProjectDir);
Log.LogDebugMessage (" LowercaseFilenames: {0}", LowercaseFilenames);
Log.LogDebugTaskItems (" ResourceFiles:", ResourceFiles);

var intermediateFiles = new List<ITaskItem> ();
var resolvedFiles = new List<ITaskItem> ();

Expand Down Expand Up @@ -155,11 +149,6 @@ public class RemoveUnknownFiles : Task

public override bool Execute ()
{
Log.LogDebugMessage ("RemoveUnknownFiles Task");
Log.LogDebugTaskItems ("Files", Files);
Log.LogDebugMessage ($"Directory {Directory}");
Log.LogDebugMessage ($"RemoveDirectories {RemoveDirectories}");

var absDir = Path.GetFullPath (Directory);

HashSet<string> knownFiles;
Expand Down
10 changes: 0 additions & 10 deletions src/Xamarin.Android.Build.Tasks/Tasks/AndroidZipAlign.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,6 @@ protected override string GenerateCommandLineCommands ()
Alignment, Source.ItemSpec, DestinationDirectory.ItemSpec, Path.DirectorySeparatorChar, sourceFilename);
}

public override bool Execute ()
{
Log.LogDebugMessage ("AndroidZipAlign Task");
Log.LogDebugMessage (" Alignment: {0}", Alignment);
Log.LogDebugMessage (" Source: {0}", Source.ItemSpec);
Log.LogDebugMessage (" DestinationDirectory: {0}", DestinationDirectory.ItemSpec);

return base.Execute ();
}

protected override string GenerateFullPathToTool ()
{
return Path.Combine (ToolPath, ToolExe);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ public class CalculateAdditionalResourceCacheDirectories : Task

public override bool Execute ()
{
Log.LogDebugMessage ("CalculateAdditionalResourceCacheDirectories Task");
Log.LogDebugTaskItems (" AdditionalAndroidResourcePaths:", AdditionalAndroidResourcePaths);
Log.LogDebugMessage (" CacheDirectory: {0}", CacheDirectory);

if (!AdditionalAndroidResourcePaths.Any ())
return true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,6 @@ sealed class LayoutGroup

public override bool Execute ()
{
Log.LogDebugMessage ("CalculateLayoutCodeBehind Task");
Log.LogDebugMessage ($" OutputLanguage: {OutputLanguage}");
Log.LogDebugMessage ($" OutputFileExtension: {OutputFileExtension}");
Log.LogDebugMessage ($" BaseNamespace: {BaseNamespace}");
Log.LogDebugMessage ($" BindingDependenciesCacheFile: {BindingDependenciesCacheFile}");
Log.LogDebugTaskItems (" BoundLayouts:", BoundLayouts);

widgetWithId = XPathExpression.Compile ("//*[@android:id and string-length(@android:id) != 0] | //include[not(@android:id)]");

GenerateLayoutBindings.BindingGeneratorLanguage gen;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ public class CheckDuplicateJavaLibraries : Task

public override bool Execute ()
{
Log.LogDebugTaskItems (" JavaSourceFiles:", JavaSourceFiles);
Log.LogDebugTaskItems (" JavaLibraries:", JavaLibraries);
Log.LogDebugTaskItems (" LibraryProjectJars:", LibraryProjectJars);

var jarFiles = (JavaSourceFiles != null) ? JavaSourceFiles.Where (f => f.ItemSpec.EndsWith (".jar")) : null;
if (jarFiles != null && JavaLibraries != null)
jarFiles = jarFiles.Concat (JavaLibraries);
Expand Down
4 changes: 0 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Tasks/CheckForRemovedItems.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ public class CheckForRemovedItems : Task

public override bool Execute ()
{
Log.LogDebugMessage ("RemoveUnknownFiles Task");
Log.LogDebugTaskItems ("Files", Files);
Log.LogDebugMessage (" Directory:", Directory);

var absDir = Path.GetFullPath (Directory);

HashSet<string> knownFiles;
Expand Down
4 changes: 0 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Tasks/CheckProjectItems.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ public class CheckProjectItems : Task

public override bool Execute ()
{
Log.LogDebugMessage ("CheckProjectItems Task");
Log.LogDebugTaskItems (" NativeLibraries:", NativeLibraries);
Log.LogDebugTaskItems (" JavaLibraries:", JavaLibraries);
Log.LogDebugTaskItems (" JavaSourceFiles:", JavaSourceFiles);
if (IsApplication && EmbeddedNativeLibraries != null && EmbeddedNativeLibraries.Length > 0) {
foreach (ITaskItem lib in EmbeddedNativeLibraries) {
Log.LogError (
Expand Down
5 changes: 0 additions & 5 deletions src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ public class ClassParse : Task

public override bool Execute ()
{
Log.LogDebugMessage ("ClassParse Task");
Log.LogDebugMessage (" OutputFile: {0}", OutputFile);
Log.LogTaskItems (" SourceJars: ", SourceJars);
Log.LogTaskItems (" DocumentationPaths: ", DocumentationPaths);

using (var output = new StreamWriter (OutputFile, append: false,
encoding: new UTF8Encoding (encoderShouldEmitUTF8Identifier: false))) {
Bytecode.Log.OnLog = LogEventHandler;
Expand Down
1 change: 0 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Tasks/ComputeHash.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public class ComputeHash : Task {

public override bool Execute ()
{
Log.LogDebugTaskItems ("Source : ", Source);
using (var sha1 = SHA1.Create ()) {

foreach (var item in Source) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ public class ConvertDebuggingFiles : Task

public override bool Execute ()
{
Log.LogDebugMessage ("ConvertDebuggingFiles Task");
Log.LogDebugMessage (" InputFiles: {0}", Files);

var convertedFiles = new List<ITaskItem> ();
foreach (var file in Files) {
var pdb = file.ItemSpec;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ public class CopyAndConvertResources : Task

public override bool Execute ()
{
Log.LogDebugMessage ("CopyAndConvertResources Task");
Log.LogDebugTaskItems (" SourceFiles:", SourceFiles);
Log.LogDebugTaskItems (" DestinationFiles:", DestinationFiles);
Log.LogDebugMessage (" AcwMapFile: {0}", AcwMapFile);

if (SourceFiles.Length != DestinationFiles.Length)
throw new ArgumentException ("source and destination count mismatch");

Expand Down
4 changes: 0 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Tasks/CopyIfChanged.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ public class CopyIfChanged : Task

public override bool Execute ()
{
Log.LogDebugMessage ("CopyIfChanged Task");
Log.LogDebugTaskItems (" SourceFiles: {0}", SourceFiles);
Log.LogDebugTaskItems (" DestinationFiles: {0}", DestinationFiles);

if (SourceFiles.Length != DestinationFiles.Length)
throw new ArgumentException ("source and destination count mismatch");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ public class CreateAdditionalLibraryResourceCache : Task

public override bool Execute ()
{
Log.LogDebugMessage ("CreateAdditionalLibraryResourceCache Task");
Log.LogDebugTaskItems (" AdditionalAndroidResourcePaths:", AdditionalAndroidResourcePaths);
Log.LogDebugTaskItems (" AdditionalAndroidResourceCachePaths: ", AdditionalAndroidResourceCachePaths);
var copiedResources = new List<ITaskItem> ();

for (int i = 0; i < AdditionalAndroidResourcePaths.Length; i++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,6 @@ public override bool Execute ()
if (LibraryProjectPropertiesFiles.Length == 0 && LibraryProjectZipFiles.Length == 0)
return true;

Log.LogDebugMessage ("CreateLibraryResourceArchive Task");
Log.LogDebugMessage (" OutputDirectory: {0}", OutputDirectory);
Log.LogDebugMessage (" OutputJarsDirectory: {0}", OutputJarsDirectory);
Log.LogDebugMessage (" OutputAnnotationsDirectory: {0}", OutputAnnotationsDirectory);
Log.LogDebugMessage (" LibraryProjectProperties:");

foreach (var p in LibraryProjectPropertiesFiles)
Log.LogDebugMessage (" " + p.ItemSpec);
Log.LogDebugMessage (" LibraryProjectZip:");
foreach (var z in LibraryProjectZipFiles)
Log.LogDebugMessage (" " + z.ItemSpec);

var outDirInfo = new DirectoryInfo (OutputDirectory);

// Copy files into _LibraryProjectImportsDirectoryName (library_project_imports) dir.
Expand Down
4 changes: 0 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Tasks/CreateResgenManifest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ public class CreateResgenManifest : Task

public override bool Execute ()
{
Log.LogDebugMessage ("CreateResgenManifest Task");
Log.LogDebugMessage (" ManifestOutputFile: {0}", ManifestOutputFile);
Log.LogDebugMessage (" PackageName: {0}", PackageName);

// <manifest xmlns:android="http://schemas.android.com/apk/res/android"
// package="MonoAndroidApplication4.MonoAndroidApplication4" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ public override bool Execute ()
{
TemporaryDirectory = Path.Combine (Path.GetTempPath (), Path.GetRandomFileName ());
Directory.CreateDirectory (TemporaryDirectory);

Log.LogDebugMessage ("CreateTemporaryDirectory Task");
Log.LogDebugMessage (" OUTPUT: TemporaryDirectory: {0}", TemporaryDirectory);

return true;
Expand Down
2 changes: 0 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tasks/Crunch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ public override bool Execute ()

void DoExecute ()
{
LogDebugMessage ("Crunch Task");
LogDebugTaskItems (" SourceFiles:", SourceFiles);
// copy the changed files over to a temp location for processing
var imageFiles = SourceFiles.Where (x => string.Equals (Path.GetExtension (x.ItemSpec),".png", StringComparison.OrdinalIgnoreCase));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@ public class DetermineJavaLibrariesToCompile : Task

public override bool Execute ()
{
Log.LogDebugMessage ("DetermineJavaLibrariesToCompile");
Log.LogDebugMessage (" EnableInstantRun: {0}", EnableInstantRun);
Log.LogDebugMessage (" MonoPlatformJarPaths: {0}", MonoPlatformJarPaths);
Log.LogDebugTaskItems (" JavaSourceFiles:", JavaSourceFiles);
Log.LogDebugTaskItems (" JavaLibraries:", JavaLibraries);
Log.LogDebugTaskItems (" ExternalJavaLibraries:", ExternalJavaLibraries);
Log.LogDebugTaskItems (" LibraryProjectJars:", LibraryProjectJars);
Log.LogDebugTaskItems (" AdditionalJavaLibraryReferences:", AdditionalJavaLibraryReferences);
Log.LogDebugTaskItems (" DoNotPackageJavaLibraries:", DoNotPackageJavaLibraries);

var jars = new List<ITaskItem> ();
if (!EnableInstantRun)
jars.AddRange (MonoPlatformJarPaths);
Expand Down
6 changes: 0 additions & 6 deletions src/Xamarin.Android.Build.Tasks/Tasks/FindLayoutsToBind.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ public class FindLayoutsToBind : Task

public override bool Execute ()
{
Log.LogDebugMessage ("FindLayoutsToBind Task");
Log.LogDebugMessage ($" GenerateLayoutBindings: {GenerateLayoutBindings}");
Log.LogDebugMessage ($" BindingDependenciesCacheFile: {BindingDependenciesCacheFile}");
Log.LogDebugTaskItems (" BoundLayouts:", BoundLayouts);
Log.LogDebugTaskItems (" ResourceFiles:", ResourceFiles);

var layouts = new Dictionary <string, ITaskItem> (StringComparer.OrdinalIgnoreCase);
if (GenerateLayoutBindings) {
Log.LogDebugMessage ("Collecting all layouts");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,6 @@ public BindingGeneratorLanguage (string name, string extension, Func<BindingGene

public override bool Execute ()
{
Log.LogDebugMessage ("GenerateLayoutBindings Task");
Log.LogDebugMessage ($" OutputLanguage: {OutputLanguage}");
Log.LogDebugMessage ($" MonoAndroidCodeBehindDir: {MonoAndroidCodeBehindDir}");
Log.LogDebugMessage ($" AppNamespace: {AppNamespace}");
Log.LogDebugTaskItems (" ResourceFiles:", ResourceFiles, true);
Log.LogDebugTaskItems (" PartialClassFiles:", PartialClassFiles, true);

if (String.IsNullOrWhiteSpace (OutputLanguage))
OutputLanguage = DefaultOutputGenerator.Name;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,6 @@ enum MethodScope {

public override bool Execute ()
{
Log.LogDebugMessage ("GenerateCodeBehindForLayout Task");
Log.LogDebugMessage (" MonoAndroidCodeBehindDir: {0}", MonoAndroidCodeBehindDir);
Log.LogDebugTaskItems (" ResourceFiles:", ResourceFiles);

var generatedFiles = new List<ITaskItem> ();

var generatorOptions = new CodeGeneratorOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@ public GenerateManagedAidlProxies ()

public override bool Execute ()
{
Log.LogDebugMessage ("Task GenerateManagedAidlProxies");
Log.LogDebugTaskItems (" References:", References);
Log.LogDebugTaskItems (" SourceAidlFiles:", SourceAidlFiles);
Log.LogDebugMessage (" IntermediateOutputDirectory: {0}", IntermediateOutputDirectory);
Log.LogDebugMessage (" OutputNamespace: {0}", OutputNamespace);
Log.LogDebugMessage (" ParcelableHandlingOption: {0}", ParcelableHandlingOption);

if (SourceAidlFiles.Length == 0) // nothing to do
return true;

Expand Down
11 changes: 0 additions & 11 deletions src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesigner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,6 @@ public override bool Execute ()
// Use "Application" as the default namespace name to work with XS.
Namespace = Namespace ?? "Application";

Log.LogDebugMessage ("GenerateResourceDesigner Task");
Log.LogDebugMessage (" NetResgenOutputFile: {0}", NetResgenOutputFile);
Log.LogDebugMessage (" JavaResgenInputFile: {0}", JavaResgenInputFile);
Log.LogDebugMessage (" Namespace: {0}", Namespace);
Log.LogDebugMessage (" ResourceDirectory: {0}", ResourceDirectory);
Log.LogDebugTaskItemsAndLogical (" AdditionalResourceDirectories:", AdditionalResourceDirectories);
Log.LogDebugMessage (" IsApplication: {0}", IsApplication);
Log.LogDebugMessage (" UseManagedResourceGenerator: {0}", UseManagedResourceGenerator);
Log.LogDebugTaskItemsAndLogical (" Resources:", Resources);
Log.LogDebugTaskItemsAndLogical (" References:", References);

if (!File.Exists (JavaResgenInputFile) && !UseManagedResourceGenerator)
return true;

Expand Down
Loading