Merge

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://afdian.net/@suhuiw4123']

.github/workflows/cmake.yml

@@ -0,0 +1,292 @@
+name: CMake
+
+on: [push, pull_request]
+
+jobs:
+  build-windows:
+    env:
+      BUILD_TYPE: Release
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - type: Win32
+          triplet: x86-windows-static
+        - type: x64
+          triplet: x64-windows-static
+
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Cache
+      uses: actions/cache@v2.1.4
+      with:
+        # A list of files, directories, and wildcard patterns to cache and restore
+        path: ${{github.workspace}}/build/vcpkg_installed
+        # An explicit key for restoring and saving the cache
+        key: ${{ runner.os }}-${{ matrix.triplet }}-${{ hashFiles('**/vcpkg.json') }}
+        restore-keys:  ${{ runner.os }}-${{ matrix.triplet }}-
+
+    - name: Setup Vcpkg
+      shell: cmd
+      working-directory: ${{github.workspace}}/vcpkg
+      run: bootstrap-vcpkg.bat
+
+    - name: Configure CMake
+      shell: bash
+      working-directory: ${{github.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source 
+      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake $GITHUB_WORKSPACE -A ${{ matrix.type }} -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
+
+    - name: Build
+      shell: bash
+      working-directory: ${{github.workspace}}/build
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE
+
+    - name: Test
+      shell: bash
+      working-directory: ${{github.workspace}}/build
+      # Execute tests defined by the CMake configuration.  
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest -C $BUILD_TYPE
+
+    - name: Upload
+      uses: actions/upload-artifact@v2.2.2
+      with:
+        # Artifact name
+        name: ${{ matrix.triplet }}
+        # A file, directory or wildcard pattern that describes what to upload
+        path: "**/w4123.Dice.dll"
+
+  build-macos:
+    env:
+      BUILD_TYPE: Release
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - arch: x86_64
+          triplet: x64-osx
+        - arch: arm64
+          triplet: arm64-osx
+
+    runs-on: 	macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Cache
+      uses: actions/cache@v2.1.4
+      with:
+        # A list of files, directories, and wildcard patterns to cache and restore
+        path: ${{github.workspace}}/build/vcpkg_installed
+        # An explicit key for restoring and saving the cache
+        key: ${{ runner.os }}-${{ matrix.triplet }}-${{ hashFiles('**/vcpkg.json') }}
+        restore-keys:  ${{ runner.os }}-${{ matrix.triplet }}-
+
+    - name: Setup Vcpkg
+      shell: bash
+      working-directory: ${{github.workspace}}/vcpkg
+      run: ./bootstrap-vcpkg.sh
+
+    - name: Configure CMake
+      working-directory: ${{github.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source 
+      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake ${{github.workspace}} -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      # Execute tests defined by the CMake configuration.  
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest -C $BUILD_TYPE
+
+    - name: Upload
+      uses: actions/upload-artifact@v2.2.2
+      with:
+        # Artifact name
+        name: ${{ matrix.triplet }}
+        # A file, directory or wildcard pattern that describes what to upload
+        path: "**/w4123.Dice.dll"
+
+  build-linux:
+    env:
+      BUILD_TYPE: Release
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - apt: g++-8
+          cc: gcc-8
+          cxx: g++-8
+          triplet: x64-linux
+        - path: /usr/i686-linux-gnu
+          apt: g++-8-i686-linux-gnu
+          cc: i686-linux-gnu-gcc-8
+          cxx: i686-linux-gnu-g++-8
+          triplet: x86-linux
+        - path: /usr/aarch64-linux-gnu
+          apt: g++-8-aarch64-linux-gnu g++-aarch64-linux-gnu
+          cc: aarch64-linux-gnu-gcc-8
+          cxx: aarch64-linux-gnu-g++-8
+          triplet: arm64-linux
+        - path: /usr/arm-linux-gnueabihf
+          apt: g++-8-arm-linux-gnueabihf g++-arm-linux-gnueabihf
+          cc: arm-linux-gnueabihf-gcc-8
+          cxx: arm-linux-gnueabihf-g++-8
+          triplet: arm-linux
+
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Install Cross Compiler
+      run: sudo apt-get install ${{ matrix.apt }}
+
+    - name: Cache
+      uses: actions/cache@v2.1.4
+      with:
+        # A list of files, directories, and wildcard patterns to cache and restore
+        path: ${{github.workspace}}/build/vcpkg_installed
+        # An explicit key for restoring and saving the cache
+        key: ${{ runner.os }}-${{ matrix.triplet }}-${{ hashFiles('**/vcpkg.json') }}
+        restore-keys:  ${{ runner.os }}-${{ matrix.triplet }}-
+
+    - name: Setup Vcpkg
+      shell: bash
+      working-directory: ${{github.workspace}}/vcpkg
+      run: ./bootstrap-vcpkg.sh
+
+    - name: Configure CMake
+      # Use a bash shell so we can use the same syntax for environment variable
+      # access regardless of the host operating system
+      shell: bash
+      working-directory: ${{github.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source 
+      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run:  CC=${{ matrix.cc }} CXX=${{ matrix.cxx }} cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_OVERLAY_TRIPLETS=${{ github.workspace }}/triplets -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} -DCMAKE_PREFIX_PATH=${{ matrix.path }}
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      # Execute tests defined by the CMake configuration.  
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest -C $BUILD_TYPE
+
+    - name: Upload
+      uses: actions/upload-artifact@v2.2.2
+      with:
+        # Artifact name
+        name: ${{ matrix.triplet }}
+        # A file, directory or wildcard pattern that describes what to upload
+        path: "**/w4123.Dice.dll"
+
+  build-android:
+    env:
+      ANDROID_NDK: $ANDROID_NDK_HOME
+      BUILD_TYPE: Release
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - abi: armeabi-v7a
+          triplet: arm-android-static
+        - abi: arm64-v8a
+          triplet: arm64-android-static
+        - abi: x86
+          triplet: x86-android-static
+        - abi: x86_64
+          triplet: x64-android-static
+
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Cache
+      uses: actions/cache@v2.1.4
+      with:
+        # A list of files, directories, and wildcard patterns to cache and restore
+        path: ${{github.workspace}}/build/vcpkg_installed
+        # An explicit key for restoring and saving the cache
+        key: ${{ runner.os }}-${{ matrix.triplet }}-${{ hashFiles('**/vcpkg.json') }}
+        restore-keys:  ${{ runner.os }}-${{ matrix.triplet }}-
+
+    - name: Setup Vcpkg
+      shell: bash
+      working-directory: ${{github.workspace}}/vcpkg
+      run: ./bootstrap-vcpkg.sh
+
+    - name: Configure CMake
+      shell: bash
+      working-directory: ${{github.workspace}}/build
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DVCPKG_OVERLAY_TRIPLETS=${{ github.workspace }}/triplets -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} -DANDROID_ABI=${{ matrix.abi }} -DANDROID_PLATFORM=21
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      # Execute tests defined by the CMake configuration.  
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest -C $BUILD_TYPE
+
+    - name: Upload
+      uses: actions/upload-artifact@v2.2.2
+      with:
+        # Artifact name
+        name: ${{ matrix.triplet }}
+        # A file, directory or wildcard pattern that describes what to upload
+        path: "**/w4123.Dice.dll"
+

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,69 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ Shiki ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ Shiki ]
+  schedule:
+    - cron: '17 7 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.gitignore

@@ -40,5 +40,10 @@
 /packages
 /docs/html
 /Debug
+/Win32
 /x64
 /Dice-cppcheck-build-dir
+/w4123.Dice.dir
+
+/CMakeFiles
+/vcpkg_installed

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/w4123/vcpkg
+[submodule "libiconv"]
+	path = libiconv
+	url = https://github.com/w4123/libiconv-android-prebuilt