Changed: #1093 Create client_install using bnps made in client_patch.
This commit is contained in:
parent
3a520e2fb8
commit
706c0a695f
1 changed files with 24 additions and 39 deletions
|
@ -45,14 +45,7 @@ printLog(log, "-------")
|
|||
printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time())))
|
||||
printLog(log, "")
|
||||
|
||||
# Find tools
|
||||
BnpMake = findTool(log, ToolDirectories, BnpMakeTool, ToolSuffix)
|
||||
printLog(log, "")
|
||||
|
||||
if BnpMake == "":
|
||||
toolLogFail(log, BnpMakeTool, ToolSuffix)
|
||||
else:
|
||||
for category in InstallClientData:
|
||||
for category in InstallClientData:
|
||||
printLog(log, "CATEGORY " + category["Name"])
|
||||
if (category["UnpackTo"] != None):
|
||||
targetPath = ClientInstallDirectory
|
||||
|
@ -64,26 +57,18 @@ else:
|
|||
mkPath(log, InstallDirectory + "/" + package[0])
|
||||
copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath)
|
||||
else:
|
||||
sourcePath = ClientPatchDirectory + "/bnp"
|
||||
targetPath = ClientInstallDirectory + "/data"
|
||||
mkPath(log, targetPath)
|
||||
for package in category["Packages"]:
|
||||
printLog(log, "PACKAGE " + package[0])
|
||||
sourcePath = InstallDirectory + "/" + package[0]
|
||||
mkPath(log, sourcePath)
|
||||
sourceBnp = sourcePath + "/" + package[0] + ".bnp"
|
||||
targetBnp = targetPath + "/" + package[0] + ".bnp"
|
||||
if (len(package[1]) > 0):
|
||||
sourceBnp = sourcePath + "/" + package[1][0]
|
||||
targetBnp = targetPath + "/" + package[1][0]
|
||||
printLog(log, "TARGET " + package[1][0])
|
||||
needUpdateBnp = 1
|
||||
if (len(package) > 2):
|
||||
needUpdateBnp = needUpdate(log, sourcePath + "/" + package[2], targetBnp)
|
||||
else:
|
||||
needUpdateBnp = needUpdateDirNoSubdirFile(log, sourcePath, targetBnp)
|
||||
if (needUpdateBnp):
|
||||
printLog(log, "BNP " + targetBnp)
|
||||
subprocess.call([ BnpMake, "/p", sourcePath, targetPath ] + package[1])
|
||||
else:
|
||||
printLog(log, "SKIP " + targetBnp)
|
||||
copyFileIfNeeded(log, sourceBnp, targetBnp)
|
||||
printLog(log, "")
|
||||
|
||||
log.close()
|
||||
|
|
Loading…
Reference in a new issue