Rename scripts

code/nel/tools/build_gamedata/0_setup.py

@@ -175,6 +175,10 @@ if not args.noconf:
 		PatchmanCfgDefaultDirectory
 	except NameError:
 		PatchmanCfgDefaultDirectory = "S:/notes/patchman_cfg/default"
+	try:
+		PatchmanBridgeServerDirectory
+	except NameError:
+		PatchmanBridgeServerDirectory = "W:/bridge_server"
 	try:
 		MaxAvailable
 	except NameError:
@@ -204,41 +208,42 @@ 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)))
-	ToolDirectories[0] = askVar(log, "Primary Tool Directory", ToolDirectories[0]).replace("\\", "/")
-	ToolDirectories[1] = askVar(log, "Secondary Tool Directory", ToolDirectories[1]).replace("\\", "/")
+	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)
-	ScriptDirectory = askVar(log, "Script Directory", os.getcwd().replace("\\", "/")).replace("\\", "/")
-	WorkspaceDirectory = askVar(log, "Workspace Directory", WorkspaceDirectory).replace("\\", "/")
-	DatabaseDirectory = askVar(log, "Database Directory", DatabaseDirectory).replace("\\", "/")
-	ExportBuildDirectory = askVar(log, "Export Build Directory", ExportBuildDirectory).replace("\\", "/")
-	InstallDirectory = askVar(log, "Install Directory", InstallDirectory).replace("\\", "/")
-	ClientDevDirectory = askVar(log, "Client Dev Directory", ClientDevDirectory).replace("\\", "/")
-	ClientPatchDirectory = askVar(log, "Client Patch Directory", ClientPatchDirectory).replace("\\", "/")
-	ClientInstallDirectory = askVar(log, "Client Install Directory", ClientInstallDirectory).replace("\\", "/")
-	ShardInstallDirectory = askVar(log, "Shard Data Install Directory", ShardInstallDirectory).replace("\\", "/")
-	WorldEditInstallDirectory = askVar(log, "World Edit Data Install Directory", WorldEditInstallDirectory).replace("\\", "/")
-	LeveldesignDirectory = askVar(log, "Leveldesign Directory", LeveldesignDirectory).replace("\\", "/")
-	LeveldesignDfnDirectory = askVar(log, "Leveldesign DFN Directory", LeveldesignDfnDirectory).replace("\\", "/")
-	LeveldesignWorldDirectory = askVar(log, "Leveldesign World Directory", LeveldesignWorldDirectory).replace("\\", "/")
-	PrimitivesDirectory = askVar(log, "Primitives Directory", PrimitivesDirectory).replace("\\", "/")
-	GamedevDirectory = askVar(log, "Gamedev Directory", GamedevDirectory).replace("\\", "/")
-	DataShardDirectory = askVar(log, "Data Shard Directory", DataShardDirectory).replace("\\", "/")
-	DataCommonDirectory = askVar(log, "Data Common Directory", DataCommonDirectory).replace("\\", "/")
-	TranslationDirectory = askVar(log, "Translation Directory", TranslationDirectory).replace("\\", "/")
-	LeveldesignDataShardDirectory = askVar(log, "Leveldesign Data Shard Directory", LeveldesignDataShardDirectory).replace("\\", "/")
-	LeveldesignDataCommonDirectory = askVar(log, "Leveldesign Data Common Directory", LeveldesignDataCommonDirectory).replace("\\", "/")
-	WorldEditorFilesDirectory = askVar(log, "World Editor Files Directory", WorldEditorFilesDirectory).replace("\\", "/")
-	WindowsExeDllCfgDirectories[0] = askVar(log, "Primary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[0]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[1] = askVar(log, "Secondary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[1]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[2] = askVar(log, "Tertiary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[2]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[3] = askVar(log, "Quaternary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[3]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[4] = askVar(log, "Quinary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[4]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[5] = askVar(log, "Senary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[5]).replace("\\", "/")
-	WindowsExeDllCfgDirectories[6] = askVar(log, "Septenary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[6]).replace("\\", "/")
-	LinuxServiceExecutableDirectory = askVar(log, "Linux Service Executable Directory", LinuxServiceExecutableDirectory).replace("\\", "/")
-	LinuxClientExecutableDirectory = askVar(log, "Linux Client Executable Directory", LinuxClientExecutableDirectory).replace("\\", "/")
-	PatchmanCfgAdminDirectory = askVar(log, "Patchman Cfg Admin Directory", PatchmanCfgAdminDirectory).replace("\\", "/")
-	PatchmanCfgDefaultDirectory = askVar(log, "Patchman Cfg Default Directory", PatchmanCfgDefaultDirectory).replace("\\", "/")
+	ScriptDirectory = askVar(log, "[IN] Script Directory", os.getcwd().replace("\\", "/")).replace("\\", "/")
+	WorkspaceDirectory = askVar(log, "[IN] Workspace Directory", WorkspaceDirectory).replace("\\", "/")
+	DatabaseDirectory = askVar(log, "[IN] Database Directory", DatabaseDirectory).replace("\\", "/")
+	ExportBuildDirectory = askVar(log, "[OUT] Export Build Directory", ExportBuildDirectory).replace("\\", "/")
+	InstallDirectory = askVar(log, "[OUT] Install Directory", InstallDirectory).replace("\\", "/")
+	ClientDevDirectory = askVar(log, "[OUT] Client Dev Directory", ClientDevDirectory).replace("\\", "/")
+	ClientPatchDirectory = askVar(log, "[OUT] Client Patch Directory", ClientPatchDirectory).replace("\\", "/")
+	ClientInstallDirectory = askVar(log, "[OUT] Client Install Directory", ClientInstallDirectory).replace("\\", "/")
+	ShardInstallDirectory = askVar(log, "[OUT] Shard Data Install Directory", ShardInstallDirectory).replace("\\", "/")
+	WorldEditInstallDirectory = askVar(log, "[OUT] World Edit Data Install Directory", WorldEditInstallDirectory).replace("\\", "/")
+	LeveldesignDirectory = askVar(log, "[IN] Leveldesign Directory", LeveldesignDirectory).replace("\\", "/")
+	LeveldesignDfnDirectory = askVar(log, "[IN] Leveldesign DFN Directory", LeveldesignDfnDirectory).replace("\\", "/")
+	LeveldesignWorldDirectory = askVar(log, "[IN] Leveldesign World Directory", LeveldesignWorldDirectory).replace("\\", "/")
+	PrimitivesDirectory = askVar(log, "[IN] Primitives Directory", PrimitivesDirectory).replace("\\", "/")
+	GamedevDirectory = askVar(log, "[IN] Gamedev Directory", GamedevDirectory).replace("\\", "/")
+	DataShardDirectory = askVar(log, "[IN] Data Shard Directory", DataShardDirectory).replace("\\", "/")
+	DataCommonDirectory = askVar(log, "[IN] Data Common Directory", DataCommonDirectory).replace("\\", "/")
+	TranslationDirectory = askVar(log, "[IN] Translation Directory", TranslationDirectory).replace("\\", "/")
+	LeveldesignDataShardDirectory = askVar(log, "[IN] Leveldesign Data Shard Directory", LeveldesignDataShardDirectory).replace("\\", "/")
+	LeveldesignDataCommonDirectory = askVar(log, "[IN] Leveldesign Data Common Directory", LeveldesignDataCommonDirectory).replace("\\", "/")
+	WorldEditorFilesDirectory = askVar(log, "[IN] World Editor Files Directory", WorldEditorFilesDirectory).replace("\\", "/")
+	WindowsExeDllCfgDirectories[0] = askVar(log, "[IN] Primary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[0]).replace("\\", "/")
+	WindowsExeDllCfgDirectories[1] = askVar(log, "[IN] Secondary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[1]).replace("\\", "/")
+	WindowsExeDllCfgDirectories[2] = askVar(log, "[IN] Tertiary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[2]).replace("\\", "/")
+	WindowsExeDllCfgDirectories[3] = askVar(log, "[IN] Quaternary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[3]).replace("\\", "/")
+	WindowsExeDllCfgDirectories[4] = askVar(log, "[IN] Quinary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[4]).replace("\\", "/")
+	WindowsExeDllCfgDirectories[5] = askVar(log, "[IN] Senary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[5]).replace("\\", "/")
+	WindowsExeDllCfgDirectories[6] = askVar(log, "[IN] Septenary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[6]).replace("\\", "/")
+	LinuxServiceExecutableDirectory = askVar(log, "[IN] Linux Service Executable Directory", LinuxServiceExecutableDirectory).replace("\\", "/")
+	LinuxClientExecutableDirectory = askVar(log, "[IN] Linux Client Executable Directory", LinuxClientExecutableDirectory).replace("\\", "/")
+	PatchmanCfgAdminDirectory = askVar(log, "[IN] Patchman Cfg Admin Directory", PatchmanCfgAdminDirectory).replace("\\", "/")
+	PatchmanCfgDefaultDirectory = askVar(log, "[IN] Patchman Cfg Default Directory", PatchmanCfgDefaultDirectory).replace("\\", "/")
+	PatchmanBridgeServerDirectory = askVar(log, "[OUT] Patchman Bridge Server Patch Directory", PatchmanBridgeServerDirectory).replace("\\", "/")
 	MaxAvailable = int(askVar(log, "3dsMax Available", str(MaxAvailable)))
 	if MaxAvailable:
 		MaxDirectory = askVar(log, "3dsMax Directory", MaxDirectory).replace("\\", "/")
@@ -323,6 +328,7 @@ if not args.noconf:
 	sf.write("LinuxClientExecutableDirectory = \"" + str(LinuxClientExecutableDirectory) + "\"\n")
 	sf.write("PatchmanCfgAdminDirectory = \"" + str(PatchmanCfgAdminDirectory) + "\"\n")
 	sf.write("PatchmanCfgDefaultDirectory = \"" + str(PatchmanCfgDefaultDirectory) + "\"\n")
+	sf.write("PatchmanBridgeServerDirectory = \"" + str(PatchmanBridgeServerDirectory) + "\"\n")
 	sf.write("\n")
 	sf.write("# 3dsMax directives\n")
 	sf.write("MaxAvailable = " + str(MaxAvailable) + "\n")

code/nel/tools/build_gamedata/all_dev.bat

@@ -4,8 +4,10 @@ title Ryzom Core: 2_build.py
 2_build.py
 title Ryzom Core: 3_install.py
 3_install.py
-title Ryzom Core: 5_client_dev.py
-5_client_dev.py
-title Ryzom Core: 8_shard_data.py
-8_shard_data.py
+title Ryzom Core: a1_worldedit_data.py
+a1_worldedit_data.py
+title Ryzom Core: b1_client_dev.py
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py
+b2_shard_data.py
 title Ryzom Core: Ready

code/nel/tools/build_gamedata/b1_client_dev.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # 
-# \file 5_client_dev.py
+# \file b1_client_dev.py
 # \brief Install to client dev
 # \date 2009-02-18 16:19GMT
 # \author Jan Boon (Kaetemi)

code/nel/tools/build_gamedata/b2_shard_data.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # 
-# \file 8_shard_data.py
+# \file b2_shard_data.py
 # \brief Install shard data
 # \date 2009-02-18 16:19GMT
 # \author Jan Boon (Kaetemi)

code/nel/tools/build_gamedata/d1_client_patch.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # 
-# \file 6_client_patch.py
+# \file d1_client_patch.py
 # \brief Install to client patch
 # \date 2009-02-18 16:19GMT
 # \author Jan Boon (Kaetemi)

code/nel/tools/build_gamedata/d2_client_install.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # 
-# \file 7_client_install.py
+# \file d2_client_install.py
 # \brief Install to client install
 # \date 2009-02-18 16:19GMT
 # \author Jan Boon (Kaetemi)

code/nel/tools/build_gamedata/executables_dev.bat

@@ -1,7 +1,7 @@
 title Ryzom Core: 3_install.py (EXECUTABLES)
 3_install.py -ipj common/gamedev common/exedll common/cfg
-title Ryzom Core: 5_client_dev.py (EXECUTABLES)
-5_client_dev.py
-title Ryzom Core: 8_shard_data.py (EXECUTABLES)
-8_shard_data.py
+title Ryzom Core: b1_client_dev.py
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py
+b2_shard_data.py
 title Ryzom Core: Ready

code/nel/tools/build_gamedata/install_client_dev.py

@@ -1,31 +0,0 @@
-#!/usr/bin/python
-# 
-# \file export_build_install.py
-# \brief Run all processes
-# \date 2009-02-18 15:28GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all processes
-# 
-# NeL - MMORPG Framework <http:#dev.ryzom.com/projects/nel/>
-# Copyright (C) 2010  Winch Gate Property Limited
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
-# 
-
-import shutil, subprocess
-
-subprocess.call([ "python", "3_install.py" ])
-subprocess.call([ "python", "5_client_dev.py" ])
-

code/nel/tools/build_gamedata/install_data_shard.py

@@ -1,31 +0,0 @@
-#!/usr/bin/python
-# 
-# \file export_build_install.py
-# \brief Run all processes
-# \date 2009-02-18 15:28GMT
-# \author Jan Boon (Kaetemi)
-# Python port of game data build pipeline.
-# Run all processes
-# 
-# NeL - MMORPG Framework <http:#dev.ryzom.com/projects/nel/>
-# Copyright (C) 2010  Winch Gate Property Limited
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http:#www.gnu.org/licenses/>.
-# 
-
-import shutil, subprocess
-
-subprocess.call([ "python", "3_install.py" ])
-subprocess.call([ "python", "8_shard_data.py" ])
-

code/nel/tools/build_gamedata/interface_dev.bat

@@ -4,6 +4,6 @@ title Ryzom Core: 2_build.py (INTERFACE)
 2_build.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
 title Ryzom Core: 3_install.py (INTERFACE)
 3_install.py -ipj common/gamedev common/data_common common/exedll common/cfg common/interface common/sfx common/fonts common/outgame
-title Ryzom Core: 5_client_dev.py (INTERFACE)
-5_client_dev.py
+title Ryzom Core: b1_client_dev.py
+b1_client_dev.py
 title Ryzom Core: Ready

code/nel/tools/build_gamedata/leveldesign_dev.bat

@@ -4,8 +4,8 @@ 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
 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
-title Ryzom Core: 5_client_dev.py (LEVELDESIGN)
-5_client_dev.py
-title Ryzom Core: 8_shard_data.py (LEVELDESIGN)
-8_shard_data.py
+title Ryzom Core: b1_client_dev.py (LEVELDESIGN)
+b1_client_dev.py
+title Ryzom Core: b2_shard_data.py (LEVELDESIGN)
+b2_shard_data.py
 title Ryzom Core: Ready