From 5e8cf9d4d4f9c675c3fa8e75a2bcba4559826182 Mon Sep 17 00:00:00 2001 From: Matt Knight Date: Wed, 10 Apr 2024 22:28:06 -0700 Subject: [PATCH] update for v1.8.0 --- .github/workflows/c-cpp.yml | 206 -------------------------- .github/workflows/ci.yaml | 29 ++++ .github/workflows/codeql-analysis.yml | 69 --------- build.zig | 32 +++- 4 files changed, 58 insertions(+), 278 deletions(-) delete mode 100644 .github/workflows/c-cpp.yml create mode 100644 .github/workflows/ci.yaml delete mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml deleted file mode 100644 index 72163fdf7..000000000 --- a/.github/workflows/c-cpp.yml +++ /dev/null @@ -1,206 +0,0 @@ -name: C/C++ CI - -on: - push: - branches: [master, develop, testing] - pull_request: - branches: [master, develop, testing] - -jobs: - # Linux - - job_linux_20_04_64_gcc: - name: ubuntu-20.04 gcc - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm - - name: make debug - run: sudo make clean && make debug - - name: make test - run: sudo make clean && make test - - name: make release - run: sudo make clean && make release - - name: sudo make install - run: sudo make clean && sudo make install - - name: sudo make package - run: sudo make package - - name: sudo make uninstall - run: sudo make uninstall && sudo make clean - - job_linux_20_04_32_gcc: - name: ubuntu-20.04 gcc 32-bit - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm - - name: Set compiler flags - run: | - CFLAGS="$CFLAGS -m32" - CXXFLAGS="$CXXFLAGS -m32" - LDFLAGS="$LDFLAGS -m32" - - name: make debug - run: sudo make clean && make debug - - name: make test - run: sudo make clean && make test - - name: make release - run: sudo make clean && make release - - name: sudo make install - run: sudo make clean && sudo make install - - name: sudo make package - run: sudo make package - - name: sudo make uninstall - run: sudo make uninstall && sudo make clean - - job_linux_20_04_64_clang: - name: ubuntu-20.04 clang - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: sudo apt update && sudo apt-get install clang-12 libusb-1.0.0-dev libgtk-3-dev rpm - - name: make debug - run: sudo make clean && make debug - - name: make test - run: sudo make clean && make test - - name: make release - run: sudo make clean && make release - - name: sudo make install - run: sudo make clean && sudo make install - - name: sudo make package - run: sudo make package - - name: sudo make uninstall - run: sudo make uninstall && sudo make clean - - job_linux_20_04_32_clang: - name: ubuntu-20.04 clang 32-bit - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: sudo apt update && sudo apt-get install clang-12 libusb-1.0.0-dev libgtk-3-dev rpm - - name: Set compiler flags - run: | - CFLAGS="$CFLAGS -m32" - CXXFLAGS="$CXXFLAGS -m32" - LDFLAGS="$LDFLAGS -m32" - - name: make debug - run: sudo make clean && make debug - - name: make test - run: sudo make clean && make test - - name: make release - run: sudo make clean && make release - - name: sudo make install - run: sudo make clean && sudo make install - - name: sudo make package - run: sudo make package - - name: sudo make uninstall - run: sudo make uninstall && sudo make clean - - job_linux_22_04_64_gcc: - name: ubuntu-22.04 gcc - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: sudo apt update && sudo apt-get install gcc-12 libusb-1.0.0-dev libgtk-4-dev rpm - - name: make debug - run: sudo make clean && make debug - - name: make test - run: sudo make clean && make test - - name: make release - run: sudo make clean && make release - - name: sudo make install - run: sudo make clean && sudo make install - - name: sudo make package - run: sudo make package - - name: sudo make uninstall - run: sudo make uninstall && sudo make clean - - job_linux_22_04_32_gcc: - name: ubuntu-22.04 gcc 32-bit - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: sudo apt update && sudo apt-get install gcc-12 libusb-1.0.0-dev libgtk-4-dev rpm - - name: Set compiler flags - run: | - CFLAGS="$CFLAGS -m32" - CXXFLAGS="$CXXFLAGS -m32" - LDFLAGS="$LDFLAGS -m32" - - name: make debug - run: sudo make clean && make debug - - name: make test - run: sudo make clean && make test - - name: make release - run: sudo make clean && make release - - name: sudo make install - run: sudo make clean && sudo make install - - name: sudo make package - run: sudo make package - - name: sudo make uninstall - run: sudo make uninstall && sudo make clean - - job_linux_22_04_64_clang: - name: ubuntu-22.04 clang - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: sudo apt update && sudo apt-get install clang-14 libusb-1.0.0-dev libgtk-4-dev rpm - - name: make debug - run: sudo make clean && make debug - - name: make test - run: sudo make clean && make test - - name: make release - run: sudo make clean && make release - - name: sudo make install - run: sudo make clean && sudo make install - - name: sudo make package - run: sudo make package - - name: sudo make uninstall - run: sudo make uninstall && sudo make clean - - job_linux_22_04_32_clang: - name: ubuntu-22.04 clang 32-bit - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: sudo apt update && sudo apt-get install clang-14 libusb-1.0.0-dev libgtk-4-dev rpm - - name: Set compiler flags - run: | - CFLAGS="$CFLAGS -m32" - CXXFLAGS="$CXXFLAGS -m32" - LDFLAGS="$LDFLAGS -m32" - - name: make debug - run: sudo make clean && make debug - - name: make test - run: sudo make clean && make test - - name: make release - run: sudo make clean && make release - - name: sudo make install - run: sudo make clean && sudo make install - - name: sudo make package - run: sudo make package - - name: sudo make uninstall - run: sudo make uninstall && sudo make clean -# Linux MinGW cross compliation - -# job_linux_22_04_cross: -# name: ubuntu-22.04 mingw64 -# runs-on: ubuntu-22.04 -# steps: -# - uses: actions/checkout@v2 -# - name: Install dependencies -# run: sudo apt-get install gcc-12 libusb-1.0.0-dev libgtk-4-dev rpm mingw-w64 -# - name: Building Release for Windows (x86-64) ... -# run: sudo mkdir -p build-mingw && cd build-mingw && sudo cmake \ -# -DCMAKE_SYSTEM_NAME=Windows \ -# -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \ -# -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake \ -# -DCMAKE_INSTALL_PREFIX=$PWD/install $PWD && \ -# sudo make && sudo rm -rf build-mingw && cd - diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 000000000..52646caa7 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,29 @@ +name: Build + +on: + push: + branches: [v1.8.0-zig] + pull_request: + branches: [v1.8.0-zig] + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ + ubuntu-latest, + windows-latest, + macos-latest, + ] + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Zig + uses: goto-bus-stop/setup-zig@v2 + with: + version: master + + - name: Build + run: zig build diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 94f256249..000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,69 +0,0 @@ -# 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: [testing, develop, master] - pull_request: - # The branches below must be a subset of the branches above - branches: [testing, develop] - schedule: - - cron: "00 20 * * 1" - -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: Install dependencies - run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm - - name: Checkout repository - uses: actions/checkout@v2 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - 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@v2 - - # ℹī¸ 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@v2 diff --git a/build.zig b/build.zig index 753c9bb08..199ae543d 100644 --- a/build.zig +++ b/build.zig @@ -35,6 +35,8 @@ pub fn build(b: *Build) void { .PROJECT_VERSION_PATCH = 0, }); + const stlink_chips_dir = b.fmt("\"{s}\"", .{b.pathFromRoot("config/chips")}); + const stlink = b.addStaticLibrary(.{ .name = "stlink", .target = target, @@ -42,27 +44,36 @@ pub fn build(b: *Build) void { .link_libc = true, }); stlink.addCSourceFiles(&.{ - "src/common.c", + "src/stlink-lib/calculate.c", "src/stlink-lib/chipid.c", + "src/stlink-lib/common.c", + "src/stlink-lib/common_flash.c", "src/stlink-lib/flash_loader.c", + "src/stlink-lib/helper.c", + "src/stlink-lib/lib_md5.c", "src/stlink-lib/logging.c", + "src/stlink-lib/map_file.c", "src/stlink-lib/md5.c", + "src/stlink-lib/option_bytes.c", + "src/stlink-lib/read_write.c", "src/stlink-lib/sg.c", "src/stlink-lib/usb.c", - "src/stlink-lib/helper.c", }, c_flags); switch (target.getOsTag()) { .macos => { stlink.defineCMacro("STLINK_HAVE_SYS_TIME_H", null); stlink.defineCMacro("STLINK_HAVE_SYS_MMAN_H", null); + stlink.defineCMacro("STLINK_HAVE_DIRENT_H", null); stlink.linkFramework("CoreFoundation"); stlink.linkFramework("IOKit"); }, .windows => { stlink.defineCMacro("STLINK_HAVE_SYS_TIME_H", null); stlink.addCSourceFiles(&.{ - "src/win32/win32_socket.c", + "src/win32/sys_time.c", + "src/win32/getopt/getopt.c", "src/win32/mmap.c", + "src/win32/win32_socket.c", }, c_flags); stlink.addIncludePath(.{ .path = "src/win32" }); stlink.linkSystemLibrary("wsock32"); @@ -71,11 +82,13 @@ pub fn build(b: *Build) void { .linux => { stlink.defineCMacro("STLINK_HAVE_SYS_TIME_H", null); stlink.defineCMacro("STLINK_HAVE_SYS_MMAN_H", null); + stlink.defineCMacro("STLINK_HAVE_DIRENT_H", null); }, else => {}, } stlink.addIncludePath(.{ .path = "inc" }); stlink.addIncludePath(.{ .path = "src/stlink-lib" }); + stlink.defineCMacro("STLINK_CHIPS_DIR", stlink_chips_dir); stlink.addConfigHeader(version); stlink.linkLibrary(libusb); b.installArtifact(stlink); @@ -90,8 +103,18 @@ pub fn build(b: *Build) void { "src/st-flash/flash.c", "src/st-flash/flash_opts.c", }, c_flags); + switch (target.getOsTag()) { + .macos => { + st_flash.defineCMacro("STLINK_HAVE_SYS_MMAN_H", null); + }, + .windows => { + st_flash.addIncludePath(.{ .path = "src/win32" }); + }, + else => {}, + } st_flash.addIncludePath(.{ .path = "inc" }); st_flash.addIncludePath(.{ .path = "src/stlink-lib" }); + st_flash.defineCMacro("STLINK_CHIPS_DIR", stlink_chips_dir); st_flash.addConfigHeader(version); st_flash.linkLibrary(stlink); st_flash.linkLibrary(libusb); @@ -108,6 +131,7 @@ pub fn build(b: *Build) void { }, c_flags); st_info.addIncludePath(.{ .path = "inc" }); st_info.addIncludePath(.{ .path = "src/stlink-lib" }); + st_info.defineCMacro("STLINK_CHIPS_DIR", stlink_chips_dir); st_info.addConfigHeader(version); st_info.linkLibrary(stlink); st_info.linkLibrary(libusb); @@ -130,6 +154,7 @@ pub fn build(b: *Build) void { st_util.addIncludePath(.{ .path = "inc" }); st_util.addIncludePath(.{ .path = "src/stlink-lib" }); + st_util.defineCMacro("STLINK_CHIPS_DIR", stlink_chips_dir); st_util.addConfigHeader(version); st_util.linkLibrary(stlink); st_util.linkLibrary(libusb); @@ -146,6 +171,7 @@ pub fn build(b: *Build) void { }, c_flags); st_trace.addIncludePath(.{ .path = "inc" }); st_trace.addIncludePath(.{ .path = "src/stlink-lib" }); + st_trace.defineCMacro("STLINK_CHIPS_DIR", stlink_chips_dir); st_trace.addConfigHeader(version); st_trace.linkLibrary(stlink); st_trace.linkLibrary(libusb);