Correction d'appels des programmes lzma et xdelta sur unix et quelques cfg crées par le pipeline

This commit is contained in:
Sit Melai 2017-01-29 18:06:00 +01:00
parent 1590df0b1d
commit e88b96339a
7 changed files with 205 additions and 17 deletions

View file

@ -458,6 +458,8 @@ if not args.noverify:
findTool(log, ToolDirectories, AiBuildWmapTool, ToolSuffix)
findTool(log, ToolDirectories, TgaCutTool, ToolSuffix)
findTool(log, ToolDirectories, PatchGenTool, ToolSuffix)
findTool(log, ToolDirectories, LzmaTool, ToolSuffix)
findTool(log, ToolDirectories, XDeltaTool, ToolSuffix)
findTool(log, ToolDirectories, TranslationToolsTool, ToolSuffix)
findTool(log, ToolDirectories, BuildWorldPackedColTool, ToolSuffix)
findTool(log, ToolDirectories, R2IslandsTexturesTool, ToolSuffix)

View file

@ -90,6 +90,8 @@ BnpMakeTool = "bnp_make"
AiBuildWmapTool = "ai_build_wmap"
TgaCutTool = "tga_cut"
PatchGenTool = "patch_gen"
LzmaTool = "lzma"
XDeltaTool = "xdelta"
TranslationToolsTool = "translation_tools"
BuildWorldPackedColTool = "build_world_packed_col"
R2IslandsTexturesTool = "r2_islands_textures"

View file

@ -65,12 +65,12 @@ if BnpMake == "":
toolLogFail(log, BnpMakeTool, ToolSuffix)
elif PatchGen == "" and not args.bnponly:
toolLogFail(log, PatchGenTool, ToolSuffix)
elif Lzma == "" and not args.bnponly:
toolLogFail(log, "LZMA", ToolSuffix)
elif XDelta == "" and not args.bnponly:
toolLogFail(log, "XDELTA", ToolSuffix)
elif os.path.dirname(Lzma) != os.path.dirname(XDelta):
printLog(log, "FAIL lzma.exe and xdelta.exe must be in the same directory")
#elif Lzma == "" and not args.bnponly:
# toolLogFail(log, "LZMA", ToolSuffix)
#elif XDelta == "" and not args.bnponly:
# toolLogFail(log, "XDELTA", ToolSuffix)
#elif os.path.dirname(Lzma) != os.path.dirname(XDelta):
# printLog(log, "FAIL lzma.exe and xdelta.exe must be in the same directory")
else:
mkPath(log, ClientPatchDirectory)
if not args.bnponly:
@ -144,7 +144,7 @@ else:
printLog(log, ">>> Update product <<<")
cwDir = os.getcwd().replace("\\", "/")
toolDir = os.path.dirname(Lzma).replace("\\", "/")
os.chdir(toolDir)
# os.chdir(toolDir)
subprocess.call([ PatchGen, "updateProduct", productXml ])
os.chdir(cwDir)
printLog(log, "")

View file

@ -2,9 +2,9 @@
// AI BUILD WMAP CONFIGURATION
Paths = {
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/ig_land",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/ig_other",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/rbank_output",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/ig_land",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/ig_other",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/rbank_output",
"/Volumes/SIELA/Khaganat/khanat-data/leveldesign",
};
@ -12,17 +12,28 @@ NoRecursePaths = { };
PacsPrimPaths = {
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/pacs_prim",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/jungle/pacs_prim",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/lacustre/pacs_prim",
};
OutputPath = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/ai_wmap";
OutputPath = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/ai_wmap";
Commands = {
"Verbose 0",
"setStartPoint r2_desert 22996 -1253",
"setStartPoint r2_desert 23605 -1206",
"setStartPoint r2_desert 28935 -1353",
"setStartPoint r2_desert 29736 -1234",
"setStartPoint r2_desert 30596 -1353",
"setStartPoint r2_desert 30574 -2090",
"setStartPoint indoors 20025 -432",
"setStartPoint indoors 20120 -439",
"setStartPoint indoors 20190 -454",
"setStartPoint indoors 20281 -439",
"setStartPoint indoors 20363 -439",
"setStartPoint indoors 20440 -444",
"setStartPoint indoors 20519 -466",
"setStartPoint indoors 20591 -442",
"setStartPoint indoors 20682 -439",
"setStartPoint indoors 20755 -440",
"setStartPoint indoors 20920 -439",
"setStartPoint indoors 20998 -441",
"setStartPoint indoors 21079 -443",
"setStartPoint indoors 21162 -443",
"setStartPoint indoors 21239 -439",
};

View file

@ -0,0 +1,62 @@
// BUILD CARTOGRAPHER CONFIGURATION
SearchPaths = {
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/ai_wmap",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/zone_lighted",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/zone_lighted_ig_land",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/smallbank",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/farbank",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/diplace",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/tiles",
"/Volumes/SIELA/Khaganat/khanat-data/common",
"/Volumes/SIELA/Khaganat/khanat-data/leveldesign/DFN",
"/Volumes/SIELA/Khaganat/khanat-data/leveldesign",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/ig_land",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/ig_other",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/sfx/ps",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/sfx/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/sfx/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/construction/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/construction/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/lacustre/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/lacustre/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/fyros/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/fyros/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/sfx/map_export",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/sfx/map_uncompressed",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/construction/map_export",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/construction/map_uncompressed",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/map_export",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/map_uncompressed",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/lacustre/map_export",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/lacustre/map_uncompressed",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/fyros/map_export",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/fyros/map_uncompressed",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/pacs_prim",
};
OutDir = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/cartographer";
Continents = {
"r2_desert",
};
SeasonSuffixes = {
"_sp",
"_su",
"_au",
"_wi",
};
InverseZTest = true;
Vegetation = true;
MeterPixelSize = 2;
CompleteIslandsFile = "r2_islands.xml";
EntryPointsFile = "r2_entry_points.txt";

View file

@ -0,0 +1,26 @@
// BUILD WORLD PACKED COL CONFIGURATION
SearchPaths = {
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/ai_wmap",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/zone_lighted",
"/Volumes/SIELA/Khaganat/khanat-data/common",
};
CachePath = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/pz_cache_zone";
CWMapCachePath = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/pz_cache_cwmap";
OutputPath = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/r2_desert/pz_col_meshes";
EntryPointsFile = "r2_islands.xml";
CWMapList = {
"r2_desert_0.cwmap2",
};
Fly = 0;
HeightMapsAsTga = 1;
PixelPerMeter = 1;
RefineThreshold = 32;

View file

@ -0,0 +1,85 @@
// Rbank settings
Verbose = 1;
CheckConsistency = 0;
ZonePath = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/zone_weld/";
BanksPath = "/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/jungle/smallbank/";
Bank = "/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/jungle/smallbank/jungle.smallbank";
ZoneExt = ".zonew";
ZoneNHExt = ".zonenhw";
IGBoxes = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/rbank_bbox/temp.bbox";
LevelDesignWorldPath = "/Volumes/SIELA/Khaganat/khanat-data/leveldesign/world";
IgLandPath = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/ig_land";
IgVillagePath = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/ig_other";
TessellationPath = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/rbank_tessellation/";
TessellateLevel = 1;
WaterThreshold = 1.0;
OutputRootPath = "/Volumes/SIELA/Khaganat/khanat-build/export/";
SmoothDirectory = "continents/indoors/rbank_smooth/";
RawDirectory = "continents/indoors/rbank_raw/";
ReduceSurfaces = 1;
SmoothBorders = 1;
ComputeElevation = 0;
ComputeLevels = 1;
LinkElements = 1;
CutEdges = 1;
UseZoneSquare = 0;
// The whole landscape
ZoneUL = "1_AA";
ZoneDR = "2_AI";
PreprocessDirectory = "/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/rbank_preproc/";
// The global retriever processing settings
GlobalRetriever = "temp.gr";
RetrieverBank = "temp.rbank";
GlobalUL = "1_AA";
GlobalDR = "2_AI";
// Which kind of stuff to do
TessellateZones = 0;
MoulineZones = 0;
ProcessRetrievers = 0;
ProcessGlobal = 0;
Zones = {
};
Pathes = {
"/Volumes/SIELA/Khaganat/khaganat/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/ig_land",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/ig_other",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/sfx/ps",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/sfx/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/sfx/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/construction/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/common/construction/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/desert/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/jungle/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/jungle/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/lacustre/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/ecosystems/lacustre/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/indoors/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/fyros/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/fyros/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/matis/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/matis/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/zorai/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/zorai/shape_with_coarse_mesh",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/tryker/shape_optimized",
"/Volumes/SIELA/Khaganat/khanat-build/export/continents/tryker/shape_with_coarse_mesh",
};