File logging and lighting build

Author: JRProd

Build.py

@@ -1,4 +1,5 @@
 import argparse
+import sys
 
 from Scripts.UpdateVersionNumber import update_version_number
 from Scripts.UpdateFromP4 import update_from_P4
@@ -32,6 +33,7 @@ def script_error( log_file, error_message ):
 
     build_dir = env.get_env_variable('Game', 'builds_dir')
     log_file = open( build_dir + args.output, 'w')
+    sys.stderr = log_file
 
     log_file.write( '++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n' )
     log_file.write( 'Initiating Build Sequence\n' )
@@ -53,34 +55,21 @@ def script_error( log_file, error_message ):
 
     if success and not args.no_lighting and (args.all or args.lighting):
         success = build_lighting( log_file )
+    if not success:
+        script_error(log_file, 'Failed to build the lighting')
 
+    if success and (args.all or args.build):
+        success = build_game( log_file )
+    if not success:
+        script_error( log_file, 'Failed to build and package the game')
 
-    # success = update_from_P4()
-    # if success:
-    #     success = update_version_number( major, minor, hotfix)
-    #     pass
-    # else:
-    #     print('[FAILED] Failed to update from perforce')
-
-    # if success:
-    #     success = build_lighting()
-    #     pass
-    # else:
-    #     print('[FAILED]: Failed to update version number')
-
-    # if success:
-    #     success = build_game()
-    #     pass
-    # else:
-    #     print('[FAILED]: Failed to build lighting')
-
-    # if success:
-    #     success = upload_to_steam()
-    #     pass
-    # else:
-    #     print('[FAILEd]: Failed to build and package the game')
+    if success and (args.all or args.steam):
+        success = upload_to_steam( log_file )
+    if not success:
+        script_error( log_file, 'Failed to upload to steam')
 
-    # if not success:
-    #     print('[FAILED]: Failed to upload to steam')
+    log_file.write('Sequence finished without error.\n')
+    log_file.write('++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++')
+    log_file.close()
 
-    log_file.close()
+    quit(0)

Scripts/BuildGame.py

@@ -7,19 +7,21 @@
 game_name = env.get_env_variable('Game', 'game_name')
 builds_dir = env.get_env_variable( "Game", "builds_dir" )
 
-def build_game():
+def build_game( log_file ):
 
-    print( '----------------------------------------------------------------------------------------------------' )
-    print( '{} - Step 4: Starting BuildCookRun'.format( game_name ) )
-    print( '----------------------------------------------------------------------------------------------------' )
+    log_file.write( '----------------------------------------------------------------------------------------------------\n' )
+    log_file.write( '{} - Step 4: Starting BuildCookRun\n'.format( game_name ) )
+    log_file.write( '----------------------------------------------------------------------------------------------------\n' )
+    log_file.flush()
 
     uproject_file = env.get_env_variable( "Game", "uproject_file" )
 
     ue4_batchfiles_dir = env.get_env_variable( 'Local', "ue4_batchfiles_dir" )
     ue4_binaries_dir = env.get_env_variable( 'Local', "ue4_binaries_dir" )
 
-    print(subprocess.run( [ ue4_batchfiles_dir + 'RunUAT.bat', "BuildCookRun", "-project=" + uproject_file, "-noP4", "-nocompile", "-nocompileeditor", "-installed", "-cook", "-stage", "-archive", "-archivedirectory=" + builds_dir, "-package", "-clientconfig=Development", "-ue4exe=" + ue4_binaries_dir + "UE4Editor-Cmd.exe", "-pak", "-prereqs", "-nodebuginfo", "-targetplatform=Win64", "-build", "-CrashReporter", "-utf8output" ] ))
+    subprocess.run( [ ue4_batchfiles_dir + 'RunUAT.bat', "BuildCookRun", "-project=" + uproject_file, "-noP4", "-nocompile", "-nocompileeditor", "-installed", "-cook", "-stage", "-archive", "-archivedirectory=" + builds_dir, "-package", "-clientconfig=Development", "-ue4exe=" + ue4_binaries_dir + "UE4Editor-Cmd.exe", "-pak", "-prereqs", "-nodebuginfo", "-targetplatform=Win64", "-build", "-CrashReporter", "-utf8output" ], stdout=log_file )
 
+    log_file.flush()
     return True
 
 def zip_build():
@@ -29,8 +31,3 @@ def zip_build():
     now_str = now.strftime( "%m_%d_%H_%M" )
 
     file_utils.zip_file_directory( latest_build_dir, builds_dir + game_name + "_" + now_str + ".zip" )
-
-
-if __name__ == '__main__':
-    build_game()
-    zip_build()

Scripts/BuildLighting.py

@@ -1,5 +1,6 @@
 import subprocess
 import os
+import glob
 
 from P4 import P4, P4Exception
 
@@ -12,21 +13,26 @@ def build_lighting( log_file ):
     log_file.write( '{} - Step 3: Starting Lighting Build\n'.format( game_name ) )
     log_file.write( '----------------------------------------------------------------------------------------------------\n' )
 
-    maps = []
 
     # Compile the list of maps
     map_dir = env.get_env_variable('Game', 'map_dir')
-    map_names = env.get_env_variable('Game', 'maps').split(';')
+    map_names = env.get_env_variable('Game', 'maps').split(' ')
+    perforce_map_files = []
 
     log_file.write('Building lighting for these maps: ')
     for map in map_names:
         log_file.write(map + " ")
-        full_path_map = map_dir + map
-        maps.append( full_path_map + '.umap')
 
-        maps.append( full_path_map + '_BuiltData.uasset')
+        # Find all maps, and submaps that match <dir>\**\<map>*.umap
+        found_maps = glob.glob(map_dir + '\**\\' + map + '*.umap', recursive=True)
+        
+        # For all the found maps create a mapping to the build data
+        for found_map in found_maps:
+            perforce_map_files.append( found_map)
+            perforce_map_files.append( found_map[0:found_map.index('.')] + '_BuildData.uasset' )
 
-    log_file.write('\n')
+    log_file.write( '\n' )
+    log_file.write('Found a total of {} maps to build lighting on\n'.format( (int)(len(perforce_map_files) / 2)))
     log_file.flush()
 
      # Check the file out from P4
@@ -39,26 +45,27 @@ def build_lighting( log_file ):
         p4.connect()
 
         # Checkout requested maps
-        for map in maps:
+        for map in perforce_map_files:
             try:
                 p4.run('edit', map)
             except:
-                pass
+                log_file.write('Failed to open map {}\n'.format(map))
+                log_file.flush()
 
         # Build the lighting
         uproject_file = env.get_env_variable( "Game", "uproject_file" )
         ue4_binaries_dir = env.get_env_variable( 'Local', "ue4_binaries_dir" )
-        subprocess.run( [ ue4_binaries_dir + 'UE4Editor-Cmd.exe', uproject_file, '-verbose', "-p4", "-submit", "-run=resavepackages" , "-buildlighting", "-quality=production", "-allowcommandletrendering", "-map" + ' '.join(maps)], stdout=log_file )
+        subprocess.run( [ ue4_binaries_dir + 'UE4Editor-Cmd.exe', uproject_file, "-p4", "-submit", "-run=resavepackages" , "-buildlighting", "-quality=Production", "-AllowCommandletRendering", "-map" + ' '.join(map_names)], stdout=log_file )
         log_file.flush()
 
         # Add maps back for addition to p4
-        for map in maps:
+        for map in perforce_map_files:
             log_file.write("adding " + map + '\n')
             p4.run('add', map)
         log_file.flush()
 
         change = p4.fetch_change()
-        change._description = '[Daily_Builds] Built lighting for the follow maps:\n' + '\n\t'.join(maps)
+        change._description = '[Daily_Builds] Built lighting for the follow maps:\n' + '\n\t'.join(perforce_map_files)
         # p4.run_submit( change ) 
 
         log_file.write('Lighting successfully built and submitted\n')

Scripts/UploadToSteam.py

@@ -4,20 +4,22 @@
 
 game_name = env.get_env_variable('Game', 'game_name')
 
-def upload_to_steam():
+def upload_to_steam( log_file ):
 
-    print( '----------------------------------------------------------------------------------------------------' )
-    print( '{} - Step 5: Starting Upload to Steam'.format( game_name ) )
-    print( '----------------------------------------------------------------------------------------------------' )
+    log_file.write( '----------------------------------------------------------------------------------------------------\n' )
+    log_file.write( '{} - Step 5: Starting Upload to Steam\n'.format( game_name ) )
+    log_file.write( '----------------------------------------------------------------------------------------------------\n' )
+    log_file.flush()
 
     user_name = env.get_env_variable( "Steam", "user_name" )
     user_password = env.get_env_variable( "Steam", "user_password" )
     steam_dir = env.get_env_variable( "Steam", "steam_dir" )
     steam_cmd = env.get_env_variable( "Steam", "steam_cmd" )
     app_build = env.get_env_variable( "Steam", "app_build" )
 
-    print(subprocess.run( [steam_dir + steam_cmd, "+login", user_name, user_password, "+run_app_build_http", steam_dir + app_build, "+quit"] ))
+    subprocess.run( [steam_dir + steam_cmd, "+login", user_name, user_password, "+run_app_build_http", steam_dir + app_build, "+quit"], stdout=log_file )
 
+    log_file.flush()
     return True
 
 if __name__ == '__main__':