Include external dependency paths in environment

K3R0Z1V · Apr 29, 2022 · 2ace71b · 2ace71b
1 parent c085d91
commit 2ace71b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 189 deletions.
diff --git a/nel/tools/build_gamedata/9_upload.py b/nel/tools/build_gamedata/9_upload.py
diff --git a/tool/quick_start/configure_pipeline.py b/tool/quick_start/configure_pipeline.py
@@ -26,6 +26,8 @@ def isVisualStudio(client):
 fo.write("from projects import *\n")
 fo.write("\n")
 for client in NeLTargets["Client"]:
+	if not NeLTargets["Client"][client]:
+		continue
 	clientWindows = isWindows(client)
 	fo.write("ProjectsToProcess += [ \"common/exedll_" + client + "\" ]\n")
 	fo.write("\n")
@@ -48,6 +50,8 @@ def isVisualStudio(client):
 
 # Generate the individual projects
 for client in NeLTargets["Client"]:
+	if not NeLTargets["Client"][client]:
+		continue
 	target = NeLTargets["Client"][client]
 	clientWindows = isWindows(client)
 	clientVisualStudio = isVisualStudio(client)

diff --git a/tool/quick_start/configure_targets.py b/tool/quick_start/configure_targets.py
@@ -302,6 +302,28 @@ def GeneratePathScript():
 	fo.write("set " + EscapeArg("RC_TOOLS_DIRS_STOCK=" + os.path.join(NeLRootDir, os.path.normcase("stock/nel_tools")) + os.pathsep + os.path.join(NeLRootDir, os.path.normcase("stock/ryzom_tools")) + os.pathsep + NeLDependenciesDir) + "\n")
 	fo.write("set " + EscapeArg("RC_TOOLS_DIRS_RELEASE=" + os.path.join(toolsDir, os.path.normcase("bin/Release").replace("release", "Release")) + os.pathsep + os.path.join(toolsDir, "bin") + os.pathsep + "%RC_SERVER_DIRS_RELEASE%" + os.pathsep + NeLDependenciesDir) + "\n")
 	fo.write("set " + EscapeArg("RC_TOOLS_DIRS_DEBUG=" + os.path.join(toolsDir, os.path.normcase("bin/Debug").replace("debug", "Debug")) + os.pathsep + os.path.join(toolsDir, "bin") + os.pathsep + "%RC_SERVER_DIRS_RELEASE%" + os.pathsep + NeLDependenciesDir) + "\n")
+	externalBinDirs = {}
+	if Targets["Native"]["client_dev"]:
+		if "PrefixBin" in Targets["Native"]["client_dev"]:
+			for dir in Targets["Native"]["client_dev"]["PrefixBin"]:
+				if not dir in externalBinDirs:
+					externalBinDirs[dir] = True
+	if Targets["Native"]["server_dev"]:
+		if "PrefixBin" in Targets["Native"]["server_dev"]:
+			for dir in Targets["Native"]["server_dev"]["PrefixBin"]:
+				if not dir in externalBinDirs:
+					externalBinDirs[dir] = True
+	if Targets["Native"]["tools"]:
+		if "PrefixBin" in Targets["Native"]["tools"]:
+			for dir in Targets["Native"]["tools"]["PrefixBin"]:
+				if not dir in externalBinDirs:
+					externalBinDirs[dir] = True
+	if Targets["Native"]["samples"]:
+		if "PrefixBin" in Targets["Native"]["samples"]:
+			for dir in Targets["Native"]["samples"]["PrefixBin"]:
+				if not dir in externalBinDirs:
+					externalBinDirs[dir] = True
+	fo.write("set " + EscapeArg("RC_EXTERNAL_BIN_DIRS=" + os.pathsep.join(externalBinDirs.keys())) + "\n")
 	exedll = []
 	for client in NeLTargetClient:
 		exedll += [ "common/exedll_" + client ]

diff --git a/tool/quick_start/win32/configure.bat b/tool/quick_start/win32/configure.bat
@@ -91,6 +91,7 @@ if %errorlevel% neq 0 goto :notoolsbuild
 :hastoolsbuild
 echo Using locally built tools
 set RC_TOOLS_DIRS=%RC_TOOLS_DIRS_RELEASE%
+set RC_ORIG_PATH=%RC_EXTERNAL_BIN_DIRS%;%RC_ORIG_PATH%
 :notoolsbuild
 if not defined RC_TOOLS_DIRS (
 echo ERROR: Tools not found. Run `code_configure_rebuild_all` to build everything, and re-run the configuration script.
@@ -132,12 +133,12 @@ if %errorlevel% neq 0 pause
 cd /d %RC_ROOT%
 call copy_dds_to_interfaces.bat
 cd /d %RC_ROOT%\code\nel\tools\build_gamedata
-rem python b1_client_dev.py
-rem if %errorlevel% neq 0 pause
-rem python b2_shard_data.py
-rem if %errorlevel% neq 0 pause
-rem python b3_shard_dev.py
-rem if %errorlevel% neq 0 pause
+python b1_client_dev.py
+if %errorlevel% neq 0 pause
+python b2_shard_data.py
+if %errorlevel% neq 0 pause
+python b3_shard_dev.py
+if %errorlevel% neq 0 pause
 echo(
 set PATH=%RC_PYTHON3_DIR%;%RC_ORIG_PATH%
 cd /d %RC_ROOT%\code\tool\quick_start

diff --git a/tool/quick_start/win32/install/cmd_build_gamedata_debug.bat b/tool/quick_start/win32/install/cmd_build_gamedata_debug.bat
@@ -1,6 +1,6 @@
 call %~dp0_r_check.bat
 set "RC_TOOLS_DIRS=%RC_TOOLS_DIRS_DEBUG%"
-set "PATH=%RC_PATH%;%RC_TOOLS_DIRS%;%RC_PYTHON27_DIR%;%PATH%"
+set "PATH=%RC_PATH%;%RC_TOOLS_DIRS%;%RC_EXTERNAL_BIN_DIRS%;%RC_PYTHON27_DIR%;%PATH%"
 cd /d %RC_CODE_DIR%\nel\tools\build_gamedata
 dir *.bat
 dir *.py

diff --git a/tool/quick_start/win32/install/cmd_build_gamedata_release.bat b/tool/quick_start/win32/install/cmd_build_gamedata_release.bat
@@ -1,6 +1,6 @@
 call %~dp0_r_check.bat
 set "RC_TOOLS_DIRS=%RC_TOOLS_DIRS_RELEASE%"
-set "PATH=%RC_PATH%;%RC_TOOLS_DIRS%;%RC_PYTHON27_DIR%;%PATH%"
+set "PATH=%RC_PATH%;%RC_TOOLS_DIRS%;%RC_EXTERNAL_BIN_DIRS%;%RC_PYTHON27_DIR%;%PATH%"
 cd /d %RC_CODE_DIR%\nel\tools\build_gamedata
 dir *.bat
 dir *.py