[DEV] check the cmdLine of the .a, .so bin
This commit is contained in:
parent
04ebd5ce2e
commit
419f0ee229
@ -239,7 +239,7 @@ class module:
|
|||||||
|
|
||||||
# check the dependency for this file :
|
# check the dependency for this file :
|
||||||
if False==dependency.NeedRePackage(file_dst, file_src, True, file_cmd, cmdLine) \
|
if False==dependency.NeedRePackage(file_dst, file_src, True, file_cmd, cmdLine) \
|
||||||
and False==dependency.NeedRePackage(file_dst, depancy.src, Falsefile_cmd, cmdLine):
|
and False==dependency.NeedRePackage(file_dst, depancy.src, False, file_cmd, cmdLine):
|
||||||
return file_dst
|
return file_dst
|
||||||
lutinTools.CreateDirectoryOfFile(file_dst)
|
lutinTools.CreateDirectoryOfFile(file_dst)
|
||||||
debug.printElement("StaticLib", self.name, "==>", file_dst)
|
debug.printElement("StaticLib", self.name, "==>", file_dst)
|
||||||
@ -248,10 +248,12 @@ class module:
|
|||||||
os.remove(file_dst)
|
os.remove(file_dst)
|
||||||
RunCommand(cmdLine)
|
RunCommand(cmdLine)
|
||||||
#$(Q)$(TARGET_RANLIB) $@
|
#$(Q)$(TARGET_RANLIB) $@
|
||||||
cmdLine=lutinTools.ListToStr([
|
cmdLineRanLib=lutinTools.ListToStr([
|
||||||
target.ranlib,
|
target.ranlib,
|
||||||
file_dst ])
|
file_dst ])
|
||||||
RunCommand(cmdLine)
|
RunCommand(cmdLineRanLib)
|
||||||
|
# write cmd line only after to prevent errors ...
|
||||||
|
lutinMultiprocess.StoreCommand(cmdLine, file_cmd)
|
||||||
return file_dst
|
return file_dst
|
||||||
|
|
||||||
|
|
||||||
@ -261,31 +263,34 @@ class module:
|
|||||||
def Link_to_so(self, file, binary, target, depancy, libName=""):
|
def Link_to_so(self, file, binary, target, depancy, libName=""):
|
||||||
if libName=="":
|
if libName=="":
|
||||||
libName = self.name
|
libName = self.name
|
||||||
tmpList = target.GenerateFile(binary, libName,self.originFolder,file,"lib-shared")
|
file_src, file_dst, file_depend, file_cmd = target.GenerateFile(binary, libName,self.originFolder,file,"lib-shared")
|
||||||
# check the dependency for this file :
|
#create command Line
|
||||||
if False==dependency.NeedRePackage(tmpList[1], tmpList[0], True) \
|
|
||||||
and False==dependency.NeedRePackage(tmpList[1], depancy.src, False):
|
|
||||||
return tmpList[1]
|
|
||||||
lutinTools.CreateDirectoryOfFile(tmpList[1])
|
|
||||||
debug.printElement("SharedLib", libName, "==>", tmpList[1])
|
|
||||||
#$(Q)$(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $(PRIVATE_ALL_OBJECTS)
|
|
||||||
cmdLine=lutinTools.ListToStr([
|
cmdLine=lutinTools.ListToStr([
|
||||||
target.xx,
|
target.xx,
|
||||||
"-o", tmpList[1],
|
"-o", file_dst,
|
||||||
target.global_sysroot,
|
target.global_sysroot,
|
||||||
"-shared",
|
"-shared",
|
||||||
tmpList[0],
|
file_src,
|
||||||
depancy.src,
|
depancy.src,
|
||||||
self.flags_ld,
|
self.flags_ld,
|
||||||
depancy.flags_ld,
|
depancy.flags_ld,
|
||||||
target.global_flags_ld])
|
target.global_flags_ld])
|
||||||
|
|
||||||
|
# check the dependency for this file :
|
||||||
|
if False==dependency.NeedRePackage(file_dst, file_src, True, file_cmd, cmdLine) \
|
||||||
|
and False==dependency.NeedRePackage(file_dst, depancy.src, False, file_cmd, cmdLine):
|
||||||
|
return tmpList[1]
|
||||||
|
lutinTools.CreateDirectoryOfFile(file_dst)
|
||||||
|
debug.printElement("SharedLib", libName, "==>", file_dst)
|
||||||
RunCommand(cmdLine)
|
RunCommand(cmdLine)
|
||||||
if "release"==target.buildMode:
|
if "release"==target.buildMode:
|
||||||
debug.printElement("SharedLib(strip)", libName, "", "")
|
debug.printElement("SharedLib(strip)", libName, "", "")
|
||||||
cmdLine=lutinTools.ListToStr([
|
cmdLineStrip=lutinTools.ListToStr([
|
||||||
target.strip,
|
target.strip,
|
||||||
tmpList[1]])
|
file_dst])
|
||||||
RunCommand(cmdLine)
|
RunCommand(cmdLineStrip)
|
||||||
|
# write cmd line only after to prevent errors ...
|
||||||
|
lutinMultiprocess.StoreCommand(cmdLine, file_cmd)
|
||||||
#debug.printElement("SharedLib", self.name, "==>", tmpList[1])
|
#debug.printElement("SharedLib", self.name, "==>", tmpList[1])
|
||||||
|
|
||||||
|
|
||||||
@ -293,30 +298,33 @@ class module:
|
|||||||
## Commands for running gcc to link an executable.
|
## Commands for running gcc to link an executable.
|
||||||
###############################################################################
|
###############################################################################
|
||||||
def Link_to_bin(self, file, binary, target, depancy):
|
def Link_to_bin(self, file, binary, target, depancy):
|
||||||
tmpList = target.GenerateFile(binary, self.name,self.originFolder,file,"bin")
|
file_src, file_dst, file_depend, file_cmd = target.GenerateFile(binary, self.name,self.originFolder,file,"bin")
|
||||||
# check the dependency for this file :
|
#create comdLine :
|
||||||
if False==dependency.NeedRePackage(tmpList[1], tmpList[0], True) \
|
|
||||||
and False==dependency.NeedRePackage(tmpList[1], depancy.src, False):
|
|
||||||
return tmpList[1]
|
|
||||||
lutinTools.CreateDirectoryOfFile(tmpList[1])
|
|
||||||
debug.printElement("Executable", self.name, "==>", tmpList[1])
|
|
||||||
#$(Q)$(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $(PRIVATE_ALL_OBJECTS)
|
|
||||||
cmdLine=lutinTools.ListToStr([
|
cmdLine=lutinTools.ListToStr([
|
||||||
target.xx,
|
target.xx,
|
||||||
"-o", tmpList[1],
|
"-o", file_dst,
|
||||||
target.global_sysroot,
|
target.global_sysroot,
|
||||||
tmpList[0],
|
file_src,
|
||||||
depancy.src,
|
depancy.src,
|
||||||
self.flags_ld,
|
self.flags_ld,
|
||||||
depancy.flags_ld,
|
depancy.flags_ld,
|
||||||
target.global_flags_ld])
|
target.global_flags_ld])
|
||||||
|
# check the dependency for this file :
|
||||||
|
if False==dependency.NeedRePackage(file_dst, file_src, True, file_cmd, cmdLine) \
|
||||||
|
and False==dependency.NeedRePackage(file_dst, depancy.src, False, file_cmd, cmdLine):
|
||||||
|
return file_dst
|
||||||
|
lutinTools.CreateDirectoryOfFile(file_dst)
|
||||||
|
debug.printElement("Executable", self.name, "==>", file_dst)
|
||||||
|
|
||||||
RunCommand(cmdLine)
|
RunCommand(cmdLine)
|
||||||
if "release"==target.buildMode:
|
if "release"==target.buildMode:
|
||||||
debug.printElement("Executable(strip)", self.name, "", "")
|
debug.printElement("Executable(strip)", self.name, "", "")
|
||||||
cmdLine=lutinTools.ListToStr([
|
cmdLineStrip=lutinTools.ListToStr([
|
||||||
target.strip,
|
target.strip,
|
||||||
tmpList[1]])
|
file_dst])
|
||||||
RunCommand(cmdLine)
|
RunCommand(cmdLineStrip)
|
||||||
|
# write cmd line only after to prevent errors ...
|
||||||
|
lutinMultiprocess.StoreCommand(cmdLine, file_cmd)
|
||||||
|
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
@ -6,6 +6,7 @@ import time
|
|||||||
import Queue
|
import Queue
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import lutinTools
|
||||||
|
|
||||||
queueLock = threading.Lock()
|
queueLock = threading.Lock()
|
||||||
workQueue = Queue.Queue()
|
workQueue = Queue.Queue()
|
||||||
@ -17,6 +18,17 @@ isInit = False # the thread are initialized
|
|||||||
errorOccured = False # a thread have an error
|
errorOccured = False # a thread have an error
|
||||||
processorAvaillable = 1 # number of CPU core availlable
|
processorAvaillable = 1 # number of CPU core availlable
|
||||||
|
|
||||||
|
def StoreCommand(cmdLine, file):
|
||||||
|
# write cmd line only after to prevent errors ...
|
||||||
|
if file!="":
|
||||||
|
# Create directory:
|
||||||
|
lutinTools.CreateDirectoryOfFile(file)
|
||||||
|
# Store the command Line:
|
||||||
|
file2 = open(file, "w")
|
||||||
|
file2.write(cmdLine)
|
||||||
|
file2.flush()
|
||||||
|
file2.close()
|
||||||
|
|
||||||
|
|
||||||
def RunCommand(cmdLine, storeCmdLine=""):
|
def RunCommand(cmdLine, storeCmdLine=""):
|
||||||
debug.debug(cmdLine)
|
debug.debug(cmdLine)
|
||||||
@ -38,11 +50,7 @@ def RunCommand(cmdLine, storeCmdLine=""):
|
|||||||
return
|
return
|
||||||
|
|
||||||
# write cmd line only after to prevent errors ...
|
# write cmd line only after to prevent errors ...
|
||||||
if storeCmdLine!="":
|
StoreCommand(cmdLine, storeCmdLine)
|
||||||
file2 = open(storeCmdLine, "w")
|
|
||||||
file2.write(cmdLine)
|
|
||||||
file2.flush()
|
|
||||||
file2.close()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -112,10 +112,12 @@ class Target:
|
|||||||
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)
|
||||||
|
list.append(self.GetStagingFolder(binaryName) + "/" + self.folder_bin + "/" + moduleName + self.suffix_cmdLine)
|
||||||
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)
|
||||||
|
list.append(self.GetStagingFolder(binaryName) + "/" + self.folder_lib + "/" + moduleName + self.suffix_cmdLine)
|
||||||
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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user