fix build scripts and support linux build

Piasy · Piasy · commit 932bbef0e746 · 2022-12-18T16:56:05.000+08:00
diff --git a/mars/build_android.py b/mars/build_android.py
@@ -165,18 +165,18 @@ def main(incremental, archs, target_option='', tag=''):
             main(False, archs, tag=sys.argv[1])
             break
         else:
-            archs = {'armeabi-v7a', 'arm64-v8a'}
-            num = raw_input('Enter menu:\n1. Clean && build mars.\n2. Build incrementally mars.\n3. Clean && build xlog.\n4. Exit\n')
-            if num == '1':
+            archs = {'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'}
+            num = input('Enter menu:\n1. Clean && build mars.\n2. Build incrementally mars.\n3. Clean && build xlog.\n4. Exit\n')
+            if num == 1:
                 main(False, archs)
                 break
-            elif num == '2':
+            elif num == 2:
                 main(True, archs)
                 break
-            elif num == '3':
+            elif num == 3:
                 main(False, archs, '--target libzstd_static marsxlog')
                 break
-            elif num == '4':
+            elif num == 4:
                 break
             else:
                 main(False, archs)
diff --git a/mars/build_ios.py b/mars/build_ios.py
@@ -11,6 +11,7 @@
 BUILD_OUT_PATH = 'cmake_build/iOS'
 INSTALL_PATH = BUILD_OUT_PATH + '/Darwin.out'
 
+IOS_BUILD_ARM_SIMULATOR_CMD = 'cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DIOS_PLATFORM=SIMULATOR -DIOS_ARCH="arm64" -DENABLE_ARC=0 -DENABLE_BITCODE=0 -DENABLE_VISIBILITY=1 && make -j8 && make install'
 IOS_BUILD_SIMULATOR_CMD = 'cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DIOS_PLATFORM=SIMULATOR -DIOS_ARCH="x86_64" -DENABLE_ARC=0 -DENABLE_BITCODE=0 -DENABLE_VISIBILITY=1 && make -j8 && make install'
 IOS_BUILD_OS_CMD = 'cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DIOS_PLATFORM=OS -DIOS_ARCH="arm64" -DENABLE_ARC=0 -DENABLE_BITCODE=0 -DENABLE_VISIBILITY=1 && make -j8 && make install'
 
@@ -87,14 +88,19 @@ def build_ios_xlog(tag=''):
         print('!!!!!!!!!!!build os fail!!!!!!!!!!!!!!!')
         return False
 
-    libtool_os_dst_lib = INSTALL_PATH + '/os'
+    libtool_os_dst_lib = INSTALL_PATH + '/mars'
     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_os_dst_lib):
         return False
 
+    os_dst_framework_path = INSTALL_PATH + '/os/mars.framework'
+    make_static_framework(libtool_os_dst_lib, os_dst_framework_path, XLOG_COPY_HEADER_FILES, '../')
+    print('==================Output========================')
+    print(os_dst_framework_path)
+
     clean(BUILD_OUT_PATH)
     os.chdir(BUILD_OUT_PATH)
     ret = os.system(IOS_BUILD_SIMULATOR_CMD)
@@ -103,24 +109,36 @@ def build_ios_xlog(tag=''):
         print('!!!!!!!!!!!build simulator fail!!!!!!!!!!!!!!!')
         return False
     
-    libtool_simulator_dst_lib = INSTALL_PATH + '/simulator'
+    libtool_simulator_dst_lib = INSTALL_PATH + '/sim-x64'
     if not libtool_libs(libtool_src_libs, libtool_simulator_dst_lib):
         return False
 
+    clean(BUILD_OUT_PATH)
+    os.chdir(BUILD_OUT_PATH)
+    ret = os.system(IOS_BUILD_ARM_SIMULATOR_CMD)
+    os.chdir(SCRIPT_PATH)
+    if ret != 0:
+        print('!!!!!!!!!!!build arm simulator fail!!!!!!!!!!!!!!!')
+        return False
+
+    libtool_arm_simulator_dst_lib = INSTALL_PATH + '/sim-arm64'
+    if not libtool_libs(libtool_src_libs, libtool_arm_simulator_dst_lib):
+        return False
+
     lipo_src_libs = []
-    lipo_src_libs.append(libtool_os_dst_lib)
     lipo_src_libs.append(libtool_simulator_dst_lib)
+    lipo_src_libs.append(libtool_arm_simulator_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, '../')
-
+    sim_dst_framework_path = INSTALL_PATH + '/sim/mars.framework'
+    make_static_framework(lipo_dst_lib, sim_dst_framework_path, XLOG_COPY_HEADER_FILES, '../')
     print('==================Output========================')
-    print(dst_framework_path)
+    print(sim_dst_framework_path)
 
+    os.system('xcodebuild -create-xcframework -framework %s -framework %s -output %s/mars.xcframework' % (os_dst_framework_path, sim_dst_framework_path, INSTALL_PATH))
 
 
 def gen_ios_project():
@@ -147,16 +165,16 @@ def main():
             break
         else:
             num = input('Enter menu:\n1. Clean && build mars.\n2. Clean && build xlog.\n3. Gen iOS mars Project.\n4. Exit\n')
-            if num == '1':
+            if num == 1:
                 build_ios()
                 break
-            if num == '2':
+            elif num == 2:
                 build_ios_xlog()
                 break
-            elif num == '3':
+            elif num == 3:
                 gen_ios_project()
                 break
-            elif num == '4':
+            elif num == 4:
                 break
             else:
                 build_ios()
diff --git a/mars/comm/CMakeLists.txt b/mars/comm/CMakeLists.txt
@@ -120,6 +120,11 @@ if(ANDROID)
             jni/util/*.cc)
         
     list(APPEND SELF_SRC_FILES ${SELF_ANDROID_SRC_FILES})
+elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+    file(GLOB SELF_LINUX_SRC_FILES RELATIVE ${PROJECT_SOURCE_DIR}
+            jni/xlogger_threadinfo.cc)
+        
+    list(APPEND SELF_SRC_FILES ${SELF_LINUX_SRC_FILES})
 elseif(APPLE)
 
     file(GLOB SELF_TEMP_SRC_FILES RELATIVE ${PROJECT_SOURCE_DIR} objc/*.mm objc/*.h)
diff --git a/mars/comm/fd_info.cc b/mars/comm/fd_info.cc
@@ -15,6 +15,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <string.h>
 #endif
 
 
diff --git a/mars/comm/jni/xlogger_threadinfo.cc b/mars/comm/jni/xlogger_threadinfo.cc
@@ -19,6 +19,11 @@
 //
 
 #include <unistd.h>
+#include <stdint.h>
+#ifndef ANDROID
+#include <sys/syscall.h>
+#define gettid() syscall(SYS_gettid)
+#endif
 #include "compiler_util.h"
 
 extern "C"
diff --git a/mars/comm/strutil.cc b/mars/comm/strutil.cc
@@ -28,7 +28,6 @@
 #include <locale>
 
 #include "comm/xlogger/xlogger.h"
-#include "mars/openssl/include/openssl/md5.h"
 
 #ifdef WIN32
 #define snprintf _snprintf
diff --git a/mars/log/CMakeLists.txt b/mars/log/CMakeLists.txt
@@ -59,7 +59,11 @@ elseif(ANDROID)
 
     get_filename_component(EXPORT_EXP_FILE jni/export.exp ABSOLUTE)
     set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${EXPORT_EXP_FILE}")
-
+elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+    file(GLOB SELF_LINUX_SRC_FILES RELATIVE ${PROJECT_SOURCE_DIR}
+            jni/ConsoleLog.cc)
+        
+    list(APPEND SELF_SRC_FILES ${SELF_LINUX_SRC_FILES})
 endif()
 
 # add_library(${PROJECT_NAME} STATIC ${SELF_SRC_FILES})
diff --git a/mars/log/jni/ConsoleLog.cc b/mars/log/jni/ConsoleLog.cc
@@ -17,7 +17,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#ifdef ANDROID
 #include <android/log.h>
+#endif
 
 #include "mars/comm/xlogger/xloggerbase.h"
 #include "mars/comm/xlogger/loginfo_extract.h"
@@ -35,10 +37,18 @@ void ConsoleLog(const XLoggerInfo* _info, const char* _log) {
         const char* strFuncName  = NULL == _info->func_name ? "" : _info->func_name;
 
         snprintf(result_log,  sizeof(result_log), "[%s:%d, %s]:%s", filename, _info->line, strFuncName, _log?_log:"NULL==log!!!");
+#ifdef ANDROID
         __android_log_write(_info->level+2, _info->tag?_info->tag:"", (const char*)result_log);
+#else
+        printf("%s", (const char*)result_log);
+#endif
     } else {
     	snprintf(result_log,  sizeof(result_log) , "%s", _log?_log:"NULL==log!!!");
+#ifdef ANDROID
         __android_log_write(ANDROID_LOG_WARN, "", (const char*)result_log);
+#else
+        printf("%s", (const char*)result_log);
+#endif
     }
     
 }
