ref: f9daf27511bfa49a100fa45648c5098098d696b5
parent: 92f2055a6c3328a101e2560d26c75fdc4fe1f8be
parent: 06f7387466eb7d9ee3d9963d3a52a8f455bcaaf2
author: Eldred Habert <[email protected]>
date: Tue Oct 6 13:48:13 EDT 2020
Merge pull request #585 from ISSOtm/msvc-ci Add MSVC in CI
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -53,10 +53,81 @@
run: |
test/run-tests.sh
- windows-build:
+ windows-testing:
strategy:
matrix:
bits: [32, 64]
+ include:
+ - bits: 32
+ arch: x86
+ platform: Win32
+ - bits: 64
+ arch: x86_x64
+ platform: x64
+ fail-fast: false
+ runs-on: windows-2019
+ steps:
+ - uses: actions/checkout@v2
+ - name: Get zlib, libpng and bison
+ run: | # TODO: use an array
+ $wc = New-Object System.Net.WebClient
+ $wc.DownloadFile('https://www.zlib.net/zlib1211.zip', 'zlib.zip')
+ $hash = (Get-FileHash "zlib.zip" -Algorithm SHA256).Hash
+ if ($hash -ne 'd7510a8ee1918b7d0cad197a089c0a2cd4d6df05fee22389f67f115e738b178d') {
+ Write-Host "zlib SHA256 mismatch! ($hash)"
+ exit 1
+ }
+ $wc.DownloadFile('https://download.sourceforge.net/libpng/lpng1637.zip', 'libpng.zip')
+ $hash = (Get-FileHash "libpng.zip" -Algorithm SHA256).Hash
+ if ($hash -ne '3b4b1cbd0bae6822f749d39b1ccadd6297f05e2b85a83dd2ce6ecd7d09eabdf2') {
+ Write-Host "libpng SHA256 mismatch! ($hash)"
+ exit 1
+ }
+ $wc.DownloadFile('https://github.com/lexxmark/winflexbison/releases/download/v2.5.23/win_flex_bison-2.5.23.zip', 'winflexbison.zip')
+ $hash = (Get-FileHash "winflexbison.zip" -Algorithm SHA256).Hash
+ if ($hash -ne '6AA5C8EA662DA1550020A5804C28BE63FFAA53486DA9F6842E24C379EC422DFC') {
+ Write-Host "bison SHA256 mismatch! ($hash)"
+ }
+ Expand-Archive -DestinationPath . "zlib.zip"
+ Expand-Archive -DestinationPath . "libpng.zip"
+ Expand-Archive -DestinationPath install_dir "winflexbison.zip"
+ Move-Item zlib-1.2.11 zlib
+ Move-Item lpng1637 libpng
+ - name: Build zlib
+ run: | # BUILD_SHARED_LIBS causes the output DLL to be correctly called `zlib1.dll`
+ cmake -S zlib -B zbuild -A ${{ matrix.platform }} -DCMAKE_INSTALL_PREFIX=install_dir -DBUILD_SHARED_LIBS=ON
+ cmake --build zbuild --config Release
+ cmake --install zbuild
+ - name: Build libpng
+ run: |
+ cmake -S libpng -B pngbuild -A ${{ matrix.platform }} -DCMAKE_INSTALL_PREFIX=install_dir -DPNG_SHARED=ON -DPNG_STATIC=ON -DPNG_TESTS=OFF
+ cmake --build pngbuild --config Release
+ cmake --install pngbuild
+ - name: Build Windows binaries
+ run: |
+ cmake -S . -B build -A ${{ matrix.platform }} -DCMAKE_INSTALL_PREFIX=install_dir -DCMAKE_BUILD_TYPE=Release
+ cmake --build build --config Release
+ cmake --install build
+ - name: Package binaries
+ shell: bash
+ run: |
+ mkdir bins
+ cp install_dir/bin/{rgbasm.exe,rgblink.exe,rgbfix.exe,rgbgfx.exe,zlib1.dll,libpng16.dll} bins
+ - name: Upload Windows binaries
+ uses: actions/upload-artifact@v1
+ with:
+ name: rgbds-canary-win${{ matrix.bits }}
+ path: bins
+ - name: Test
+ shell: bash
+ run: |
+ cp bins/* .
+ test/run-tests.sh
+
+ windows-xbuild:
+ strategy:
+ matrix:
+ bits: [32, 64]
os: [ubuntu-latest]
include:
- bits: 32
@@ -65,6 +136,7 @@
- bits: 64
arch: x86-64
triplet: x86_64-w64-mingw32
+ fail-fast: false
runs-on: ${{ matrix.os }}
env:
DIST_DIR: win${{ matrix.bits }}
@@ -80,7 +152,7 @@
- name: Install libpng dev headers for MinGW
run: |
sudo ./.github/actions/mingw-w64-libpng-dev.sh ${{ matrix.triplet }}
- - name: Build Windows binaries
+ - name: Cross-build Windows binaries
run: |
make mingw${{ matrix.bits }} -j Q=
- name: Package binaries
@@ -96,14 +168,15 @@
- name: Upload Windows binaries
uses: actions/upload-artifact@v1
with:
- name: rgbds-canary-win${{ matrix.bits }}
+ name: rgbds-canary-mingw-win${{ matrix.bits }}
path: bins
- windows-testing:
- needs: windows-build
+ windows-xtesting:
+ needs: windows-xbuild
strategy:
matrix:
bits: [32, 64]
+ fail-fast: false
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
@@ -110,7 +183,7 @@
- name: Retrieve binaries
uses: actions/download-artifact@v1
with:
- name: rgbds-canary-win${{ matrix.bits }}
+ name: rgbds-canary-mingw-win${{ matrix.bits }}
path: bins
- name: Extract binaries
shell: bash
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@
if(MORE_WARNINGS)
add_compile_options(-Werror -Wextra -Wno-type-limits
- -Wno-sign-compare -Wformat -Wformat-security -Wformat-overflow=2
+ -Wno-sign-compare -Wvla -Wformat -Wformat-security -Wformat-overflow=2
-Wformat-truncation=1 -Wformat-y2k -Wswitch-enum -Wunused
-Wuninitialized -Wunknown-pragmas -Wstrict-overflow=5
-Wstringop-overflow=4 -Walloc-zero -Wduplicated-cond
--- a/Makefile
+++ b/Makefile
@@ -187,7 +187,7 @@
develop:
$Qenv $(MAKE) -j WARNFLAGS="-Werror -Wall -Wextra -Wpedantic -Wno-type-limits \
- -Wno-sign-compare -Wformat -Wformat-security -Wformat-overflow=2 \
+ -Wno-sign-compare -Wvla -Wformat -Wformat-security -Wformat-overflow=2 \
-Wformat-truncation=1 -Wformat-y2k -Wswitch-enum -Wunused \
-Wuninitialized -Wunknown-pragmas -Wstrict-overflow=5 \
-Wstringop-overflow=4 -Walloc-zero -Wduplicated-cond \
--- a/src/asm/lexer.c
+++ b/src/asm/lexer.c
@@ -19,7 +19,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifndef _MSC_VER
#include <unistd.h>
+#endif
#include "extern/utf8decoder.h"
#include "platform.h" /* For `ssize_t` */
@@ -895,11 +897,14 @@
{
if (!lexerState)
return;
- struct Expansion *stack[nMaxRecursionDepth + 1];
+ struct Expansion **stack = malloc(sizeof(*stack) * (nMaxRecursionDepth + 1));
struct Expansion *expansion; /* Temp var for `lookupExpansion` */
unsigned int depth = 0;
size_t distance = lexerState->expansionOfs;
+ if (!stack)
+ fatalerror("Failed to alloc string expansion stack: %s\n", strerror(errno));
+
#define LOOKUP_PRE_NEST(exp) do { \
/* Only register EQUS expansions, not string args */ \
if ((exp)->name) \
@@ -913,6 +918,7 @@
while (depth--)
fprintf(stderr, "while expanding symbol \"%s\"\n", stack[depth]->name);
+ free(stack);
}
/* Function to discard all of a line's comments */