From de4d271857d15c05e8a29b9a59429f4f1aefce26 Mon Sep 17 00:00:00 2001
From: kaetemi <devnull@localhost>
Date: Fri, 16 Sep 2011 13:58:20 +0200
Subject: [PATCH] Changed: #1093 Create client_install using bnps made in
 client_patch.

---
 .../tools/build_gamedata/7_client_install.py  | 63 +++++++------------
 1 file changed, 24 insertions(+), 39 deletions(-)

diff --git a/code/nel/tools/build_gamedata/7_client_install.py b/code/nel/tools/build_gamedata/7_client_install.py
index b5a5bab1f..c4c1ab03c 100644
--- a/code/nel/tools/build_gamedata/7_client_install.py
+++ b/code/nel/tools/build_gamedata/7_client_install.py
@@ -45,45 +45,30 @@ 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:
-		printLog(log, "CATEGORY " + category["Name"])
-		if (category["UnpackTo"] != None):
-			targetPath = ClientInstallDirectory
-			if (category["UnpackTo"] != ""):
-				targetPath += "/" + category["UnpackTo"]
-			mkPath(log, targetPath)
-			for package in category["Packages"]:
-				printLog(log, "PACKAGE " + package[0])
-				mkPath(log, InstallDirectory + "/" + package[0])
-				copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath)
-		else:
-			targetPath = ClientInstallDirectory + "/data"
-			mkPath(log, targetPath)
-			for package in category["Packages"]:
-				printLog(log, "PACKAGE " + package[0])
-				sourcePath = InstallDirectory + "/" + package[0]
-				mkPath(log, sourcePath)
-				targetBnp = targetPath + "/" + package[0] + ".bnp"
-				if (len(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)
+for category in InstallClientData:
+	printLog(log, "CATEGORY " + category["Name"])
+	if (category["UnpackTo"] != None):
+		targetPath = ClientInstallDirectory
+		if (category["UnpackTo"] != ""):
+			targetPath += "/" + category["UnpackTo"]
+		mkPath(log, targetPath)
+		for package in category["Packages"]:
+			printLog(log, "PACKAGE " + package[0])
+			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])
+			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])
+			copyFileIfNeeded(log, sourceBnp, targetBnp)
 printLog(log, "")
 
 log.close()