Merge branch 'develop' into ryzomclassic-develop

nel/tools/build_gamedata/0_setup.py

@@ -30,6 +30,7 @@ sys.path.append("configuration")
 parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Setup')
 parser.add_argument('--noconf', '-nc', action='store_true')
 parser.add_argument('--noverify', '-nv', action='store_true')
+parser.add_argument('--preset', '-p', action='store_true')
 # parser.add_argument('--haltonerror', '-eh', action='store_true')
 parser.add_argument('--includeproject', '-ipj', nargs='+')
 parser.add_argument('--excludeproject', '-epj', nargs='+')
@@ -64,126 +65,157 @@ if not args.noconf:
 	except NameError:
 		BuildQuality = 1
 	try:
+		if not args.preset:
 			ToolDirectories
 	except NameError:
-		ToolDirectories = [ 'R:/build/dev/bin/Release', 'R:/external/bin' ]
+		ToolDirectories = [ 'R:/distribution/nel_tools_win_x64-distribution', 'R:/distribution/ryzom_tools_win_x64-distribution' ]
 	try:
 		ToolSuffix
 	except NameError:
 		ToolSuffix = ".exe"
 	try:
+		if not args.preset:
 			ScriptDirectory
 	except NameError:
 		ScriptDirectory = "R:/code/nel/tools/build_gamedata"
 	try:
+		if not args.preset:
 			WorkspaceDirectory
 	except NameError:
 		WorkspaceDirectory = "R:/leveldesign/workspace"
 	try:
+		if not args.preset:
 			DatabaseDirectory
 	except NameError:
 		DatabaseDirectory = "R:/graphics"
 	try:
+		if not args.preset:
 			SoundDirectory
 	except NameError:
 		SoundDirectory = "R:/sound"
 	try:
+		if not args.preset:
 			SoundDfnDirectory
 	except NameError:
 		SoundDfnDirectory = "R:/sound/DFN"
 	try:
+		if not args.preset:
 			ExportBuildDirectory
 	except NameError:
 		ExportBuildDirectory = "R:/pipeline/export"
 	try:
+		if not args.preset:
 			InstallDirectory
 	except NameError:
 		InstallDirectory = "R:/pipeline/install"
 	try:
+		if not args.preset:
 			ClientDevDirectory
 	except NameError:
 		ClientDevDirectory = "R:/pipeline/client_dev"
 	try:
+		if not args.preset:
 			ClientPatchDirectory
 	except NameError:
 		ClientPatchDirectory = "R:/pipeline/client_patch"
 	try:
+		if not args.preset:
 			ClientInstallDirectory
 	except NameError:
 		ClientInstallDirectory = "R:/pipeline/client_install"
 	try:
+		if not args.preset:
 			ShardInstallDirectory
 	except NameError:
 		ShardInstallDirectory = "R:/pipeline/shard"
 	try:
+		if not args.preset:
 			WorldEditInstallDirectory
 	except NameError:
 		WorldEditInstallDirectory = "R:/pipeline/worldedit"
 	try:
+		if not args.preset:
+			WorldEditorFilesDirectory
+	except NameError:
+		WorldEditorFilesDirectory = "R:/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files"
+	try:
+		if not args.preset:
 			LeveldesignDirectory
 	except NameError:
 		LeveldesignDirectory = "R:/leveldesign"
 	try:
+		if not args.preset:
 			LeveldesignDfnDirectory
 	except NameError:
 		LeveldesignDfnDirectory = "R:/leveldesign/DFN"
 	try:
+		if not args.preset:
 			LeveldesignWorldDirectory
 	except NameError:
 		LeveldesignWorldDirectory = "R:/leveldesign/world"
 	try:
+		if not args.preset:
 			PrimitivesDirectory
 	except NameError:
 		PrimitivesDirectory = "R:/leveldesign/primitives"
 	try:
-		GamedevDirectory
-	except NameError:
-		GamedevDirectory = "R:/code/ryzom/client/data/gamedev"
-	try:
-		DataShardDirectory
-	except NameError:
-		DataShardDirectory = "R:/code/ryzom/server/data_shard"
-	try:
-		DataCommonDirectory
+		if not args.preset:
+			LeveldesignDataCommonDirectory
 	except NameError:
-		DataCommonDirectory = "R:/code/ryzom/common/data_common"
+		LeveldesignDataCommonDirectory = "R:/leveldesign/common"
 	try:
+		if not args.preset:
 			LeveldesignDataShardDirectory
 	except NameError:
 		LeveldesignDataShardDirectory = "R:/leveldesign/shard"
 	try:
-		LeveldesignDataCommonDirectory
-	except NameError:
-		LeveldesignDataCommonDirectory = "R:/leveldesign/common"
-	try:
+		if not args.preset:
 			TranslationDirectory
 	except NameError:
 		TranslationDirectory = "R:/leveldesign/translation"
 	try:
-		WorldEditorFilesDirectory
+		if not args.preset:
+			GamedevDirectory
 	except NameError:
-		WorldEditorFilesDirectory = "R:/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files"
+		GamedevDirectory = "R:/code/ryzom/client/data/gamedev"
+	try:
+		if not args.preset:
+			DataCommonDirectory
+	except NameError:
+		DataCommonDirectory = "R:/code/ryzom/common/data_common"
+	try:
+		if not args.preset:
+			DataShardDirectory
+	except NameError:
+		DataShardDirectory = "R:/code/ryzom/server/data_shard"
 	try:
+		if not args.preset:
 			WindowsExeDllCfgDirectories
 	except NameError:
-		WindowsExeDllCfgDirectories = [ 'C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86', 'R:/external/bin', 'R:/build/dev/bin/Release', 'R:/code/ryzom/client', 'R:/code/nel/lib', 'R:/code/ryzom/bin', 'R:/code/ryzom/tools/client/client_config/bin' ]
+		# TODO: Separate 64bit and 32bit
+		WindowsExeDllCfgDirectories = [ '', 'R:/build/fv_x64/bin/Release', 'R:/distribution/external_x64', 'R:/code/ryzom/client', '', '', '' ]
 	try:
+		if not args.preset:
 			LinuxServiceExecutableDirectory
 	except NameError:
 		LinuxServiceExecutableDirectory = "R:/build/gcc_server/bin"
 	try:
+		if not args.preset:
 			LinuxClientExecutableDirectory
 	except NameError:
 		LinuxClientExecutableDirectory = "R:/build/gcc_client/bin"
 	try:
+		if not args.preset:
 			PatchmanCfgAdminDirectory
 	except NameError:
 		PatchmanCfgAdminDirectory = "R:/patchman/admin_install"
 	try:
+		if not args.preset:
 			PatchmanCfgDefaultDirectory
 	except NameError:
 		PatchmanCfgDefaultDirectory = "R:/patchman/default"
 	try:
+		if not args.preset:
 			PatchmanBridgeServerDirectory
 	except NameError:
 		PatchmanBridgeServerDirectory = "R:/pipeline/bridge_server"
@@ -232,6 +264,7 @@ if not args.noconf:
 	printLog(log, "Use -- if you need to insert an empty value.")
 	printLog(log, "")
 	BuildQuality = int(askVar(log, "Build Quality", str(BuildQuality)))
+	if not args.preset:
 		ToolDirectories[0] = askVar(log, "[IN] Primary Tool Directory", ToolDirectories[0]).replace("\\", "/")
 		ToolDirectories[1] = askVar(log, "[IN] Secondary Tool Directory", ToolDirectories[1]).replace("\\", "/")
 		ToolSuffix = askVar(log, "Tool Suffix", ToolSuffix)

nel/tools/build_gamedata/b1_client_dev.py

@@ -50,8 +50,9 @@ if not os.path.isfile(ClientDevDirectory + "/client.cfg"):
 	cfg = open(ClientDevDirectory + "/client.cfg", "w")
 	cfg.write("RootConfigFilename   = \"client_default.cfg\";\n")
 	cfg.write("PreDataPath          = {\n")
-	cfg.write("\t\"" + InstallDirectory + "\", \"user\", \"patch\", \"data\", \"examples\" \n")
+	cfg.write("\t\"user\", \"patch\", \"" + DataCommonDirectory + "\", \"" + GamedevDirectory + "\", \"" + LeveldesignDirectory + "/translation/translated\", \"" + InstallDirectory + "\", \"data\", \"examples\" \n")
 	cfg.write("};\n")
+	cfg.write("PreLoadPath          = \"" + InstallDirectory + "\";\n")
 	cfg.write("PatchWanted          = 0;\n")
 	cfg.write("DisplayLuaDebugInfo  = 1;\n")
 	cfg.write("AllowDebugLua        = 1;\n")

ryzom/client/src/client_cfg.cpp

@@ -1318,6 +1318,9 @@ void CClientConfig::setValues()
 	// Data Path no recurse.
 	READ_STRINGVECTOR_FV(DataPathNoRecurse);
 
+	// Pre-load path
+	READ_STRING_DEV(PreLoadPath);
+
 	// Streamed package path
 	READ_STRING_FV(StreamedPackagePath);
 

ryzom/client/src/client_cfg.h

@@ -393,6 +393,8 @@ struct CClientConfig
 	std::vector<string>			DataPath;
 	/// Data Path no recurse.
 	std::vector<string>			DataPathNoRecurse;
+	/// Pre-load path
+	std::string					PreLoadPath;
 	/// Streamed package path
 	std::string					StreamedPackagePath;
 	/// Streamed package hosts

ryzom/client/src/init_main_loop.cpp

@@ -1085,14 +1085,18 @@ void initMainLoop()
 				ProgressBar.pushCropedValues (0, 0.25f);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName, "data/3d/common/characters/shapes", "*.shape", false, &ProgressBar);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/characters/shapes" : ClientCfg.PreLoadPath + "/characters_shapes",
+						"*.shape", false, &ProgressBar);
 				}
 				ProgressBar.popCropedValues ();
 				ProgressBar.progress (0.25f);
 				ProgressBar.pushCropedValues (0.25f,0.5f);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName, "data/3d/common/characters/skeletons", "*.skel", false, &ProgressBar);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/characters/skeletons" : ClientCfg.PreLoadPath + "/characters_skeletons",
+						"*.skel", false, &ProgressBar);
 				}
 				ProgressBar.popCropedValues ();
 			}
@@ -1140,14 +1144,18 @@ void initMainLoop()
 				ProgressBar.pushCropedValues (0.5f, 0.75f);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName, "data/3d/common/fauna/shapes", "*.shape", false, &ProgressBar);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/fauna/shapes" : ClientCfg.PreLoadPath + "/fauna_shapes",
+						"*.shape", false, &ProgressBar);
 				}
 				ProgressBar.popCropedValues ();
 				ProgressBar.progress (0.75f);
 				ProgressBar.pushCropedValues (0.75f,1);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName, "data/3d/common/fauna/skeletons", "*.skel", false, &ProgressBar);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheName,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/fauna/skeletons" : ClientCfg.PreLoadPath + "/fauna_skeletons",
+						"*.skel", false, &ProgressBar);
 				}
 				ProgressBar.popCropedValues ();
 			}
@@ -1188,14 +1196,18 @@ void initMainLoop()
 				ProgressBar.pushCropedValues (0.0f, 0.5f);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameFX, "data/3d/common/sfx", "*.ps", true, &ProgressBar, preloadFXTextures);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameFX,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/sfx" : ClientCfg.PreLoadPath + "/sfx",
+						"*.ps", true, &ProgressBar, preloadFXTextures);
 				}
 				ProgressBar.popCropedValues ();
 				ProgressBar.progress (0.5f);
 				ProgressBar.pushCropedValues (0.5f,1);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameFX, "data/3d/common/sfx", "*.shape", true, &ProgressBar, preloadFXTextures);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameFX,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/sfx" : ClientCfg.PreLoadPath + "/sfx",
+						"*.shape", true, &ProgressBar, preloadFXTextures);
 				}
 				ProgressBar.popCropedValues ();
 			}
@@ -1228,7 +1240,9 @@ void initMainLoop()
 				ProgressBar.pushCropedValues (0.0f, 1.f);
 				if(!DBG_DisablePreloadShape)
 				{
-					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameObjects, "data/3d/common/objects", "*.shape", true, &ProgressBar, preloadObjectTextures);
+					Driver->getShapeBank()->preLoadShapesFromDirectory(PreLoadCacheNameObjects,
+						ClientCfg.PreLoadPath.empty() ? "data/3d/common/objects" : ClientCfg.PreLoadPath + "/objects",
+						"*.shape", true, &ProgressBar, preloadObjectTextures);
 				}
 				ProgressBar.popCropedValues ();
 			}

web/public_php/setup/header.php

@@ -33,7 +33,7 @@ function printalert($type, $message) {
 	print '</div>';
 }
 function is__writable($path) {
-	if ($path{strlen($path) - 1} == '/') {
+	if ($path[strlen($path) - 1] == '/' || $path[strlen($path) - 1] == '\\') {
 		return is__writable($path.uniqid(mt_rand()).'.tmp');
 	}