Fixed: #1074 sheets_packer using default static relative paths

code/ryzom/client/src/continent_manager.cpp

@@ -697,26 +697,28 @@ void CContinentManager::reloadSky()
 // ***************************************************************************
 void CContinentManager::loadContinentLandMarks()
 {
+	std::string dataPath = "../../client/data";
+
 	if (ClientCfg.UpdatePackedSheet == false)
 	{
-		readLMConts();
+		readLMConts(dataPath);
 	}
 	else
 	{
-		buildLMConts();
+		buildLMConts("ryzom.world", "../../common/data_leveldesign/primitives", dataPath);
-		readLMConts();
+		readLMConts(dataPath);
 	}
 }
 
 // ***************************************************************************
 
-void CContinentManager::readLMConts()
+void CContinentManager::readLMConts(const std::string &dataPath)
 {
 	CIFile f;
 
 	string sPackedFileName = CPath::lookup(LM_PACKED_FILE, false);
 	if (sPackedFileName.empty())
-		sPackedFileName = LM_PACKED_FILE_SAVE;
+		sPackedFileName = CPath::standardizePath(dataPath) + LM_PACKED_FILE;
 
 	if (f.open(sPackedFileName))
 	{

code/ryzom/client/src/continent_manager.h

@@ -127,7 +127,7 @@ public:
 protected:
 
 	void loadContinentLandMarks();
-	void readLMConts();
+	void readLMConts(const std::string &dataPath);
 
 protected:
 

code/ryzom/client/src/continent_manager_build.cpp

@@ -67,7 +67,7 @@ void primitiveToLM(CContLandMark &lm, IPrimitive *p)
 }
 
 // ***************************************************************************
-bool buildLMConts()
+bool buildLMConts(const std::string &worldSheet, const std::string &primitivesPath, const std::string &dataPath)
 {
 	bool bRebuild = false;
 
@@ -75,7 +75,7 @@ bool buildLMConts()
 
 	map<string, sTmpContinent*> AllContinents;	// Map with all continents.
 	{
-		CEntitySheet *sheet = SheetMngr.get(CSheetId("ryzom.world"));
+		CEntitySheet *sheet = SheetMngr.get(CSheetId(worldSheet));
 
 		if (!sheet || sheet->type() != CEntitySheet::WORLD)
 		{
@@ -100,7 +100,7 @@ bool buildLMConts()
 	vector<string> vRegionFiles;
 	{
 		vector<string> vTmp;
-		CPath::getPathContent("../../common/data_leveldesign/primitives", true, false, true, vTmp);
+		CPath::getPathContent(primitivesPath, true, false, true, vTmp);
 		for (uint32 i = 0; i < vTmp.size(); ++i)
 		{
 			string filename = CFile::getFilename(vTmp[i]);
@@ -115,7 +115,7 @@ bool buildLMConts()
 	string sPackedFileName = CPath::lookup(LM_PACKED_FILE, false);
 	if (sPackedFileName.empty())
 	{
-		sPackedFileName = LM_PACKED_FILE_SAVE;
+		sPackedFileName = NLMISC::CPath::standardizePath(dataPath) + LM_PACKED_FILE;
 		bRebuild = true;
 	}
 	else
@@ -253,7 +253,7 @@ bool buildLMConts()
 				}
 				else
 				{
-					nlwarning("cannot find continent %s in ryzom.world", contName.c_str());
+					nlwarning("cannot find continent %s in %s", contName.c_str(), worldSheet.c_str());
 				}
 			}
 		}

code/ryzom/client/src/continent_manager_build.h

@@ -83,10 +83,9 @@ public:
 	}
 };
 
-extern bool buildLMConts();
+extern bool buildLMConts(const std::string &worldSheet, const std::string &primitivesPath, const std::string &dataPath);
 
 #define LM_PACKED_FILE "lmconts.packed"
-#define LM_PACKED_FILE_SAVE "../../client/data/" LM_PACKED_FILE
 #define WORLD_MAP_FILE "global_world_map.primitive"
 
 #endif // CL_CONTINENT_MANAGER_BUILD_H

code/ryzom/tools/sheets_packer/sheets_packer.cfg

@@ -4,4 +4,7 @@
 /////////////////////////////////
 /////////////////////////////////
 DataPath = { "../../common/data_leveldesign", "../../common/data_common", "../../client/data" };
+WorldSheet = "ryzom.world";
+PrimitivesPath = "../../common/data_leveldesign/primitives";
+OutputDataPath = "../../client/data";
 LigoPrimitiveClass = "world_editor_classes.xml";

code/ryzom/tools/sheets_packer/sheets_packer.vcproj

@@ -52,7 +52,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\client\src;..\..\common\src"
-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;LIBXML_STATIC"
 				BasicRuntimeChecks="3"
 				SmallerTypeCheck="true"
 				RuntimeLibrary="3"
@@ -140,7 +140,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\client\src;..\..\common\src"
-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;LIBXML_STATIC"
 				BasicRuntimeChecks="3"
 				SmallerTypeCheck="true"
 				RuntimeLibrary="3"
@@ -148,6 +148,7 @@
 				PrecompiledHeaderThrough="stdpch.h"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				OmitDefaultLibName="true"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -167,7 +168,6 @@
 				AdditionalLibraryDirectories="../../nel/lib64"
 				IgnoreDefaultLibraryNames="msvcrt.lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -232,7 +232,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				AdditionalIncludeDirectories="..\..\client\src;..\..\common\src"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;LIBXML_STATIC"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
@@ -325,7 +325,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				AdditionalIncludeDirectories="..\..\client\src;..\..\common\src"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;LIBXML_STATIC"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"

code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp

@@ -147,12 +147,6 @@ const std::string ConfigFileName = "sheets_packer.cfg";
 //---------------------------------------------------
 CClientConfig::CClientConfig()
 {
-	SaveConfig			= false;
-	UpdatePackedSheet	= true;						// Update packed sheet if needed
-	SceneName			= "";
-	IdFilePath			= "";
-	LanguageCode		= "en";						// Default to english
-	FPExceptions		= false;				// Disable Floating Point Exceptions.
 }// CClientConfig //
 
 
@@ -178,13 +172,14 @@ void setValues()
 	}
 	catch(EUnknownVar &) {nlwarning("Default value used for 'DataPath' !!!");}
 
-	// UpdatePackedSheet
+	// World sheet name
-	READ_BOOL(UpdatePackedSheet)
+	READ_STRING(WorldSheet)
-
+	// Primitives path
-	// SceneName
+	READ_STRING(PrimitivesPath)
-	READ_STRING(SceneName)
+	// Output data path
-	// IdFile Path
+	READ_STRING(OutputDataPath)
-	READ_STRING(IdFilePath)
+	// Ligo primitive class
+	READ_STRING(LigoPrimitiveClass)
 
 	/////////////
 	// FILTERS //
@@ -216,13 +211,6 @@ void setValues()
 		}
 	}
 	catch(EUnknownVar &) {}
-	
-	READ_STRING(LigoPrimitiveClass)
-
-	// LanguageCode
-	READ_STRING(LanguageCode)
-
-	READ_BOOL(FPExceptions)
 }// load //
 
 
@@ -261,10 +249,4 @@ void CClientConfig::init(const std::string &configFileName)
 //-----------------------------------------------
 void CClientConfig::release ()
 {
-	// Do we have to save the cfg file ?
-	if (AppCfg.SaveConfig)
-	{
-		// Save it
-		AppCfg.ConfigFile.save ();
-	}
 }

code/ryzom/tools/sheets_packer/sheets_packer_cfg.h

@@ -41,24 +41,18 @@ struct CClientConfig
 
 	void init (const std::string &configFileName);
 
-	/// Save the cfg file when exit the client ?
-	bool			SaveConfig;
-
 	/// Data Path.
 	std::vector<std::string>			DataPath;
-	/// True if we want the packed sheet to be updated if needed
+
-	bool			UpdatePackedSheet;
+	/// World sheet name
-	/// Name of the scene to play.
+	std::string			WorldSheet;
-	std::string			SceneName;
+	/// Path where to find .primitive files
-	/// Path for the Id file.
+	std::string			PrimitivesPath;
-	std::string			IdFilePath;
+	/// Path where to create lmconts.packed
-	// Enable/disable Floating Point Exceptions
+	std::string			OutputDataPath;
-	bool			FPExceptions;
 
 
 	std::string		LigoPrimitiveClass;
-// TODO
-	std::string		LanguageCode;
 
 public:
 	/// Constructor.

code/ryzom/tools/sheets_packer/sheets_packer_init.cpp

@@ -98,7 +98,7 @@ bool init()
 	if (!LigoConfig.readPrimitiveClass (AppCfg.LigoPrimitiveClass.c_str(), false))
 		nlwarning ("Can't load primitive class file %s", AppCfg.LigoPrimitiveClass.c_str());
 	NLLIGO::CPrimitiveContext::instance().CurrentLigoConfig = &LigoConfig;
-	buildLMConts();
+	buildLMConts(AppCfg.WorldSheet, AppCfg.PrimitivesPath, AppCfg.OutputDataPath);
 
 	// The init is a success.
 	return true;