Merge pull request #36 from CppCXY/master

修改git action脚本

Author: CppCXY

.github/workflows/build.yml

@@ -5,160 +5,84 @@ on: [push]
 jobs:
   build-windows:
     name: Build Windows
-    runs-on: windows-2016
+    runs-on: windows-latest
     steps:
     - uses: actions/checkout@v1
 
     - name: Build x86
       run: |
         mkdir x86
         cd x86
-        cmake ../
+        cmake ..  -A Win32 -G "Visual Studio 17 2022"
         cmake --build . --config RelWithDebInfo --target install
     
     - name: Upload x86
       uses: actions/[email protected]
       with:
-        name: x86
+        name: win32-x86
         path: x86/install/bin
 
     - name: Build x64
       run: |
         mkdir x64
         cd x64
-        cmake ../ -G "Visual Studio 15 2017 Win64"
+        cmake ../ -G "Visual Studio 17 2022"
         cmake --build . --config RelWithDebInfo --target install
     
     - name: Upload x64
       uses: actions/[email protected]
       with:
-        name: x64
+        name: win32-x64
         path: x64/install/bin
 
-  build-darwin:
-    name: Build Darwin
-    runs-on: macos-latest
+  build-other:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { os: ubuntu-latest, target: linux, platform: linux-x64}
+          - { os: macos-latest, target: darwin, platform: darwin-x64}
+          - { os: macos-latest, target: darwin, platform: darwin-arm64}
     steps:
     - uses: actions/checkout@v1
 
     - name: Build
       run: |
         mkdir build
         cd build
-        cmake -DCMAKE_BUILD_TYPE=Release ../
-        make install
-    
+        cmake ..
+        cmake --build . --config Release
+        cmake --install . --config Release --prefix ${{ github.workspace }}/artifact/
     - name: Upload
-      uses: actions/upload-artifact@v1.0.0
+      uses: actions/upload-artifact@v2
       with:
-        name: emmy_core.dylib
-        path: build/install/bin/emmy_core.dylib
-
-  build-linux:
-    name: Build Linux
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Install
-      run: |
-        sudo apt-get install libreadline-dev
-
-    - name: Build
-      run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=Release ../
-        make install
-    
-    - name: Upload
-      uses: actions/[email protected]
-      with:
-        name: emmy_core.so
-        path: build/install/bin/emmy_core.so
-
+        name: ${{ matrix.platform }}
+        path: ${{ github.workspace }}/artifact/
+ 
   upload-release:
     name: Upload Release
     if: startsWith(github.ref, 'refs/tags/')
-    needs: [build-windows, build-darwin, build-linux]
+    needs: [build-windows, build-other]
     runs-on: [ubuntu-18.04]
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - name: Create release
-        id: create_release
-        uses: actions/create-release@master
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          body: ${{ github.ref }}
-          draft: true
-          prerelease: true
-      
-      - name: Download Windows-x86
-        uses: actions/[email protected]
-        with:
-          name: x86
-          path: artifact/x86
-      
-      - name: Zip x86
-        uses: TheDoctor0/[email protected]
-        with:
-          filename: [email protected]
-          path: artifact/x86
-      
-      - name: Upload x86
-        uses: actions/[email protected]
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: [email protected]
-          asset_name: [email protected]
-          asset_content_type: application/tar+gzip
-      
-      - name: Download Windows-x64
-        uses: actions/[email protected]
-        with:
-          name: x64
-          path: artifact/x64
-      
-      - name: Zip x64
-        uses: TheDoctor0/[email protected]
-        with:
-          filename: [email protected]
-          path: artifact/x64
-      
-      - name: Upload x64
-        uses: actions/[email protected]
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: [email protected]
-          asset_name: [email protected]
-          asset_content_type: application/tar+gzip
-          
-      - name: Download so
-        uses: actions/[email protected]
-        with:
-          name: emmy_core.so
-          path: artifact
-      
-      - name: Upload so
-        uses: actions/[email protected]
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifact/emmy_core.so
-          asset_name: emmy_core.so
-          asset_content_type: application/gzip
-      
-      - name: Download dylib
-        uses: actions/[email protected]
-        with:
-          name: emmy_core.dylib
-          path: artifact
-      
-      - name: Upload dylib
-        uses: actions/[email protected]
+      - name: Download
+        uses: actions/download-artifact@v2
+      - name: Display structure of downloaded files
+        run: ls -R      
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifact/emmy_core.dylib
-          asset_name: emmy_core.dylib
-          asset_content_type: application/gzip
+          name: EmmyLuaDebugger
+          draft: false
+          generate_release_notes: true
+          files: |
+            win32-x64.zip
+            win32-x86.zip
+            darwin-arm64.zip
+            darwin-x64.zip
+            linux-x64.zip
+          token: ${{ secrets.RELEASE }}

.gitignore

@@ -1,3 +1,4 @@
 .vscode
 build
 .vs
+out

CMakeLists.txt

@@ -15,6 +15,7 @@ if (MSVC)
     foreach(CompilerFlag ${CompilerFlags})
         string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
     endforeach()
+   
     # add_definitions(-DUNICODE -D_UNICODE)
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")

emmy_debugger/CMakeLists.txt

@@ -57,6 +57,11 @@ target_sources(emmy_debugger PUBLIC
 
 target_compile_definitions(emmy_debugger PUBLIC -DRAPIDJSON_HAS_STDSTRING)
 
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+	target_compile_options(emmy_debugger PUBLIC /utf-8)
+endif ()
+
+
 if(NOT WIN32)
     target_compile_options(emmy_debugger PUBLIC -fPIC)
 endif()

emmy_debugger/src/api/lua_api.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) 2019. tangzx([email protected])
 *
 * Licensed under the Apache License, Version 2.0 (the "License");

emmy_debugger/src/api/lua_api_loader.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) 2019. tangzx([email protected])
 *
 * Licensed under the Apache License, Version 2.0 (the "License");

emmy_debugger/src/api/lua_state.cpp

@@ -1,4 +1,4 @@
-#include "emmy_debugger/api/lua_state.h"
+#include "emmy_debugger/api/lua_state.h"
 #include "emmy_debugger/lua_version.h"
 
 #ifdef EMMY_USE_LUA_SOURCE

emmy_debugger/src/api/lua_state/lua_state_51.cpp

@@ -1,4 +1,4 @@
-#include "emmy_debugger/api/lua_state.h"
+#include "emmy_debugger/api/lua_state.h"
 #ifdef EMMY_USE_LUA_SOURCE
 #include "lstate.h"
 #else

emmy_debugger/src/api/lua_state/lua_state_52.cpp

@@ -1,4 +1,4 @@
-#include "emmy_debugger/api/lua_state.h"
+#include "emmy_debugger/api/lua_state.h"
 
 #ifdef EMMY_USE_LUA_SOURCE
 #include "lstate.h"

emmy_debugger/src/api/lua_state/lua_state_53.cpp

@@ -1,4 +1,4 @@
-#include "emmy_debugger/api/lua_state.h"
+#include "emmy_debugger/api/lua_state.h"
 #ifdef EMMY_USE_LUA_SOURCE
 #include "lstate.h"
 #else