Skip to content

Commit 59d8f06

Browse files
rolfbjarnerolfbjarne
committed
fixes
1 parent 43cfc6b commit 59d8f06

File tree

16 files changed

+50
-45
lines changed

16 files changed

+50
-45
lines changed

‎msbuild/Xamarin.MacDev.Tasks/Decompress.cs‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,10 @@ static string CanonicalizeZipEntryPath (string path)
100100
/// <param name="cancellationToken">The cancellation token (if any=</param>
101101
/// <param name="decompressedResource">The location on disk to the extracted resource</param>
102102
/// <returns>True if successfully decompressed, false otherwise.</returns>
103-
public static bool TryDecompress (TaskLoggingHelper log, string zip, string resource, string decompressionDir, List<string> createdFiles, CancellationToken? cancellationToken, [NotNullWhen (true)] out string? decompressedResource)
103+
public static bool TryDecompress (XamarinTask task, string zip, string resource, string decompressionDir, List<string> createdFiles, CancellationToken? cancellationToken, [NotNullWhen (true)] out string? decompressedResource)
104104
{
105+
var log = task.Log;
106+
105107
decompressedResource = Path.Combine (decompressionDir, resource);
106108

107109
var stampFile = decompressedResource.TrimEnd ('\\', '/') + ".stamp";
@@ -118,11 +120,11 @@ public static bool TryDecompress (TaskLoggingHelper log, string zip, string reso
118120

119121
bool rv;
120122
if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
121-
rv = TryDecompressUsingSystemIOCompression (log, zip, resource, decompressionDir, cancellationToken);
123+
rv = TryDecompressUsingSystemIOCompression (task, zip, resource, decompressionDir, cancellationToken);
122124
} else if (!string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("XAMARIN_USE_SYSTEM_IO_COMPRESSION"))) {
123-
rv = TryDecompressUsingSystemIOCompression (log, zip, resource, decompressionDir, cancellationToken);
125+
rv = TryDecompressUsingSystemIOCompression (task, zip, resource, decompressionDir, cancellationToken);
124126
} else {
125-
rv = TryDecompressUsingUnzip (log, zip, resource, decompressionDir, cancellationToken);
127+
rv = TryDecompressUsingUnzip (task, zip, resource, decompressionDir, cancellationToken);
126128
}
127129

128130
if (rv) {
@@ -145,8 +147,9 @@ public static bool TryDecompress (TaskLoggingHelper log, string zip, string reso
145147
// The dir separator character in zip files is always "/", even on Windows
146148
const char zipDirectorySeparator = '/';
147149

148-
static bool TryDecompressUsingUnzip (TaskLoggingHelper log, string zip, string resource, string decompressionDir, CancellationToken? cancellationToken)
150+
static bool TryDecompressUsingUnzip (XamarinTask task, string zip, string resource, string decompressionDir, CancellationToken? cancellationToken)
149151
{
152+
var log = task.Log;
150153
Directory.CreateDirectory (decompressionDir);
151154
var args = new List<string> {
152155
"-u", "-o",
@@ -176,12 +179,13 @@ static bool TryDecompressUsingUnzip (TaskLoggingHelper log, string zip, string r
176179
args.Add (zipPattern);
177180
}
178181

179-
var rv = XamarinTask.ExecuteAsync (log, "unzip", args, cancellationToken: cancellationToken).Result;
182+
var rv = task.ExecuteAsync ("unzip", args, cancellationToken: cancellationToken).Result;
180183
return rv.ExitCode == 0;
181184
}
182185

183-
static bool TryDecompressUsingSystemIOCompression (TaskLoggingHelper log, string zip, string resource, string decompressionDir, CancellationToken? cancellationToken)
186+
static bool TryDecompressUsingSystemIOCompression (XamarinTask task, string zip, string resource, string decompressionDir, CancellationToken? cancellationToken)
184187
{
188+
var log = task.Log;
185189
var rv = true;
186190

187191
// canonicalize input
@@ -270,8 +274,9 @@ static bool TryDecompressUsingSystemIOCompression (TaskLoggingHelper log, string
270274
/// testing the System.IO.Compression implementation locally (with the caveat that if the resources
271275
/// to compress has symlinks, it may not work).
272276
/// </remarks>
273-
public static bool TryCompress (TaskLoggingHelper log, string zip, IEnumerable<string> resources, bool overwrite, string workingDirectory, bool maxCompression = false)
277+
public static bool TryCompress (XamarinTask task, string zip, IEnumerable<string> resources, bool overwrite, string workingDirectory, bool maxCompression = false)
274278
{
279+
var log = task.Log;
275280
if (overwrite) {
276281
if (File.Exists (zip)) {
277282
log.LogMessage (MessageImportance.Low, "Replacing zip file {0} with {1}", zip, string.Join (", ", resources));
@@ -293,19 +298,20 @@ public static bool TryCompress (TaskLoggingHelper log, string zip, IEnumerable<s
293298

294299
bool rv;
295300
if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
296-
rv = TryCompressUsingSystemIOCompression (log, zip, resources, workingDirectory, maxCompression);
301+
rv = TryCompressUsingSystemIOCompression (task, zip, resources, workingDirectory, maxCompression);
297302
} else if (!string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("XAMARIN_USE_SYSTEM_IO_COMPRESSION"))) {
298-
rv = TryCompressUsingSystemIOCompression (log, zip, resources, workingDirectory, maxCompression);
303+
rv = TryCompressUsingSystemIOCompression (task, zip, resources, workingDirectory, maxCompression);
299304
} else {
300-
rv = TryCompressUsingZip (log, zip, resources, workingDirectory, maxCompression);
305+
rv = TryCompressUsingZip (task, zip, resources, workingDirectory, maxCompression);
301306
}
302307

303308
return rv;
304309
}
305310

306311
// Will always add to an existing zip file (not replace)
307-
static bool TryCompressUsingZip (TaskLoggingHelper log, string zip, IEnumerable<string> resources, string workingDirectory, bool maxCompression)
312+
static bool TryCompressUsingZip (XamarinTask task, string zip, IEnumerable<string> resources, string workingDirectory, bool maxCompression)
308313
{
314+
var log = task.Log;
309315
var zipArguments = new List<string> ();
310316
if (maxCompression)
311317
zipArguments.Add ("-9");
@@ -318,7 +324,7 @@ static bool TryCompressUsingZip (TaskLoggingHelper log, string zip, IEnumerable<
318324
var relativePath = PathUtils.AbsoluteToRelative (workingDirectory, fullPath);
319325
zipArguments.Add (relativePath);
320326
}
321-
var rv = XamarinTask.ExecuteAsync (log, "zip", zipArguments, workingDirectory: workingDirectory).Result;
327+
var rv = task.ExecuteAsync ("zip", zipArguments, workingDirectory: workingDirectory).Result;
322328
log.LogMessage (MessageImportance.Low, "Updated {0} with {1}: {2}", zip, string.Join (", ", resources), rv.ExitCode == 0);
323329
return rv.ExitCode == 0;
324330
}
@@ -330,8 +336,9 @@ static bool TryCompressUsingZip (TaskLoggingHelper log, string zip, IEnumerable<
330336
#endif
331337

332338
// Will always add to an existing zip file (not replace)
333-
static bool TryCompressUsingSystemIOCompression (TaskLoggingHelper log, string zip, IEnumerable<string> resources, string workingDirectory, bool maxCompression)
339+
static bool TryCompressUsingSystemIOCompression (XamarinTask task, string zip, IEnumerable<string> resources, string workingDirectory, bool maxCompression)
334340
{
341+
var log = task.Log;
335342
var rv = true;
336343

337344
workingDirectory = Path.GetFullPath (workingDirectory);

‎msbuild/Xamarin.MacDev.Tasks/Tasks/AlTool.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public override bool Execute ()
5050
return false;
5151

5252
cancellationTokenSource = new CancellationTokenSource ();
53-
var rv = ExecuteAsync (Log, executable, args, sdkDevPath: SdkDevPath, cancellationToken: cancellationTokenSource.Token).Result;
53+
var rv = ExecuteAsync (executable, args, cancellationToken: cancellationTokenSource.Token).Result;
5454
LogErrorsFromOutput (rv.StandardOutput?.ToString ());
5555
return !Log.HasLoggedErrors;
5656
}

‎msbuild/Xamarin.MacDev.Tasks/Tasks/BGen.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ public override bool Execute ()
286286
return false;
287287

288288
cancellationTokenSource = new CancellationTokenSource ();
289-
ExecuteAsync (Log, executable, args, environment: env, cancellationToken: cancellationTokenSource.Token).Wait ();
289+
ExecuteAsync (executable, args, environment: env, cancellationToken: cancellationTokenSource.Token).Wait ();
290290
return !Log.HasLoggedErrors;
291291
}
292292

‎msbuild/Xamarin.MacDev.Tasks/Tasks/CreateAssetPack.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public override bool Execute ()
8989
var args = GenerateCommandLineCommands ();
9090
var executable = GetExecutable (args, "zip", ZipPath);
9191
cancellationTokenSource = new CancellationTokenSource ();
92-
ExecuteAsync (Log, executable, args, workingDirectory: GetWorkingDirectory (), cancellationToken: cancellationTokenSource.Token).Wait ();
92+
ExecuteAsync (executable, args, workingDirectory: GetWorkingDirectory (), cancellationToken: cancellationTokenSource.Token).Wait ();
9393
return !Log.HasLoggedErrors;
9494
}
9595

‎msbuild/Xamarin.MacDev.Tasks/Tasks/CreateBindingResourcePackage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public override bool Execute ()
100100
var workingDirectory = Path.GetDirectoryName (nativeRef);
101101
if (string.IsNullOrEmpty (workingDirectory))
102102
workingDirectory = Directory.GetCurrentDirectory ();
103-
CompressionHelper.TryCompress (Log, zipFile, new string [] { nativeRef }, false, workingDirectory, true);
103+
CompressionHelper.TryCompress (this, zipFile, new string [] { nativeRef }, false, workingDirectory, true);
104104
}
105105
packagedFiles.Add (zipFile);
106106
} else {

‎msbuild/Xamarin.MacDev.Tasks/Tasks/Ditto.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ bool ExecuteImpl ()
103103
}
104104

105105
cancellationTokenSource = new CancellationTokenSource ();
106-
ExecuteAsync (Log, executable, args, cancellationToken: cancellationTokenSource.Token).Wait ();
106+
ExecuteAsync (executable, args, cancellationToken: cancellationTokenSource.Token).Wait ();
107107

108108
// Create a list of all the files we've copied
109109
if (CreateOutputFiles) {

‎msbuild/Xamarin.MacDev.Tasks/Tasks/Metal.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public override bool Execute ()
102102
args.Add (SourceFile!.ItemSpec);
103103

104104
cancellationTokenSource = new CancellationTokenSource ();
105-
ExecuteAsync (Log, executable, args, environment: env, sdkDevPath: SdkDevPath, cancellationToken: cancellationTokenSource.Token).Wait ();
105+
ExecuteAsync (executable, args, environment: env, cancellationToken: cancellationTokenSource.Token).Wait ();
106106

107107
return !Log.HasLoggedErrors;
108108
}

‎msbuild/Xamarin.MacDev.Tasks/Tasks/MetalLib.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public override bool Execute ()
6060
var executable = GetExecutable (args, "metallib", MetalLibPath);
6161

6262
cancellationTokenSource = new CancellationTokenSource ();
63-
ExecuteAsync (Log, executable, args, environment: env, sdkDevPath: SdkDevPath, cancellationToken: cancellationTokenSource.Token).Wait ();
63+
ExecuteAsync (executable, args, environment: env, cancellationToken: cancellationTokenSource.Token).Wait ();
6464

6565
return !Log.HasLoggedErrors;
6666
}

‎msbuild/Xamarin.MacDev.Tasks/Tasks/OptimizeImage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public override bool Execute ()
9898
ForEach (listOfArguments, (arg) => {
9999
var args = arg.Arguments;
100100
var executable = GetExecutable (args, "pngcrush", PngCrushPath);
101-
ExecuteAsync (Log, executable, args, sdkDevPath: SdkDevPath, mergeOutput: true, showErrorIfFailure: false /* we show our own error below */, cancellationToken: cancellationTokenSource.Token)
101+
ExecuteAsync (executable, args, mergeOutput: true, showErrorIfFailure: false /* we show our own error below */, cancellationToken: cancellationTokenSource.Token)
102102
.ContinueWith ((v) => {
103103
Execution execution = v.Result;
104104
if (execution.ExitCode != 0)

‎msbuild/Xamarin.MacDev.Tasks/Tasks/OptimizePropertyList.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public override bool Execute ()
5959
var args = GenerateCommandLineCommands ();
6060
var executable = GetExecutable (args, "plutil", PlutilPath);
6161
cancellationTokenSource = new CancellationTokenSource ();
62-
ExecuteAsync (Log, executable, args, sdkDevPath: SdkDevPath, cancellationToken: cancellationTokenSource.Token).Wait ();
62+
ExecuteAsync (executable, args, cancellationToken: cancellationTokenSource.Token).Wait ();
6363
return !Log.HasLoggedErrors;
6464
}
6565

0 commit comments

Comments
 (0)