From 5da1678357d20bc7765b8f50f0da80671294b5a1 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 9 Jun 2021 21:01:48 +0800 Subject: [PATCH] Generate secondary buildsite config with real local path --- nel/tools/build_gamedata/0_setup.py | 175 ++++++++++++++++++---------- 1 file changed, 115 insertions(+), 60 deletions(-) diff --git a/nel/tools/build_gamedata/0_setup.py b/nel/tools/build_gamedata/0_setup.py index cd1a4dace..f4541e99d 100755 --- a/nel/tools/build_gamedata/0_setup.py +++ b/nel/tools/build_gamedata/0_setup.py @@ -65,8 +65,23 @@ if not args.noconf: except NameError: BuildQuality = 1 try: - if not args.preset: - ToolDirectories + if args.preset: + DummyUnknownName + RemapLocalFrom + except NameError: + RemapLocalFrom = 'R:' + try: + if args.preset: + DummyUnknownName + RemapLocalTo + except NameError: + RemapLocalTo = os.getenv('RC_ROOT').replace('\\', '/') + if (not RemapLocalTo) or (not ':' in RemapLocalTo): + RemapLocalTo = 'R:' + try: + if args.preset: + DummyUnknownName + ToolDirectories except NameError: ToolDirectories = [ 'R:/distribution/nel_tools_win_x64-distribution', 'R:/distribution/ryzom_tools_win_x64-distribution' ] try: @@ -74,149 +89,178 @@ if not args.noconf: except NameError: ToolSuffix = ".exe" try: - if not args.preset: - ScriptDirectory + if args.preset: + DummyUnknownName + ScriptDirectory except NameError: ScriptDirectory = "R:/code/nel/tools/build_gamedata" try: - if not args.preset: - WorkspaceDirectory + if args.preset: + DummyUnknownName + WorkspaceDirectory except NameError: WorkspaceDirectory = "R:/leveldesign/workspace" try: - if not args.preset: - DatabaseDirectory + if args.preset: + DummyUnknownName + DatabaseDirectory except NameError: DatabaseDirectory = "R:/graphics" try: - if not args.preset: - SoundDirectory + if args.preset: + DummyUnknownName + SoundDirectory except NameError: SoundDirectory = "R:/sound" try: - if not args.preset: - SoundDfnDirectory + if args.preset: + DummyUnknownName + SoundDfnDirectory except NameError: SoundDfnDirectory = "R:/sound/DFN" try: - if not args.preset: - ExportBuildDirectory + if args.preset: + DummyUnknownName + ExportBuildDirectory except NameError: ExportBuildDirectory = "R:/pipeline/export" try: - if not args.preset: - InstallDirectory + if args.preset: + DummyUnknownName + InstallDirectory except NameError: InstallDirectory = "R:/pipeline/install" try: - if not args.preset: - ClientDevDirectory + if args.preset: + DummyUnknownName + ClientDevDirectory except NameError: ClientDevDirectory = "R:/pipeline/client_dev" try: - if not args.preset: - ClientPatchDirectory + if args.preset: + DummyUnknownName + ClientPatchDirectory except NameError: ClientPatchDirectory = "R:/pipeline/client_patch" try: - if not args.preset: - ClientInstallDirectory + if args.preset: + DummyUnknownName + ClientInstallDirectory except NameError: ClientInstallDirectory = "R:/pipeline/client_install" try: - if not args.preset: - ShardInstallDirectory + if args.preset: + DummyUnknownName + ShardInstallDirectory except NameError: ShardInstallDirectory = "R:/pipeline/shard" try: - if not args.preset: - WorldEditInstallDirectory + if args.preset: + DummyUnknownName + WorldEditInstallDirectory except NameError: WorldEditInstallDirectory = "R:/pipeline/worldedit" try: - if not args.preset: - WorldEditorFilesDirectory + if args.preset: + DummyUnknownName + WorldEditorFilesDirectory except NameError: WorldEditorFilesDirectory = "R:/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files" try: - if not args.preset: - LeveldesignDirectory + if args.preset: + DummyUnknownName + LeveldesignDirectory except NameError: LeveldesignDirectory = "R:/leveldesign" try: - if not args.preset: - LeveldesignDfnDirectory + if args.preset: + DummyUnknownName + LeveldesignDfnDirectory except NameError: LeveldesignDfnDirectory = "R:/leveldesign/DFN" try: - if not args.preset: - LeveldesignWorldDirectory + if args.preset: + DummyUnknownName + LeveldesignWorldDirectory except NameError: LeveldesignWorldDirectory = "R:/leveldesign/world" try: - if not args.preset: - PrimitivesDirectory + if args.preset: + DummyUnknownName + PrimitivesDirectory except NameError: PrimitivesDirectory = "R:/leveldesign/primitives" try: - if not args.preset: - LeveldesignDataCommonDirectory + if args.preset: + DummyUnknownName + LeveldesignDataCommonDirectory except NameError: LeveldesignDataCommonDirectory = "R:/leveldesign/common" try: - if not args.preset: - LeveldesignDataShardDirectory + if args.preset: + DummyUnknownName + LeveldesignDataShardDirectory except NameError: LeveldesignDataShardDirectory = "R:/leveldesign/shard" try: - if not args.preset: - TranslationDirectory + if args.preset: + DummyUnknownName + TranslationDirectory except NameError: TranslationDirectory = "R:/leveldesign/translation" try: - if not args.preset: - GamedevDirectory + if args.preset: + DummyUnknownName + GamedevDirectory except NameError: GamedevDirectory = "R:/code/ryzom/client/data/gamedev" try: - if not args.preset: - DataCommonDirectory + if args.preset: + DummyUnknownName + DataCommonDirectory except NameError: DataCommonDirectory = "R:/code/ryzom/common/data_common" try: - if not args.preset: - DataShardDirectory + if args.preset: + DummyUnknownName + DataShardDirectory except NameError: DataShardDirectory = "R:/code/ryzom/server/data_shard" try: - if not args.preset: - WindowsExeDllCfgDirectories + if args.preset: + DummyUnknownName + WindowsExeDllCfgDirectories except NameError: # 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 + if args.preset: + DummyUnknownName + LinuxServiceExecutableDirectory except NameError: LinuxServiceExecutableDirectory = "R:/build/gcc_server/bin" try: - if not args.preset: - LinuxClientExecutableDirectory + if args.preset: + DummyUnknownName + LinuxClientExecutableDirectory except NameError: LinuxClientExecutableDirectory = "R:/build/gcc_client/bin" try: - if not args.preset: - PatchmanCfgAdminDirectory + if args.preset: + DummyUnknownName + PatchmanCfgAdminDirectory except NameError: PatchmanCfgAdminDirectory = "R:/patchman/admin_install" try: - if not args.preset: - PatchmanCfgDefaultDirectory + if args.preset: + DummyUnknownName + PatchmanCfgDefaultDirectory except NameError: PatchmanCfgDefaultDirectory = "R:/patchman/default" try: - if not args.preset: - PatchmanBridgeServerDirectory + if args.preset: + DummyUnknownName + PatchmanBridgeServerDirectory except NameError: PatchmanBridgeServerDirectory = "R:/pipeline/bridge_server" try: @@ -350,6 +394,9 @@ if not args.noconf: sf.write("# Quality option for this site (1 for BEST, 0 for DRAFT)\n") sf.write("BuildQuality = " + str(BuildQuality) + "\n") sf.write("\n") + sf.write("RemapLocalFrom = \"" + str(RemapLocalFrom) + "\"\n") + sf.write("RemapLocalTo = \"" + str(RemapLocalTo) + "\"\n") + sf.write("\n") sf.write("ToolDirectories = " + str(ToolDirectories) + "\n") sf.write("ToolSuffix = \"" + str(ToolSuffix) + "\"\n") sf.write("\n") @@ -407,6 +454,14 @@ if not args.noconf: sf.write("\n") sf.write("\n") sf.write("# end of file\n") + sf.flush() + sf.close() + sf = open("configuration/buildsite_local.py", "w") + sfr = open("configuration/buildsite.py", "r") + for l in sfr: + sf.write(l.replace(RemapLocalFrom + '/', RemapLocalTo + '/')) + sf.flush() + sfr.close() sf.close() sys.path.append(WorkspaceDirectory)