#e01499a Simplify patches generation

Author: fred322

_charm/src/e01499af7ccefbbce7893af1212765f2d04a659dc9c913c8177d06d232c1b606.cr

@@ -7,5 +7,5 @@
 <links>
 <link name="parent">7bc74cc796c455a46d699ad91f6aca5b7c790f56a6a0968b4ecbce33efce9d25</link>
 </links>
-<cf v="fred322 2025-06-24T17:53:31+02:00"/>
+<cf v="fred322 2025-07-03T15:35:07+02:00"/>
 </cr>

core/module-srcarchive.mk

@@ -107,13 +107,12 @@ $(ARCHSRC_INCLUDESFILES): $(ARCHSRC_EXTRACTED_INFO) $(ARCHSRC_INCLUDES_EXTRACTED
 # 1: sources originals directory
 # 2: sources modified directory
 define generatePatchesFor
-for file in `find $(1) -type f`; do \
+for file in `find $1 -type f`; do \
 	relativePath=`echo $$file | sed 's~$(1)/~~g'` && \
-	if [ `diff -q $$file $(2)/$$relativePath | wc -l` -ne 0 ]; then \
+	if [ `diff -q $$file $2/$$relativePath | wc -l` -ne 0 ]; then \
 		$(ABS_PRINT_info) "Generating patch for $$relativePath";\
 		mkdir -p $(ARCHSRC_GENE_PATCHES_OUT)/`dirname $$relativePath` && \
-		diff -Naur $$file $(2)/$$relativePath > $(ARCHSRC_GENE_PATCHES_OUT)/$$relativePath.patch; \
-		sed -i -e 's~$(1)/~~g' -e 's~$(2)/~~g' $(ARCHSRC_GENE_PATCHES_OUT)/$$relativePath.patch; \
+		diff --label $$relativePath --label $$relativePath -Nau $$file $2/$$relativePath > $(ARCHSRC_GENE_PATCHES_OUT)/$$relativePath.patch || :; \
 	fi; \
 done
 endef

sampleprj/T_abs/test/resources/projB/cpplib3/patches/subdir/inc.h.patch

@@ -1,5 +1,5 @@
---- subdir/inc.h	2025-03-13 09:23:48.012321627 +0100
-+++ subdir/inc.h	2025-03-13 09:25:33.896319205 +0100
+--- subdir/inc.h
++++ subdir/inc.h
 @@ -1,6 +1,4 @@
  #pragma once
 

sampleprj/T_abs/test/resources/projB/cpplib3/patches/subdir2/source2.cpp.patch

@@ -1,5 +1,5 @@
---- subdir2/source2.cpp	2025-03-13 09:33:38.892308112 +0100
-+++ subdir2/source2.cpp	2025-03-13 09:33:54.544307754 +0100
+--- subdir2/source2.cpp
++++ subdir2/source2.cpp
 @@ -1,7 +1,9 @@
  #include "subdir/inc2.h"
 

sampleprj/T_abs/test/scripts/testPatches.sh

@@ -28,17 +28,9 @@ fi
 testFileExists $projBOUtPatchesDir/subdir2/source2.cpp.patch
 testFileExists $projBOUtPatchesDir/subdir/inc.h.patch
 
-function removeDateFromPatch {
-    head -n 2 $1 | sed 's/\t.*//g' > $2
-    tail -n +3 $1 >> $2
-}
 
-removeDateFromPatch cpplib3/patches/subdir2/source2.cpp.patch $projBOUtPatchesDir/subdir2/source2.expected
-removeDateFromPatch cpplib3/patches/subdir/inc.h.patch $projBOUtPatchesDir/subdir/inc.expected
-removeDateFromPatch $projBOUtPatchesDir/subdir2/source2.cpp.patch $projBOUtPatchesDir/subdir2/source2.generated
-removeDateFromPatch $projBOUtPatchesDir/subdir/inc.h.patch $projBOUtPatchesDir/subdir/inc.generated
-
-testFile $projBOUtPatchesDir/subdir2/source2.expected $projBOUtPatchesDir/subdir2/source2.generated
-testFile $projBOUtPatchesDir/subdir/inc.expected $projBOUtPatchesDir/subdir/inc.generated
+echo "#### Test patches"
+testFile $projBOUtPatchesDir/subdir2/source2.cpp.patch $MODROOT/test/resources/projB/cpplib3/patches/subdir2/source2.cpp.patch
+testFile $projBOUtPatchesDir/subdir/inc.h.patch $MODROOT/test/resources/projB/cpplib3/patches/subdir/inc.h.patch
 
 doExit 0