pindo 5.16.1 → 5.16.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/pindo/command/jps/upload.rb +27 -3
- data/lib/pindo/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b92f22542154ae382604b43308458957cf98e13e28827d03060b81f0644a1bb5
|
|
4
|
+
data.tar.gz: fa89cceb033d7e4bb3933a6adb8963107e111b7d6232108bdd9955a2924f405c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: faddb6f7f1994b614f9a4e463d4d9aae9121158cac4bb1d496ae44daddc6acb818737aa766be45a6718cee15d546157bf58a361b2f8ef8a2669268ec0807ef9c
|
|
7
|
+
data.tar.gz: 02b1e2b5f9b299eeebeb2e41ab0fb462df55582195154456bb9ee58228e97fd673a4e8fbc9c6d07be7154f7b65a093f4bd371e3eb5f329536234fcd31c5d4f21
|
|
@@ -287,6 +287,7 @@ module Pindo
|
|
|
287
287
|
def find_and_confirm_unity_packages(project_dir, tasks)
|
|
288
288
|
# 1. 查找所有平台的文件
|
|
289
289
|
ios_file = find_unity_ios_package(project_dir)
|
|
290
|
+
macos_file = find_unity_macos_package(project_dir)
|
|
290
291
|
android_file = find_unity_android_package(project_dir)
|
|
291
292
|
webgl_file = find_unity_webgl_package(project_dir)
|
|
292
293
|
windows_file = find_unity_windows_package(project_dir)
|
|
@@ -294,6 +295,7 @@ module Pindo
|
|
|
294
295
|
# 2. 收集找到的文件
|
|
295
296
|
found_files = []
|
|
296
297
|
found_files << { file: ios_file, type: 'ipa', name: 'iOS' } if ios_file
|
|
298
|
+
found_files << { file: macos_file, type: 'mac', name: 'macOS' } if macos_file
|
|
297
299
|
found_files << { file: android_file, type: 'apk', name: 'Android' } if android_file
|
|
298
300
|
found_files << { file: webgl_file, type: 'html', name: 'WebGL' } if webgl_file
|
|
299
301
|
found_files << { file: windows_file, type: 'exe', name: 'Windows' } if windows_file
|
|
@@ -351,20 +353,41 @@ module Pindo
|
|
|
351
353
|
# 检测 BaseiOS
|
|
352
354
|
base_ios_dir = File.join(project_dir, "GoodPlatform/BaseiOS/build")
|
|
353
355
|
if File.exist?(base_ios_dir)
|
|
354
|
-
build_path = File.join(base_ios_dir, "*.
|
|
356
|
+
build_path = File.join(base_ios_dir, "*.ipa")
|
|
355
357
|
ios_files.concat(Dir.glob(build_path))
|
|
356
358
|
end
|
|
357
359
|
|
|
358
360
|
# 检测 iOS
|
|
359
361
|
ios_dir = File.join(project_dir, "GoodPlatform/iOS/build")
|
|
360
362
|
if File.exist?(ios_dir)
|
|
361
|
-
build_path = File.join(ios_dir, "*.
|
|
363
|
+
build_path = File.join(ios_dir, "*.ipa")
|
|
362
364
|
ios_files.concat(Dir.glob(build_path))
|
|
363
365
|
end
|
|
364
366
|
|
|
365
367
|
ios_files.max_by {|f| File.mtime(f)} if ios_files.any?
|
|
366
368
|
end
|
|
367
369
|
|
|
370
|
+
# 查找 Unity macOS 包
|
|
371
|
+
def find_unity_macos_package(project_dir)
|
|
372
|
+
macos_files = []
|
|
373
|
+
|
|
374
|
+
# 检测 BaseMac
|
|
375
|
+
base_mac_dir = File.join(project_dir, "GoodPlatform/BaseMac/build")
|
|
376
|
+
if File.exist?(base_mac_dir)
|
|
377
|
+
build_path = File.join(base_mac_dir, "*.app")
|
|
378
|
+
macos_files.concat(Dir.glob(build_path))
|
|
379
|
+
end
|
|
380
|
+
|
|
381
|
+
# 检测 Mac
|
|
382
|
+
mac_dir = File.join(project_dir, "GoodPlatform/Mac/build")
|
|
383
|
+
if File.exist?(mac_dir)
|
|
384
|
+
build_path = File.join(mac_dir, "*.app")
|
|
385
|
+
macos_files.concat(Dir.glob(build_path))
|
|
386
|
+
end
|
|
387
|
+
|
|
388
|
+
macos_files.max_by {|f| File.mtime(f)} if macos_files.any?
|
|
389
|
+
end
|
|
390
|
+
|
|
368
391
|
# 查找 Unity Android 包
|
|
369
392
|
def find_unity_android_package(project_dir)
|
|
370
393
|
android_files = []
|
|
@@ -434,7 +457,7 @@ module Pindo
|
|
|
434
457
|
when '.html'
|
|
435
458
|
'html'
|
|
436
459
|
when '.app'
|
|
437
|
-
'app'
|
|
460
|
+
'mac' # .app 文件对应 macOS 平台，类型为 'mac'
|
|
438
461
|
when '.exe'
|
|
439
462
|
'exe'
|
|
440
463
|
else
|
|
@@ -448,6 +471,7 @@ module Pindo
|
|
|
448
471
|
PgyerHelper.share_instace.setForeLogin(beforeLogin: @args_login_flag)
|
|
449
472
|
|
|
450
473
|
# 根据 file_type 确定 package_type（用于获取 JPS 配置）
|
|
474
|
+
# 'html' -> 'zip', 其他类型保持不变（'ipa', 'apk', 'mac', 'exe'）
|
|
451
475
|
package_type = file_type == 'html' ? 'zip' : file_type
|
|
452
476
|
|
|
453
477
|
# 提前获取 JPS 配置（app_info_obj 和 workflow_info）
|
data/lib/pindo/version.rb
CHANGED