From 056f1ba35f60946e51c16660eabefed7dcd67e67 Mon Sep 17 00:00:00 2001 From: cylon Date: Mon, 5 Sep 2016 20:22:17 +0200 Subject: [PATCH] Added check for the directory separator. --- ewpproject.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/ewpproject.py b/ewpproject.py index 7d73d91..c3d4730 100644 --- a/ewpproject.py +++ b/ewpproject.py @@ -44,7 +44,16 @@ class EWPProject (object): self.project['incs'].append(d.text) for i in range(0, len(self.project['incs'])): - self.project['incs'][i] = self.project['incs'][i].replace('$PROJ_DIR$/..', self.path) + + s = str(self.project['incs'][i]) + + if os.path.sep not in s: + if os.path.sep == '\\': + s = s.replace('/','\\') + elif os.path.sep == '/': + s = s.replace('\\','/') + + self.project['incs'][i] = s.replace('$PROJ_DIR$'+os.path.sep+'..', self.path) self.project['files']=[] i=0 @@ -71,7 +80,15 @@ class EWPProject (object): elif element.tag == 'file': if not str(element.name).endswith('.s'): - sources.append(str(element.name).replace('$PROJ_DIR$/..', self.path)) + + s = str(element.name) + if os.path.sep not in s: + if os.path.sep == '\\': + s = s.replace('/','\\') + elif os.path.sep == '/': + s = s.replace('\\','/') + + sources.append(s.replace('$PROJ_DIR$'+os.path.sep+'..', self.path)) def getProject(self):