Skip to content

Commit a94eac7

Browse files
committed
feat: support xcframework for watchOS target
1 parent 8934f49 commit a94eac7

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

mars/build_watch.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,17 @@ def build_watch(tag=''):
5050
return False
5151

5252
dst_framework_path = INSTALL_PATH + '/device/mars.framework'
53-
make_static_framework(libtool_os_dst_lib, dst_framework_path, XLOG_COPY_HEADER_FILES, '../')
54-
os.system('mv ' + dst_framework_path + '/os ' + dst_framework_path + '/mars')
53+
dst_framework_device_path = INSTALL_PATH + '/device/mars.framework'
54+
make_static_framework(libtool_os_dst_lib, dst_framework_device_path, XLOG_COPY_HEADER_FILES, '../')
55+
os.system('mv ' + dst_framework_device_path + '/os ' + dst_framework_device_path + '/mars')
5556

5657
dst_framework_simulator_path = INSTALL_PATH + '/simu/mars.framework'
5758
make_static_framework(libtool_simulator_dst_lib, dst_framework_simulator_path, XLOG_COPY_HEADER_FILES, '../')
5859
os.system('mv ' + dst_framework_simulator_path + '/simulator ' + dst_framework_simulator_path + '/mars')
59-
os.system('xcodebuild -create-xcframework -framework "' + dst_framework_path + '" -framework "' + dst_framework_simulator_path + '" -output "' + INSTALL_PATH + '/mars.xcframework"')
60+
os.system('xcodebuild -create-xcframework -framework "' + dst_framework_device_path + '" -framework "' + dst_framework_simulator_path + '" -output "' + dst_framework_path + '"')
6061

6162
print('==================Output========================')
62-
print(INSTALL_PATH + "/mars.xcframework")
63+
print(dst_framework_path)
6364
return True
6465

6566
def gen_watch_project():

mars/comm/verinfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#ifndef Mars_verinfo_h
33
#define Mars_verinfo_h
44

5-
#define MARS_REVISION "db98964c"
5+
#define MARS_REVISION "8934f490"
66
#define MARS_PATH "feature/watchos_xcframework"
77
#define MARS_URL ""
8-
#define MARS_BUILD_TIME "2025-04-24 01:35:00"
8+
#define MARS_BUILD_TIME "2025-04-24 01:51:22"
99
#define MARS_TAG ""
10-
#define MARS_BUILD_TIMESTAMP 1745429700
10+
#define MARS_BUILD_TIMESTAMP 1745430682
1111

1212
#endif

0 commit comments

Comments
 (0)