From 4226ef5a66ee6015533f6fad3ee6691948c4b003 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Thu, 28 Nov 2024 11:48:48 -0800
Subject: [PATCH] Setup system/ui/ move (#34124)

---
 SConstruct                                    |  1 +
 selfdrive/ui/SConscript                       |  2 --
 selfdrive/ui/raylib/.gitignore                |  1 -
 system/ui/.gitignore                          |  1 +
 {selfdrive/ui/raylib => system/ui}/SConscript | 11 ++++++-----
 {selfdrive => system}/ui/raylib/spinner.cc    |  2 +-
 {selfdrive => system}/ui/raylib/util.cc       |  2 +-
 {selfdrive => system}/ui/raylib/util.h        |  0
 8 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 selfdrive/ui/raylib/.gitignore
 create mode 100644 system/ui/.gitignore
 rename {selfdrive/ui/raylib => system/ui}/SConscript (53%)
 rename {selfdrive => system}/ui/raylib/spinner.cc (98%)
 rename {selfdrive => system}/ui/raylib/util.cc (97%)
 rename {selfdrive => system}/ui/raylib/util.h (100%)

diff --git a/SConstruct b/SConstruct
index 7cc672cef01201..d1661e7b6c30ff 100644
--- a/SConstruct
+++ b/SConstruct
@@ -366,6 +366,7 @@ SConscript(['rednose/SConscript'])
 
 # Build system services
 SConscript([
+  'system/ui/SConscript',
   'system/proclogd/SConscript',
   'system/ubloxd/SConscript',
   'system/loggerd/SConscript',
diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript
index 81c18d03df39b7..22bf4760bfbdc8 100644
--- a/selfdrive/ui/SConscript
+++ b/selfdrive/ui/SConscript
@@ -110,5 +110,3 @@ if GetOption('extras') and arch != "Darwin":
 # build watch3
 if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'):
   qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'msgq', 'visionipc'])
-
-SConscript(['raylib/SConscript'])
diff --git a/selfdrive/ui/raylib/.gitignore b/selfdrive/ui/raylib/.gitignore
deleted file mode 100644
index c66ae096aa77c3..00000000000000
--- a/selfdrive/ui/raylib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_spinner
diff --git a/system/ui/.gitignore b/system/ui/.gitignore
new file mode 100644
index 00000000000000..1d32f7d8777bcf
--- /dev/null
+++ b/system/ui/.gitignore
@@ -0,0 +1 @@
+spinner
diff --git a/selfdrive/ui/raylib/SConscript b/system/ui/SConscript
similarity index 53%
rename from selfdrive/ui/raylib/SConscript
rename to system/ui/SConscript
index d603f263e181d9..1f75e9cbe545ac 100644
--- a/selfdrive/ui/raylib/SConscript
+++ b/system/ui/SConscript
@@ -1,9 +1,10 @@
 Import('env', 'arch', 'common')
 
-raylib_env = env.Clone()
-raylib_util_lib = env.Library("raylib_util_lib", ['util.cc'], LIBS='raylib')
-linked_libs = ['raylib', raylib_util_lib, common]
-raylib_env['LIBPATH'] += [f'#third_party/raylib/{arch}/']
+renv = env.Clone()
+
+rayutil = env.Library("rayutil", ['raylib/util.cc'], LIBS='raylib')
+linked_libs = ['raylib', rayutil, common]
+renv['LIBPATH'] += [f'#third_party/raylib/{arch}/']
 
 mac_frameworks = []
 if arch == "Darwin":
@@ -14,4 +15,4 @@ else:
   linked_libs += ['OpenCL', 'dl', 'pthread']
 
 if arch != 'aarch64':
-  raylib_env.Program("_spinner", ["spinner.cc"], LIBS=linked_libs, FRAMEWORKS=mac_frameworks)
+  renv.Program("spinner", ["raylib/spinner.cc"], LIBS=linked_libs, FRAMEWORKS=mac_frameworks)
diff --git a/selfdrive/ui/raylib/spinner.cc b/system/ui/raylib/spinner.cc
similarity index 98%
rename from selfdrive/ui/raylib/spinner.cc
rename to system/ui/raylib/spinner.cc
index 99aa5f3269c70b..085d45238556f9 100644
--- a/selfdrive/ui/raylib/spinner.cc
+++ b/system/ui/raylib/spinner.cc
@@ -2,7 +2,7 @@
 #include <cmath>
 #include <iostream>
 
-#include "selfdrive/ui/raylib/util.h"
+#include "system/ui/raylib/util.h"
 #include "third_party/raylib/include/raylib.h"
 
 constexpr int kProgressBarWidth = 1000;
diff --git a/selfdrive/ui/raylib/util.cc b/system/ui/raylib/util.cc
similarity index 97%
rename from selfdrive/ui/raylib/util.cc
rename to system/ui/raylib/util.cc
index 73c0e4e0b73054..5dcebd024e13b0 100644
--- a/selfdrive/ui/raylib/util.cc
+++ b/system/ui/raylib/util.cc
@@ -1,4 +1,4 @@
-#include "selfdrive/ui/raylib/util.h"
+#include "system/ui/raylib/util.h"
 
 #include <array>
 
diff --git a/selfdrive/ui/raylib/util.h b/system/ui/raylib/util.h
similarity index 100%
rename from selfdrive/ui/raylib/util.h
rename to system/ui/raylib/util.h