Update python files

win_scripts/build_win.py

@@ -40,9 +40,8 @@ jobs = sys.argv[1] if len(sys.argv) > 1 else str(os.cpu_count())
 
 try_run(f'autoninja -C out/thorium thorium_all -j{jobs}')
 
-# Move the installer
-installer_src = os.path.normpath(os.path.join(cr_src_dir, 'out', 'thorium', 'mini_installer.exe'))
-installer_dest = os.path.normpath(os.path.join(cr_src_dir, 'out', 'thorium', 'thorium_mini_installer.exe'))
-os.rename(installer_src, installer_dest)
+try_run(f'autoninja -C out/thorium setup mini_installer -j{jobs}')
+
+installer_dest = os.path.normpath(os.path.join(cr_src_dir, 'out', 'thorium'))
 
 print(f"Build Completed. Installer at '{installer_dest}'")

win_scripts/setup.py

@@ -132,6 +132,7 @@ patches = [
   'other/fix-policy-templates.patch',
   'other/ftp-support-thorium.patch',
   'other/thorium-2024-ui.patch',
+  'other/GPC.patch',
 ]
 for patch in patches:
     relative_path = patch.replace('other/', '', 1)
@@ -164,6 +165,10 @@ print( "\nPatching FTP support\n")
 os.chdir(cr_src_dir)
 try_run(f'git apply --reject ftp-support-thorium.patch')
 
+print( "\nPatching in GPC support\n")
+# Change directory to cr_src_dir and run commands
+os.chdir(cr_src_dir)
+try_run(f'git apply --reject GPC.patch')
 
 print( "\nPatching for Thorium 2024 UI\n")
 # Change directory to cr_src_dir and run commands
@@ -233,11 +238,7 @@ if '--woa' in sys.argv:
 def copy_avx512():
     print("\nCopying AVX-512 build files\n")
     copy_directory(
-      os.path.normpath(os.path.join(thor_src_dir, 'other', 'AVX512', 'build')),
-      os.path.normpath(os.path.join(cr_src_dir, 'build'))
-    )
-    copy_directory(
-      os.path.normpath(os.path.join(thor_src_dir, 'other', 'AVX512', 'third_party')),
+      os.path.normpath(os.path.join(thor_src_dir, 'other', 'AVX2', 'third_party')),
       os.path.normpath(os.path.join(cr_src_dir, 'third_party'))
     )
     copy(
@@ -264,10 +265,6 @@ if '--avx512' in sys.argv:
 # Copy AVX2 build files
 def copy_avx2():
     print("\nCopying AVX2 build files\n")
-    copy_directory(
-      os.path.normpath(os.path.join(thor_src_dir, 'other', 'AVX2', 'build')),
-      os.path.normpath(os.path.join(cr_src_dir, 'build'))
-    )
     copy_directory(
       os.path.normpath(os.path.join(thor_src_dir, 'other', 'AVX2', 'third_party')),
       os.path.normpath(os.path.join(cr_src_dir, 'third_party'))
@@ -296,10 +293,6 @@ if '--avx2' in sys.argv:
 # Copy SSE4.1 build files
 def copy_sse4():
     print("\nCopying SSE4.1 build files\n")
-    copy_directory(
-      os.path.normpath(os.path.join(thor_src_dir, 'other', 'SSE4.1', 'build')),
-      os.path.normpath(os.path.join(cr_src_dir, 'build'))
-    )
     copy(
       os.path.normpath(os.path.join(thor_src_dir, 'other', 'SSE4.1', 'thor_ver')),
       os.path.normpath(os.path.join(cr_src_dir, 'out', 'thorium'))
@@ -324,10 +317,6 @@ if '--sse4' in sys.argv:
 # Copy SSE3 build files
 def copy_sse3():
     print("\nCopying SSE3 build files\n")
-    copy_directory(
-      os.path.normpath(os.path.join(thor_src_dir, 'other', 'SSE3', 'build')),
-      os.path.normpath(os.path.join(cr_src_dir, 'build'))
-    )
     copy(
       os.path.normpath(os.path.join(thor_src_dir, 'other', 'SSE3', 'thor_ver')),
       os.path.normpath(os.path.join(cr_src_dir, 'out', 'thorium'))
@@ -357,10 +346,6 @@ if '--sse3' in sys.argv:
 # Copy SSE2 build files
 def copy_sse2():
     print("\nCopying SSE2 build files\n")
-    copy_directory(
-      os.path.normpath(os.path.join(thor_src_dir, 'other', 'SSE2', 'build')),
-      os.path.normpath(os.path.join(cr_src_dir, 'build'))
-    )
     copy(
       os.path.normpath(os.path.join(thor_src_dir, 'other', 'SSE2', 'thor_ver')),
       os.path.normpath(os.path.join(cr_src_dir, 'out', 'thorium'))
@@ -381,6 +366,17 @@ def copy_sse2():
 if '--sse2' in sys.argv:
     copy_sse2()
 
+    print("\nPatching ANGLE for SSE2\n")
+    copy(
+        os.path.normpath(os.path.join(thor_src_dir, 'other', 'SSE2', 'angle-lockfree.patch')),
+        os.path.normpath(os.path.join(cr_src_dir, 'third_party', 'angle', 'src'))
+    )
+    
+    # Change directory to angle_dir and run commands
+    angle_dir = os.path.join(cr_src_dir, 'third_party', 'angle', 'src')
+    os.chdir(angle_dir)
+    try_run(f'git apply --reject angle-lockfree.patch')
+
 
 print("\nDone!\n")
 print("\nEnjoy Thorium!\n")

win_scripts/upstream_version.py

@@ -41,7 +41,7 @@ cr_src_dir = os.getenv('CR_DIR', r'C:/src/chromium/src')
 
 
 # Set cr_ver
-cr_ver = "128.0.6613.194"
+cr_ver = "130.0.6723.174"
 
 
 print(f"\nCurrent Chromium version is: {cr_ver}\n")

win_scripts/version.py

@@ -52,7 +52,7 @@ thor_src_dir = os.path.expandvars(os.getenv('THOR_DIR', r'%USERPROFILE%/thorium'
 
 
 # Set thor_ver
-thor_ver = "128.0.6613.194"
+thor_ver = "130.0.6723.174"
 
 
 print(f"\nCurrent Thorium version is: {thor_ver}\n")