Merge pull request Tencent#1079 from lmssll/develop

add osx xlog-only build function, without [undefined symbols] link error on m1 mac

Author: garryyan

mars/build_osx.py

@@ -13,6 +13,10 @@
 
 OSX_BUILD_OS_CMD = 'cmake ../.. -DCMAKE_BUILD_TYPE=Release -DENABLE_ARC=0 -DENABLE_BITCODE=0 && make -j8 && make install'
 
+OSX_BUILD_ARM_CMD = 'cmake ../.. -DCMAKE_BUILD_TYPE=Release -DENABLE_ARC=0 -DENABLE_BITCODE=0 -DCMAKE_OSX_ARCHITECTURES="arm64" && make -j8 && make install'
+
+OSX_BUILD_X86_CMD = 'cmake ../.. -DCMAKE_BUILD_TYPE=Release -DENABLE_ARC=0 -DENABLE_BITCODE=0 -DCMAKE_OSX_ARCHITECTURES="x86_64" && make -j8 && make install'
+
 GEN_OSX_PROJ = 'cmake ../.. -G Xcode -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9 -DENABLE_BITCODE=0'
 
 
@@ -40,6 +44,52 @@ def build_osx(tag=''):
     print(dst_framework_path)
     return True
 
+def build_osx_xlog(tag=''):
+    gen_mars_revision_file('comm', tag)
+    
+    clean(BUILD_OUT_PATH)
+    os.chdir(BUILD_OUT_PATH)
+    
+    ret = os.system(OSX_BUILD_ARM_CMD)
+    os.chdir(SCRIPT_PATH)
+    if ret != 0:
+        print('!!!!!!!!!!!build arm fail!!!!!!!!!!!!!!!')
+        return False
+
+    libtool_arm_dst_lib = INSTALL_PATH + '/mars_arm'
+    libtool_src_libs = [INSTALL_PATH + '/libcomm.a',
+                        INSTALL_PATH + '/libmars-boost.a',
+                        INSTALL_PATH + '/libxlog.a',
+                        BUILD_OUT_PATH + '/zstd/libzstd.a']
+    if not libtool_libs(libtool_src_libs, libtool_arm_dst_lib):
+        return False
+
+    clean(BUILD_OUT_PATH)
+    os.chdir(BUILD_OUT_PATH)
+    ret = os.system(OSX_BUILD_X86_CMD)
+    os.chdir(SCRIPT_PATH)
+    if ret != 0:
+        print('!!!!!!!!!!!build x86 fail!!!!!!!!!!!!!!!')
+        return False
+    
+    libtool_x86_dst_lib = INSTALL_PATH + '/mars_x86'
+    if not libtool_libs(libtool_src_libs, libtool_x86_dst_lib):
+        return False
+
+    lipo_src_libs = []
+    lipo_src_libs.append(libtool_arm_dst_lib)
+    lipo_src_libs.append(libtool_x86_dst_lib)
+    lipo_dst_lib = INSTALL_PATH + '/mars'
+
+    if not lipo_libs(lipo_src_libs, lipo_dst_lib):
+        return False
+
+    dst_framework_path = INSTALL_PATH + '/mars.framework'
+    make_static_framework(lipo_dst_lib, dst_framework_path, XLOG_COPY_HEADER_FILES, '../')
+
+    print('==================Output========================')
+    print(dst_framework_path)
+
 def gen_ios_project():
     gen_mars_revision_file('comm')
 
@@ -60,14 +110,17 @@ def main():
             build_osx(sys.argv[1])
             break
         else:
-            num = raw_input('Enter menu:\n1. Clean && build.\n2. Gen OSX Project.\n3. Exit\n')
+            num = raw_input('Enter menu:\n1. Clean && build.\n2. Gen OSX Project.\n3. Build xlog.\n4. Exit\n')
             if num == '1':
                 build_osx()
                 break
             elif num == '2':
                 gen_ios_project()
                 break
             elif num == '3':
+                build_osx_xlog()
+                break
+            elif num == '4':
                 break
             else:
                 build_osx()