From c29989ee2ec913a540bc3238d6b5e6640e3ac2c2 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sun, 20 Jun 2010 22:25:57 +0200 Subject: [PATCH] Changed: #929 Corrected some config variable names for rbank build process. --- code/nel/tools/build_gamedata/processes/ligo/0_setup.py | 4 ++-- code/nel/tools/build_gamedata/processes/rbank/2_build.py | 2 +- .../build_gamedata/workspace/ecosystems/jungle/directories.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/nel/tools/build_gamedata/processes/ligo/0_setup.py b/code/nel/tools/build_gamedata/processes/ligo/0_setup.py index ecdc297f7..53def09da 100644 --- a/code/nel/tools/build_gamedata/processes/ligo/0_setup.py +++ b/code/nel/tools/build_gamedata/processes/ligo/0_setup.py @@ -65,7 +65,7 @@ if LigoExportLand != "": mkPath(log, ExportBuildDirectory + "/" + LigoZoneBuildDirectory) mkPath(log, ExportBuildDirectory + "/" + LigoIgLandBuildDirectory) mkPath(log, ExportBuildDirectory + "/" + LigoIgOtherBuildDirectory) - mkPath(log, ExportBuildDirectory + "/" + RbankCmbBuildDirectory) + mkPath(log, ExportBuildDirectory + "/" + RbankMeshBuildDirectory) # Setup client directories printLog(log, ">>> Setup client directories <<<") @@ -102,7 +102,7 @@ if LigoExportLand != "": cf.write("\n") cf.write("DFNDir = \"" + LeveldesignDfnDirectory + "\";\n") cf.write("RefCMBDir = \"" + DatabaseDirectory + "/" + LigoDatabaseCmbExportDirectory + "\";\n") # FIXME - cf.write("OutCMBDir = \"" + ExportBuildDirectory + "/" + RbankCmbBuildDirectory + "\";\n") # FIXME + cf.write("OutCMBDir = \"" + ExportBuildDirectory + "/" + RbankMeshBuildDirectory + "\";\n") # FIXME cf.write("\n") cf.write("ContinentFile = \"" + LeveldesignWorldDirectory + "/" + ContinentFile + "\";\n") cf.write("\n") diff --git a/code/nel/tools/build_gamedata/processes/rbank/2_build.py b/code/nel/tools/build_gamedata/processes/rbank/2_build.py index 718e5013b..7020d7b09 100644 --- a/code/nel/tools/build_gamedata/processes/rbank/2_build.py +++ b/code/nel/tools/build_gamedata/processes/rbank/2_build.py @@ -89,7 +89,7 @@ cf.write("\n") cf.write("// Rbank settings\n") cf.write("\n") cf.write("Verbose = " + str(RBankVerbose) + ";\n") -cf.write("ConsistencyCheck = " + str(RBankConsistencyCheck) + ";\n") +cf.write("CheckConsistency = " + str(RBankConsistencyCheck) + ";\n") mkPath(log, ExportBuildDirectory + "/" + ZoneWeldBuildDirectory) cf.write("ZonePath = \"" + ExportBuildDirectory + "/" + ZoneWeldBuildDirectory + "/\";\n") mkPath(log, ExportBuildDirectory + "/" + SmallbankExportDirectory) diff --git a/code/ryzom/tools/build_gamedata/workspace/ecosystems/jungle/directories.py b/code/ryzom/tools/build_gamedata/workspace/ecosystems/jungle/directories.py index aa3ad4c47..93dd9390d 100644 --- a/code/ryzom/tools/build_gamedata/workspace/ecosystems/jungle/directories.py +++ b/code/ryzom/tools/build_gamedata/workspace/ecosystems/jungle/directories.py @@ -196,6 +196,7 @@ IgVillageBuildDirectory = "_invalid" # Rbank directories RbankOutputBuildDirectory = "_invalid" +RbankMeshBuildDirectory = "_invalid" # Ligo directories