Merge pull request #2409 from openNAMU/beta

맥OS 지원 추가

route/go_main_func_easter_egg.py

@@ -15,13 +15,17 @@ def main_func_easter_egg():
                 data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.amd64.bin"), sys._getframe().f_code.co_name], stdout = subprocess.PIPE).communicate()[0]
             else:
                 data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.arm64.bin"), sys._getframe().f_code.co_name], stdout = subprocess.PIPE).communicate()[0]
-        else:
+
+            data = data.decode('utf8')
+        elif platform.system() == 'Windows':
             if platform.machine() in ["AMD64", "x86_64"]:
                 data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.amd64.exe"), sys._getframe().f_code.co_name], stdout = subprocess.PIPE).communicate()[0]
             else:
                 data = subprocess.Popen([os.path.join(".", "route_go", "bin", "main.arm64.exe"), sys._getframe().f_code.co_name], stdout = subprocess.PIPE).communicate()[0]
 
-        data = data.decode('utf8')
+            data = data.decode('utf8')
+        else:
+            data = ''
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
             imp = ['Easter Egg', wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],

route/main_sys_update.py

@@ -19,7 +19,7 @@ def main_sys_update():
 
             print('Update')
             
-            if platform.system() == 'Linux':
+            if platform.system() == 'Linux' or platform.system() == 'Darwin':
                 ok = []
                 ok += [os.system('git remote rm origin')]
                 ok += [os.system('git remote add origin https://github.com/opennamu/opennamu.git')]

route/tool/func.py

@@ -34,7 +34,7 @@ if data_up_date == 1:
     with open(os.path.join('data', 'version.json'), 'w', encoding = 'utf8') as f:
         f.write(version_list['beta']['r_ver'])
     
-    if platform.system() in ('Linux', 'Windows'):
+    if platform.system() in ('Linux', 'Windows', 'Darwin'):
         python_ver = ''
         python_ver = str(sys.version_info.major) + '.' + str(sys.version_info.minor)
 
@@ -123,6 +123,8 @@ def python_to_golang_sync(func_name, other_set = {}):
             cmd = [os.path.join(".", "route_go", "bin", "main.amd64.bin"), func_name, other_set]
         else:
             cmd = [os.path.join(".", "route_go", "bin", "main.arm64.bin"), func_name, other_set]
+    elif platform.system() == 'Darwin':
+        cmd = [os.path.join(".", "route_go", "bin", "main.mac.arm64.bin"), func_name, other_set]
     else:
         if platform.machine() in ["AMD64", "x86_64"]:
             cmd = [os.path.join(".", "route_go", "bin", "main.amd64.exe"), func_name, other_set]
@@ -165,6 +167,8 @@ async def python_to_golang(func_name, other_set = {}):
             cmd = [os.path.join(".", "route_go", "bin", "main.amd64.bin"), func_name, other_set]
         else:
             cmd = [os.path.join(".", "route_go", "bin", "main.arm64.bin"), func_name, other_set]
+    elif platform.system() == 'Darwin':
+        cmd = [os.path.join(".", "route_go", "bin", "main.mac.arm64.bin"), func_name, other_set]
     else:
         if platform.machine() in ["AMD64", "x86_64"]:
             cmd = [os.path.join(".", "route_go", "bin", "main.amd64.exe"), func_name, other_set]
@@ -832,13 +836,15 @@ def linux_exe_chmod():
             exe_type = 'main.amd64.bin'
         else:
             exe_type = 'main.arm64.bin'
+    elif platform.system() == 'Darwin':
+        exe_type = 'main.mac.arm64.bin'
     else:
         if platform.machine() in ["AMD64", "x86_64"]:
             exe_type = 'main.amd64.exe'
         else:
             exe_type = 'main.arm64.exe'
 
-    if platform.system() == 'Linux':
+    if platform.system() == 'Linux' or platform.system() == 'Darwin':
         os.system('chmod +x ./route_go/bin/' + exe_type)
 
     return exe_type

route_go/windows_amd64.ps1

@@ -43,4 +43,14 @@ if($to -eq "windows_arm64" -or $to -eq "all") {
     go build $file_name.go
     Remove-Item ".\bin\$file_name.arm64.exe"
     Move-Item "opennamu.exe" ".\bin\$file_name.arm64.exe"
+}
+
+if($to -eq "mac_arm64" -or $to -eq "all") {
+    Write-Host "mac arm64"
+    $env:GOOS = "darwin"
+    $env:GOARCH = "arm64"
+    $env:CGO_ENABLED = 0
+    go build $file_name.go
+    Remove-Item ".\bin\$file_name.mac.arm64.bin"
+    Move-Item "opennamu" ".\bin\$file_name.mac.arm64.bin"
 }

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-v186",
+        "r_ver" : "v3.5.0-v187",
         "c_ver" : "20240801",
         "s_ver" : "20240426"
     }