Apply patches before configure call

jmmorato · Jun 26, 2024 · 9d64fbc · 9d64fbc
1 parent 17bc385
commit 9d64fbc
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/Build/OpenDDSharp.Build/Tasks/SetupThirdPartyTask.cs b/Build/OpenDDSharp.Build/Tasks/SetupThirdPartyTask.cs
@@ -87,6 +87,33 @@ public override void Run(BuildContext context)
             Git(context, "fetch --tags");
             Git(context, $"checkout tags/{_versionTag}");
 
+            context.Log.Information("Apply required OpenDDSharp patches to OpenDDS...");
+            if (!Directory.Exists(BuildContext.PATCHES_FOLDER))
+            {
+                return;
+            }
+            var patches = Directory.EnumerateFiles(BuildContext.PATCHES_FOLDER, "*.patch");
+            var patchPaths = patches as string[] ?? patches.ToArray();
+            if (!patchPaths.Any())
+            {
+                return;
+            }
+            foreach (var patchPath in patchPaths)
+            {
+                var patchDirectory = new DirectoryPath(patchPath);
+                if (BuildContext.IsLinux)
+                {
+                    var linuxPath = System.IO.Path.GetFullPath(patchDirectory.FullPath);
+
+                    context.Log.Information($"Apply {linuxPath} in {context.DdsRoot}...");
+                    Git(context, "apply --whitespace=fix --ignore-space-change --ignore-whitespace " + linuxPath);
+                }
+                else
+                {
+                    Git(context, "apply " + patchDirectory.FullPath);
+                }
+            }
+
             context.Log.Information("Call OpenDDS configure script");
 
             if (BuildContext.IsLinux || BuildContext.IsOSX)
@@ -143,33 +170,6 @@ public override void Run(BuildContext context)
                     throw new BuildException($"Error calling the OpenDDS configure script. Exit code: {exit}");
                 }
             }
-
-            context.Log.Information("Apply required OpenDDSharp patches to OpenDDS...");
-            if (!Directory.Exists(BuildContext.PATCHES_FOLDER))
-            {
-                return;
-            }
-            var patches = Directory.EnumerateFiles(BuildContext.PATCHES_FOLDER, "*.patch");
-            var patchPaths = patches as string[] ?? patches.ToArray();
-            if (!patchPaths.Any())
-            {
-                return;
-            }
-            foreach (var patchPath in patchPaths)
-            {
-                var patchDirectory = new DirectoryPath(patchPath);
-                if (BuildContext.IsLinux)
-                {
-                    var linuxPath = System.IO.Path.GetFullPath(patchDirectory.FullPath);
-
-                    context.Log.Information($"Apply {linuxPath} in {context.DdsRoot}...");
-                    Git(context, "apply --whitespace=fix --ignore-space-change --ignore-whitespace " + linuxPath);
-                }
-                else
-                {
-                    Git(context, "apply " + patchDirectory.FullPath);
-                }
-            }
         }
 
         private static void DeleteDirectory(string directoryPath)