# HG changeset patch # User timothy.murphy@nokia.com # Date 1273514771 -3600 # Node ID 17733b82d643bf6892f90b3e6d4fafb5789ccbbf # Parent a1da2914e57fb2dacabb980847730e041ef5a97d fix: resource deps fixups on windows. ugh diff -r a1da2914e57f -r 17733b82d643 sbsv2/raptor/lib/flm/resource.flm --- a/sbsv2/raptor/lib/flm/resource.flm Mon May 10 17:06:38 2010 +0100 +++ b/sbsv2/raptor/lib/flm/resource.flm Mon May 10 19:06:11 2010 +0100 @@ -118,21 +118,23 @@ # files etc. In the end don't print anything at all if we did not find the target. define DEPENDENCY_CORRECTOR -{ set +x; $(GNUSED) -rn '\% ([^ /]+)\.((rsg)|(mbg))%I {y/\\/ /;p;}' | \ +{ set +x; $(GNUSED) -rn '\% ([^ /]+)\.((rsg)|(mbg))%I {y%\\\\%\\/%;p;}' | \ { \ - DEPTXT="$$$$RPP: \\\\\n"; \ + ENDL='\\\\\n'; \ + DEPTXT="$$$$RPP: $$$${ENDL}" ; \ DEPCOUNT=0; \ DEPS=''; read L; \ while [ $$$$? -eq 0 ]; do \ for i in $$$${L}; do \ if [[ ( "$$$${i%%.[Rr][Ss][Gg]}" != "$$$$i" || "$$$${i%%.[Mm][Bb][Gg]}" != "$$$$i" ) && ( "$$$${i:1:1}" != ':' && "$$$${i:0:1}" != '/' ) ]]; then \ - DEPTXT="$$$$DEPTXT \$$$$(EPOCROOT)/epoc32/include/$$$$i \\\\\n"; \ + DEPTXT="$$$$DEPTXT \$$$$(EPOCROOT)/epoc32/include/$$$$i $$$${ENDL}"; \ (( DEPCOUNT += 1 )) ; \ fi; \ done; \ read L; \ done; \ - if [ $$$$DEPCOUNT -ne 0 ]; then echo -e "$$$${DEPTXT%%\\\\\\n}\n"; fi ;\ + if [ $$$$DEPCOUNT -ne 0 ]; then \ + echo -e "$$$${DEPTXT:0:$$$$[ $$$${#DEPTXT} - 4 ]}\n"; fi ;\ } ;\ } endef