diff --git a/mars/build_ios.py b/mars/build_ios.py index 8fcb2dbf..a39f059a 100644 --- a/mars/build_ios.py +++ b/mars/build_ios.py @@ -55,7 +55,7 @@ def build_ios(tag=''): return False dst_framework_path = INSTALL_PATH + '/mars.framework' - make_static_framework(lipo_dst_lib, dst_framework_path, COMM_COPY_HEADER_FILES, '../../') + make_static_framework(lipo_dst_lib, dst_framework_path, COMM_COPY_HEADER_FILES, '../') print('==================Output========================') print(dst_framework_path) diff --git a/mars/build_osx.py b/mars/build_osx.py index 789c22c2..7bbd22e4 100644 --- a/mars/build_osx.py +++ b/mars/build_osx.py @@ -34,7 +34,7 @@ def build_osx(tag=''): return False dst_framework_path = INSTALL_PATH + '/mars.framework' - make_static_framework(libtool_os_dst_lib, dst_framework_path, COMM_COPY_HEADER_FILES, '../../') + make_static_framework(libtool_os_dst_lib, dst_framework_path, COMM_COPY_HEADER_FILES, '../') print('==================Output========================') print(dst_framework_path) diff --git a/mars/build_watch.py b/mars/build_watch.py index 9e4b6bf4..c2f2103b 100644 --- a/mars/build_watch.py +++ b/mars/build_watch.py @@ -54,7 +54,7 @@ def build_watch(tag=''): return False dst_framework_path = INSTALL_PATH + '/mars.framework' - make_static_framework(lipo_dst_lib, dst_framework_path, COMM_COPY_HEADER_FILES, '../../') + make_static_framework(lipo_dst_lib, dst_framework_path, COMM_COPY_HEADER_FILES, '../') print('==================Output========================') print(dst_framework_path) diff --git a/mars/build_windows.py b/mars/build_windows.py index a2bad15e..42659855 100644 --- a/mars/build_windows.py +++ b/mars/build_windows.py @@ -42,7 +42,7 @@ def build_windows(incremental, tag='', config='Release'): headers = dict() headers.update(COMM_COPY_HEADER_FILES) headers.update(WIN_COPY_EXT_FILES) - copy_file_mapping(headers, '../../', WIN_RESULT_DIR) + copy_file_mapping(headers, '../', WIN_RESULT_DIR) sub_folders = ["app", "baseevent", "comm", "boost", "xlog", "sdt", "stn"] copy_windows_pdb(BUILD_OUT_PATH, sub_folders, config, WIN_LIBS_INSTALL_PATH) diff --git a/mars/mars_utils.py b/mars/mars_utils.py index f4787dda..a910a77c 100644 --- a/mars/mars_utils.py +++ b/mars/mars_utils.py @@ -6,61 +6,61 @@ COMM_COPY_HEADER_FILES = { - "mars/mars/comm/verinfo.h": "comm", - "mars/mars/comm/autobuffer.h": "comm", - "mars/mars/comm/http.h": "comm", - "mars/mars/comm/time_utils.h": "comm", - "mars/mars/comm/strutil.h": "comm", - "mars/mars/comm/string_cast.h": "comm", - "mars/mars/comm/comm_data.h": "comm", - "mars/mars/comm/projdef.h": "comm", - "mars/mars/comm/socket/local_ipstack.h": "comm", - "mars/mars/comm/socket/nat64_prefix_util.h": "comm", - "mars/mars/comm/has_member.h" : "comm", - "mars/mars/comm/objc/scope_autoreleasepool.h": "comm", - "mars/mars/comm/objc/ThreadOperationQueue.h": "comm", - "mars/mars/stn/stn.h": "stn", - "mars/mars/stn/stn_logic.h": "stn", - "mars/mars/stn/proto/stnproto_logic.h": "stn", - "mars/mars/baseevent/base_logic.h": "baseevent", - "mars/mars/comm/xlogger/preprocessor.h": "xlog", - "mars/mars/comm/xlogger/xloggerbase.h": "xlog", - "mars/mars/comm/xlogger/xlogger.h": "xlog", - "mars/mars/log/appender.h": "xlog", - "mars/mars/app/app.h": "app", - "mars/mars/app/app_logic.h": "app", - "mars/mars/sdt/sdt.h": "sdt", - "mars/mars/sdt/sdt_logic.h": "sdt", - "mars/mars/sdt/constants.h": "sdt", - "mars/mars/sdt/netchecker_profile.h": "sdt", + "mars/comm/verinfo.h": "comm", + "mars/comm/autobuffer.h": "comm", + "mars/comm/http.h": "comm", + "mars/comm/time_utils.h": "comm", + "mars/comm/strutil.h": "comm", + "mars/comm/string_cast.h": "comm", + "mars/comm/comm_data.h": "comm", + "mars/comm/projdef.h": "comm", + "mars/comm/socket/local_ipstack.h": "comm", + "mars/comm/socket/nat64_prefix_util.h": "comm", + "mars/comm/has_member.h" : "comm", + "mars/comm/objc/scope_autoreleasepool.h": "comm", + "mars/comm/objc/ThreadOperationQueue.h": "comm", + "mars/stn/stn.h": "stn", + "mars/stn/stn_logic.h": "stn", + "mars/stn/proto/stnproto_logic.h": "stn", + "mars/baseevent/base_logic.h": "baseevent", + "mars/comm/xlogger/preprocessor.h": "xlog", + "mars/comm/xlogger/xloggerbase.h": "xlog", + "mars/comm/xlogger/xlogger.h": "xlog", + "mars/log/appender.h": "xlog", + "mars/app/app.h": "app", + "mars/app/app_logic.h": "app", + "mars/sdt/sdt.h": "sdt", + "mars/sdt/sdt_logic.h": "sdt", + "mars/sdt/constants.h": "sdt", + "mars/sdt/netchecker_profile.h": "sdt", } WIN_COPY_EXT_FILES = { - "mars/mars/comm/platform_comm.h": "comm", - "mars/mars/comm/windows/projdef.h": "comm/windows", - "mars/mars/comm/windows/sys/cdefs.h": "comm/windows/sys", - "mars/mars/comm/windows/sys/time.h": "comm/windows/sys", + "mars/comm/platform_comm.h": "comm", + "mars/comm/windows/projdef.h": "comm/windows", + "mars/comm/windows/sys/cdefs.h": "comm/windows/sys", + "mars/comm/windows/sys/time.h": "comm/windows/sys", } XLOG_COPY_HEADER_FILES = { - "mars/mars/comm/verinfo.h": "comm", - "mars/mars/comm/autobuffer.h": "comm", - "mars/mars/comm/http.h": "comm", - "mars/mars/comm/time_utils.h": "comm", - "mars/mars/comm/strutil.h": "comm", - "mars/mars/comm/string_cast.h": "comm", - "mars/mars/comm/comm_data.h": "comm", - "mars/mars/comm/projdef.h": "comm", - "mars/mars/comm/socket/local_ipstack.h": "comm", - "mars/mars/comm/socket/nat64_prefix_util.h": "comm", - "mars/mars/comm/has_member.h" : "comm", - "mars/mars/comm/objc/scope_autoreleasepool.h": "comm", - "mars/mars/comm/objc/ThreadOperationQueue.h": "comm", - "mars/mars/comm/xlogger/preprocessor.h": "xlog", - "mars/mars/comm/xlogger/xloggerbase.h": "xlog", - "mars/mars/comm/xlogger/xlogger.h": "xlog", - "mars/mars/log/appender.h": "xlog", + "mars/comm/verinfo.h": "comm", + "mars/comm/autobuffer.h": "comm", + "mars/comm/http.h": "comm", + "mars/comm/time_utils.h": "comm", + "mars/comm/strutil.h": "comm", + "mars/comm/string_cast.h": "comm", + "mars/comm/comm_data.h": "comm", + "mars/comm/projdef.h": "comm", + "mars/comm/socket/local_ipstack.h": "comm", + "mars/comm/socket/nat64_prefix_util.h": "comm", + "mars/comm/has_member.h" : "comm", + "mars/comm/objc/scope_autoreleasepool.h": "comm", + "mars/comm/objc/ThreadOperationQueue.h": "comm", + "mars/comm/xlogger/preprocessor.h": "xlog", + "mars/comm/xlogger/xloggerbase.h": "xlog", + "mars/comm/xlogger/xlogger.h": "xlog", + "mars/log/appender.h": "xlog", } def libtool_libs(src_libs, dst_lib): @@ -373,4 +373,4 @@ def merge_win_static_libs(src_libs, dst_lib): import glob if __name__ == '__main__': - lipo_thin_libs(u'/Users/garry/Documents/gitcode/mmnet/mars/mars/openssl/openssl_lib_iOS/libcrypto.a', u'/Users/garry/Documents/gitcode/mmnet/mars/mars/openssl/openssl_lib_iOS/libcrypto_test.a', ['x86_64', 'arm64']) + lipo_thin_libs(u'/Users/garry/Documents/gitcode/mmnet/mars/openssl/openssl_lib_iOS/libcrypto.a', u'/Users/garry/Documents/gitcode/mmnet/mars/openssl/openssl_lib_iOS/libcrypto_test.a', ['x86_64', 'arm64'])