[LibExtractTask] Fix debug information section linked when `StripDebu…

…gInfo` specified, and skip up-to-date items
KNSoft · Jan 12, 2024 · bcd73a9 · bcd73a9
1 parent 7f2b35c
commit bcd73a9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/Source/3rdParty/C4Lib b/Source/3rdParty/C4Lib
diff --git a/Source/Tasks/LibExtractTask.cs b/Source/Tasks/LibExtractTask.cs
@@ -30,9 +30,20 @@ public override Boolean Execute()
     {
         try
         {
+            DateTime TempTime, LastWriteTime;
+
+            LastWriteTime = new FileInfo(Source).LastWriteTime;
+            TempTime = new FileInfo(BuildEngine.ProjectFileOfTaskNode).LastWriteTime;
+            if (LastWriteTime < TempTime)
+            {
+                LastWriteTime = TempTime;
+            }
+
             XmlDocument doc = new();
             doc.Load(Source);
 
+            Log.LogMessage(MessageImportance.High, "Project: " + BuildEngine.ProjectFileOfTaskNode);
+
             if (doc.DocumentElement == null)
             {
                 throw new InvalidDataException("Invalid XML file: " + Source);
@@ -74,6 +85,10 @@ public override Boolean Execute()
                     throw new FileNotFoundException("Multiple " + LibName + " found in specified directories");
                 }
 
+                if (LastWriteTime < Libs[0].LastWriteTime)
+                {
+                    LastWriteTime = Libs[0].LastWriteTime;
+                }
                 Byte[] LibData = File.ReadAllBytes(Libs[0].FullName);
                 ArchiveFile Ar = new(LibData);
                 DirectoryInfo OutputLibDirectoryInfo = Directory.CreateDirectory(OutputDirectory + Path.DirectorySeparatorChar + Libs[0].Name);
@@ -102,8 +117,15 @@ public override Boolean Execute()
                     String OutputObjectFilePath = OutputLibDirectoryInfo.FullName +
                                                   Path.DirectorySeparatorChar +
                                                   Path.GetFileName(ExtractImport.Name);
-                    Byte[] ObjectData = ExtractImport.Data;
+                    FileInfo OutputObject = new(OutputObjectFilePath);
+                    if (OutputObject.Exists && OutputObject.LastWriteTime > LastWriteTime)
+                    {
+                        ExtractedObjectFiles.Add(OutputObjectFilePath);
+                        Log.LogMessage(MessageImportance.High, "\t-> " + OutputObjectFilePath + " is up-to-date");
+                        continue;
+                    }
 
+                    Byte[] ObjectData = ExtractImport.Data;
                     if (StripDebugInfo)
                     {
                         IMAGE_FILE_HEADER FileHeader = Rtl.RawToStruct<IMAGE_FILE_HEADER>(Rtl.ArrayResize(ObjectData, Marshal.SizeOf<IMAGE_FILE_HEADER>()));
@@ -119,6 +141,7 @@ public override Boolean Execute()
                                 if (SectionHeader.Name.SequenceEqual(".debug$T"u8.ToArray()))
                                 {
                                     SectionHeader.Name = [0, 0, 0, 0, 0, 0, 0, 0];
+                                    SectionHeader.Characteristics |= (UInt32)IMAGE_SCN.LNK_REMOVE;
                                     Rtl.StructToRaw(SectionHeader).CopyTo(ObjectData, SectionHeaderIndex);
                                 }
                                 SectionHeaderIndex += Marshal.SizeOf<IMAGE_SECTION_HEADER>();
+1 −0		Source/PEImage/Types/SectionHeader.cs
+19 −0		Source/Rtl/Enum.cs