fix: Make resource dep minimisation work when output file starts with a line containing "\"
--- a/sbsv2/raptor/lib/flm/resource.flm Fri Apr 09 14:15:32 2010 +0100
+++ b/sbsv2/raptor/lib/flm/resource.flm Tue Apr 13 13:24:39 2010 +0100
@@ -156,7 +156,7 @@
# of full dependency information which can overwhelm make in large builds.
# The strategy is to filter out lines (apart from the target line which is the first) which don't have .rsg or
# .mbg dependencies in them.
- DEPENDENCY_CORRECTOR:={ $(GNUSED) -n -r '1 p;\% [^ \/]+\.((rsg)|(mbg))%I {s% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig; p}' && echo "" ; }
+ DEPENDENCY_CORRECTOR:={ $(GNUSED) -n -r '/.*: +.$$$$/ p;\%\.((rsg)|(mbg))%I {s% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig; p}' && echo "" ; }
else
# Generate full dependency information
DEPENDENCY_CORRECTOR:=$(GNUSED) -r 's% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig'
--- a/sbsv2/raptor/test/smoke_suite/resource.py Fri Apr 09 14:15:32 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/resource.py Tue Apr 13 13:24:39 2010 +0100
@@ -90,7 +90,7 @@
t.mustnotmatch = []
t.mustmatch = [
- "3 .*.dependentresource_.dependentresource_sc.rpp.d"
+ "4 .*.dependentresource_.dependentresource_sc.rpp.d"
]
t.run()