[DEV] correct the path error

This commit is contained in:
Edouard DUPIN 2013-07-04 21:33:39 +02:00
parent 84ccc7605e
commit 06d1dcf576
2 changed files with 12 additions and 12 deletions

View File

@ -243,8 +243,8 @@ class module:
target.global_flags_ar, target.global_flags_ar,
self.flags_ar, self.flags_ar,
tmpList[1], tmpList[1],
tmpList[0], tmpList[0]])#,
depancy.src]) #depancy.src])
RunCommand(cmdLine) RunCommand(cmdLine)
#$(Q)$(TARGET_RANLIB) $@ #$(Q)$(TARGET_RANLIB) $@
cmdLine=lutinTools.ListToStr([ cmdLine=lutinTools.ListToStr([

View File

@ -96,9 +96,9 @@ class Target:
def fileGenerateObject(self,binaryName,moduleName,basePath,file): def fileGenerateObject(self,binaryName,moduleName,basePath,file):
list=[] list=[]
list.append(basePath + "/" + file) list.append(basePath + "/" + file)
list.append(self.GetBuildFolder(moduleName) + file + self.suffix_obj) list.append(self.GetBuildFolder(moduleName) + "/" + file + self.suffix_obj)
list.append(self.GetBuildFolder(moduleName) + file + self.suffix_dependence) list.append(self.GetBuildFolder(moduleName) + "/" + file + self.suffix_dependence)
list.append(self.GetBuildFolder(moduleName) + file + self.suffix_cmdLine) list.append(self.GetBuildFolder(moduleName) + "/" + file + self.suffix_cmdLine)
return list return list
""" """
return a list of 3 elements : return a list of 3 elements :
@ -110,16 +110,16 @@ class Target:
list=[] list=[]
if (type=="bin"): if (type=="bin"):
list.append(file) list.append(file)
list.append(self.GetStagingFolder(binaryName) + self.folder_bin + "/" + moduleName + self.suffix_binary) list.append(self.GetStagingFolder(binaryName) + "/" + self.folder_bin + "/" + moduleName + self.suffix_binary)
list.append(self.GetBuildFolder(moduleName) + moduleName + self.suffix_dependence) list.append(self.GetBuildFolder(moduleName) + "/" + moduleName + self.suffix_dependence)
elif (type=="lib-shared"): elif (type=="lib-shared"):
list.append(file) list.append(file)
list.append(self.GetStagingFolder(binaryName) + self.folder_lib + "/" + moduleName + self.suffix_lib_dynamic) list.append(self.GetStagingFolder(binaryName) + "/" + self.folder_lib + "/" + moduleName + self.suffix_lib_dynamic)
list.append(self.GetBuildFolder(moduleName) + moduleName + self.suffix_dependence) list.append(self.GetBuildFolder(moduleName) + "/" + moduleName + self.suffix_dependence)
elif (type=="lib-static"): elif (type=="lib-static"):
list.append(file) list.append(file)
list.append(self.GetBuildFolder(moduleName) + moduleName + self.suffix_lib_static) list.append(self.GetBuildFolder(moduleName) + "/" + moduleName + self.suffix_lib_static)
list.append(self.GetBuildFolder(moduleName) + moduleName + self.suffix_dependence) list.append(self.GetBuildFolder(moduleName) + "/" + moduleName + self.suffix_dependence)
else: else:
debug.error("unknow type : " + type) debug.error("unknow type : " + type)
return list return list
@ -240,7 +240,7 @@ class Target:
debug.info("clean module '" + moduleName + "'") debug.info("clean module '" + moduleName + "'")
return mod.Clean(self) return mod.Clean(self)
elif actionName == "build": elif actionName == "build":
debug.info("build module '" + moduleName + "'") debug.debug("build module '" + moduleName + "'")
return mod.Build(self, None) return mod.Build(self, None)
debug.error("not know module name : '" + moduleName + "' to '" + actionName + "' it") debug.error("not know module name : '" + moduleName + "' to '" + actionName + "' it")