equal
deleted
inserted
replaced
2175 self.BuildVariant.AddOperation(raptor_data.Set("DEFFILE", resolvedDefFile)) |
2175 self.BuildVariant.AddOperation(raptor_data.Set("DEFFILE", resolvedDefFile)) |
2176 self.__debug("Set DEFFILE to " + resolvedDefFile) |
2176 self.__debug("Set DEFFILE to " + resolvedDefFile) |
2177 self.BuildVariant.AddOperation(raptor_data.Set("DEFFILEKEYWORD", deffile_keyword)) |
2177 self.BuildVariant.AddOperation(raptor_data.Set("DEFFILEKEYWORD", deffile_keyword)) |
2178 self.__debug("Set DEFFILEKEYWORD to '%s'",deffile_keyword) |
2178 self.__debug("Set DEFFILEKEYWORD to '%s'",deffile_keyword) |
2179 |
2179 |
|
2180 # If target type is "implib" it must have a def file |
|
2181 self.checkImplibDefFile(resolvedDefFile) |
|
2182 |
2180 # if this target type has a default TARGETPATH other than "" for |
2183 # if this target type has a default TARGETPATH other than "" for |
2181 # resources then we need to add that default to all resources which |
2184 # resources then we need to add that default to all resources which |
2182 # do not explicitly set the TARGETPATH themselves. |
2185 # do not explicitly set the TARGETPATH themselves. |
2183 tp = self.getDefaultResourceTargetPath(self.getTargetType()) |
2186 tp = self.getDefaultResourceTargetPath(self.getTargetType()) |
2184 if tp: |
2187 if tp: |
2265 " ".join(self.sources))) |
2268 " ".join(self.sources))) |
2266 |
2269 |
2267 def getTargetType(self): |
2270 def getTargetType(self): |
2268 """Target type in lower case - the standard format""" |
2271 """Target type in lower case - the standard format""" |
2269 return self.__targettype.lower() |
2272 return self.__targettype.lower() |
|
2273 |
|
2274 def checkImplibDefFile(self, defFile): |
|
2275 """Project with target type implib must have DEFFILE defined |
|
2276 explicitly or implicitly, otherwise it is an error |
|
2277 """ |
|
2278 if self.getTargetType() == 'implib' and defFile == '': |
|
2279 self.__Raptor.Error("No DEF File for IMPLIB target type in " + self.__currentMmpFile) |
2270 |
2280 |
2271 def resolveDefFile(self, aTARGET, aBuildPlatform): |
2281 def resolveDefFile(self, aTARGET, aBuildPlatform): |
2272 """Returns a fully resolved DEFFILE entry depending on .mmp file location and TARGET, DEFFILE and NOSTRICTDEF |
2282 """Returns a fully resolved DEFFILE entry depending on .mmp file location and TARGET, DEFFILE and NOSTRICTDEF |
2273 entries in the .mmp file itself (where appropriate). |
2283 entries in the .mmp file itself (where appropriate). |
2274 Is able to deal with target names that have multiple '.' characters e.g. messageintercept.esockdebug.dll |
2284 Is able to deal with target names that have multiple '.' characters e.g. messageintercept.esockdebug.dll |