From 45668dcbfe2fff51576e72ef5a29258a76964e54 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 16 Jun 2021 06:31:21 +0800 Subject: [PATCH] Generate dev client folder without binaries to match dev shard behaviour --- nel/tools/build_gamedata/0_setup.py | 4 ++-- nel/tools/build_gamedata/b1_client_dev.py | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nel/tools/build_gamedata/0_setup.py b/nel/tools/build_gamedata/0_setup.py index 905a88e81..3a1252821 100755 --- a/nel/tools/build_gamedata/0_setup.py +++ b/nel/tools/build_gamedata/0_setup.py @@ -250,13 +250,13 @@ if not args.noconf: DummyUnknownName LinuxServiceExecutableDirectory except NameError: - LinuxServiceExecutableDirectory = "R:/build/gcc_server/bin" + LinuxServiceExecutableDirectory = "R:/build/server_gcc/bin" try: if args.preset: DummyUnknownName LinuxClientExecutableDirectory except NameError: - LinuxClientExecutableDirectory = "R:/build/gcc_client/bin" + LinuxClientExecutableDirectory = "R:/build/client_gcc/bin" try: if args.preset: DummyUnknownName diff --git a/nel/tools/build_gamedata/b1_client_dev.py b/nel/tools/build_gamedata/b1_client_dev.py index 168a06ab1..e674fefb9 100755 --- a/nel/tools/build_gamedata/b1_client_dev.py +++ b/nel/tools/build_gamedata/b1_client_dev.py @@ -92,8 +92,13 @@ for category in InstallClientData: for package in category["Packages"]: printLog(log, "PACKAGE " + package[0]) mkPath(log, InstallDirectory + "/" + package[0]) - copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath) - copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPathLive) + if "exedll" in package[0]: + if package[0] == "exedll": # or package[0] == platformExeDll # TODO: 64-bit and Linux separation of exedll, only include one + copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPath) + copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPathLive) + else: + copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath) + copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPathLive) printLog(log, "") log.close()