equal
deleted
inserted
replaced
1069 |
1069 |
1070 for extensionLine in self.__getSection(aBuildPlatform, aType): |
1070 for extensionLine in self.__getSection(aBuildPlatform, aType): |
1071 if (re.search(r'^\s*START ',extensionLine, re.I)): |
1071 if (re.search(r'^\s*START ',extensionLine, re.I)): |
1072 start = extensionLine |
1072 start = extensionLine |
1073 elif re.search(r'^\s*END\s*$',extensionLine, re.I): |
1073 elif re.search(r'^\s*END\s*$',extensionLine, re.I): |
1074 extensionObjects.append(Extension(self.filename, start, options, aBuildPlatform, self.__Raptor)) |
1074 if start == "": |
1075 start = "" |
1075 self.log.Error("unmatched END statement in %s section", aType, bldinf=str(self.filename)) |
1076 options = [] |
1076 else: |
|
1077 extensionObjects.append(Extension(self.filename, start, options, aBuildPlatform, self.__Raptor)) |
|
1078 start = "" |
|
1079 options = [] |
1077 elif re.search(r'^\s*$',extensionLine, re.I): |
1080 elif re.search(r'^\s*$',extensionLine, re.I): |
1078 continue |
1081 continue |
1079 elif start: |
1082 elif start: |
1080 options.append(extensionLine) |
1083 options.append(extensionLine) |
1081 |
1084 |
3294 if self.__Raptor.projects: |
3297 if self.__Raptor.projects: |
3295 if not projectname in self.__Raptor.projects: |
3298 if not projectname in self.__Raptor.projects: |
3296 self.__Raptor.Debug("Skipping %s", str(m.getMakefileName())) |
3299 self.__Raptor.Debug("Skipping %s", str(m.getMakefileName())) |
3297 continue |
3300 continue |
3298 elif projectname in self.projectList: |
3301 elif projectname in self.projectList: |
3299 projectList.remove(projectname) |
3302 self.projectList.remove(projectname) |
3300 |
3303 |
3301 self.__Raptor.Debug("%i makefile extension makefiles for %s", |
3304 self.__Raptor.Debug("%i makefile extension makefiles for %s", |
3302 len(makefileList), str(componentNode.component.bldinf.filename)) |
3305 len(makefileList), str(componentNode.component.bldinf.filename)) |
3303 var = raptor_data.Variant() |
3306 var = raptor_data.Variant() |
3304 gnuSpec = raptor_data.Specification("makefile " + str(m.getMakefileName())) |
3307 gnuSpec = raptor_data.Specification("makefile " + str(m.getMakefileName())) |