diff -r e7e0ae78773e -r 0951727b8815 configurationengine/source/plugins/symbian/ConeProjectConverterPlugin/projectconvertplugin/convertproject.py --- a/configurationengine/source/plugins/symbian/ConeProjectConverterPlugin/projectconvertplugin/convertproject.py Tue Aug 10 14:29:28 2010 +0300 +++ b/configurationengine/source/plugins/symbian/ConeProjectConverterPlugin/projectconvertplugin/convertproject.py Wed Sep 08 12:20:56 2010 +0300 @@ -698,11 +698,14 @@ """ """ retStr = data - if not mapping: mapping = {} + if not mapping: mapping = {} if data != None: - merged = dict(mapping.items() + self._get_env_variables().items()) + merged = dict(mapping.items() + self._get_env_variables().items()) for key in merged.keys(): - retStr = retStr.replace(key, merged[key]) + # Do a case-insensitive replace so that things work + # both in Linux and Windows + pattern = re.compile(re.escape(key), re.IGNORECASE) + retStr = re.sub(pattern, lambda m: merged[key], retStr) return retStr