From 258138e1d6bc0a9528a2957340a5c798953be4ac Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 7 Feb 2014 18:10:09 +0100 Subject: [PATCH] Reorder pipeline scripts --- code/nel/tools/build_gamedata/4_worldedit_data.py | 0 .../{4_shard_install.py => 8_shard_data.py} | 12 ++++++------ .../build_gamedata/{8_upload.py => 9_upload.py} | 8 ++++---- code/nel/tools/build_gamedata/all.bat | 6 ++++-- code/nel/tools/build_gamedata/install_data_shard.py | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 code/nel/tools/build_gamedata/4_worldedit_data.py rename code/nel/tools/build_gamedata/{4_shard_install.py => 8_shard_data.py} (91%) rename code/nel/tools/build_gamedata/{8_upload.py => 9_upload.py} (97%) diff --git a/code/nel/tools/build_gamedata/4_worldedit_data.py b/code/nel/tools/build_gamedata/4_worldedit_data.py new file mode 100644 index 000000000..e69de29bb diff --git a/code/nel/tools/build_gamedata/4_shard_install.py b/code/nel/tools/build_gamedata/8_shard_data.py similarity index 91% rename from code/nel/tools/build_gamedata/4_shard_install.py rename to code/nel/tools/build_gamedata/8_shard_data.py index 0e4a53d23..8ab628875 100644 --- a/code/nel/tools/build_gamedata/4_shard_install.py +++ b/code/nel/tools/build_gamedata/8_shard_data.py @@ -1,11 +1,11 @@ #!/usr/bin/python # -# \file 4_shard_install.py +# \file 8_shard_data.py # \brief Install shard data # \date 2009-02-18 16:19GMT # \author Jan Boon (Kaetemi) # Python port of game data build pipeline. -# Install to data shard +# Install shard data # # NeL - MMORPG Framework # Copyright (C) 2010 Winch Gate Property Limited @@ -40,7 +40,7 @@ from projects import * # Log error printLog(log, "") printLog(log, "-------") -printLog(log, "--- Install to shard") +printLog(log, "--- Install shard data") printLog(log, "-------") printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time()))) printLog(log, "") @@ -58,7 +58,7 @@ for dir in InstallShardDataCollisionsDirectories: printLog(log, "") log.close() -if os.path.isfile("4_shard_install.log"): - os.remove("4_shard_install.log") +if os.path.isfile("8_shard_data.log"): + os.remove("8_shard_data.log") shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_shard_install.log") -shutil.move("log.log", "4_shard_install.log") +shutil.move("log.log", "8_shard_data.log") diff --git a/code/nel/tools/build_gamedata/8_upload.py b/code/nel/tools/build_gamedata/9_upload.py similarity index 97% rename from code/nel/tools/build_gamedata/8_upload.py rename to code/nel/tools/build_gamedata/9_upload.py index 90570e89c..31f6852b5 100644 --- a/code/nel/tools/build_gamedata/8_upload.py +++ b/code/nel/tools/build_gamedata/9_upload.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# \file 8_upload.py +# \file 9_upload.py # \brief Upload data to servers # \date 2009-02-18 16:19GMT # \author Jan Boon (Kaetemi) @@ -175,7 +175,7 @@ for target in UploadPrimitives: uploadSftp(target[0], target[1], target[2], target[3], PrimitivesDirectory, [ ]) log.close() -if os.path.isfile("8_upload.log"): - os.remove("8_upload.log") +if os.path.isfile("9_upload.log"): + os.remove("9_upload.log") shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_upload.log") -shutil.move("log.log", "8_upload.log") +shutil.move("log.log", "9_upload.log") diff --git a/code/nel/tools/build_gamedata/all.bat b/code/nel/tools/build_gamedata/all.bat index d41b60052..3c236aabe 100644 --- a/code/nel/tools/build_gamedata/all.bat +++ b/code/nel/tools/build_gamedata/all.bat @@ -4,14 +4,16 @@ TITLE 2_build.py 2_build.py TITLE 3_install.py 3_install.py -TITLE 4_data_shard.py -4_data_shard.py +TITLE 4_worldedit_data.py +4_worldedit_data.py TITLE 5_client_dev.py 5_client_dev.py TITLE 6_client_patch.py 6_client_patch.py -bo TITLE 7_client_install.py 7_client_install.py +TITLE 8_shard_data.py +8_shard_data.py PAUSE diff --git a/code/nel/tools/build_gamedata/install_data_shard.py b/code/nel/tools/build_gamedata/install_data_shard.py index 6a9d9a120..620d90faa 100644 --- a/code/nel/tools/build_gamedata/install_data_shard.py +++ b/code/nel/tools/build_gamedata/install_data_shard.py @@ -27,5 +27,5 @@ import shutil, subprocess subprocess.call([ "python", "3_install.py" ]) -subprocess.call([ "python", "4_data_shard.py" ]) +subprocess.call([ "python", "8_shard_data.py" ])