From 020bfb775ee21f2a01966754491a88937f61fd48 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 20 Feb 2014 20:15:18 +0100 Subject: [PATCH] Disable build of dataset packed sheets in build pipeline --- code/nel/tools/build_gamedata/leveldesign_dev.bat | 6 +++--- .../ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/nel/tools/build_gamedata/leveldesign_dev.bat b/code/nel/tools/build_gamedata/leveldesign_dev.bat index 5d307fcf0..1692cc155 100644 --- a/code/nel/tools/build_gamedata/leveldesign_dev.bat +++ b/code/nel/tools/build_gamedata/leveldesign_dev.bat @@ -1,9 +1,9 @@ title Ryzom Core: 1_export.py (LEVELDESIGN) -1_export.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign +1_export.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share title Ryzom Core: 2_build.py (LEVELDESIGN) -2_build.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign +2_build.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share title Ryzom Core: 3_install.py (LEVELDESIGN) -3_install.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign +3_install.py -ipj common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share title Ryzom Core: b1_client_dev.py (LEVELDESIGN) b1_client_dev.py title Ryzom Core: b2_shard_data.py (LEVELDESIGN) diff --git a/code/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp b/code/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp index 9c2212efa..6d5eb2119 100644 --- a/code/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp +++ b/code/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp @@ -124,8 +124,9 @@ int main(int nNbArg, char **ppArgs) // Used by mirror_service.cpp // Used by range_mirror_manager.cpp // Used by mirror.cpp - TSDataSetSheets sDataSetSheets; - loadForm("dataset", exportDir + "/datasets.packed_sheets", sDataSetSheets); + // TSDataSetSheets sDataSetSheets; + // loadForm("dataset", exportDir + "/datasets.packed_sheets", sDataSetSheets); + // FIXME: Somehow mirror.cpp overwrites the packed_sheets with an empty one... (the other cpp's don't do this, though.) } // IOS