Compare commits
17 Commits
prerelease
...
prerelease
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bddc2cdc79 | ||
|
|
e1b80b42d9 | ||
|
|
dab86925b4 | ||
|
|
0f45052dce | ||
|
|
68f4207216 | ||
|
|
f9f8ca08c6 | ||
|
|
0666b02c13 | ||
|
|
1654507835 | ||
|
|
d054ece8e2 | ||
|
|
4937942d6e | ||
|
|
82ea92183f | ||
|
|
5fb15b476f | ||
|
|
d1a455dbbe | ||
|
|
a81640747d | ||
|
|
4a1ed23f96 | ||
|
|
eb36d02fcb | ||
|
|
7b3a1e1835 |
56
.github/workflows/release.yml
vendored
56
.github/workflows/release.yml
vendored
@@ -99,45 +99,42 @@ jobs:
|
||||
path: ${{ env.TAR_NAME }}
|
||||
|
||||
build-windows:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: windows-latest
|
||||
defaults:
|
||||
run:
|
||||
shell: msys2 {0}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Install MinGW-w64 for cross-compilation
|
||||
run: sudo apt-get update && sudo apt-get install -y mingw-w64
|
||||
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v4
|
||||
- uses: msys2/setup-msys2@v2
|
||||
with:
|
||||
python-version: '3.x'
|
||||
msystem: MINGW64
|
||||
update: true
|
||||
install: >
|
||||
base-devel
|
||||
mingw-w64-x86_64-gcc
|
||||
mingw-w64-x86_64-make
|
||||
mingw-w64-x86_64-gmp
|
||||
mingw-w64-x86_64-gc
|
||||
|
||||
- name: Install Conan
|
||||
- name: Build Project
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install conan
|
||||
conan profile detect
|
||||
conan profile update settings.compiler.version=13 default
|
||||
conan profile update settings.compiler=gcc default
|
||||
conan profile update settings.os=Windows default
|
||||
conan profile update env.CC=x86_64-w64-mingw32-gcc default
|
||||
conan profile update env.CXX=x86_64-w64-mingw32-g++ default
|
||||
make windows
|
||||
|
||||
- name: Build Windows with MinGW
|
||||
- name: Package
|
||||
run: |
|
||||
conan install . --profile:host=mingw-windows --profile:build=default --build=missing
|
||||
conan build .
|
||||
|
||||
- name: Package Windows build
|
||||
run: |
|
||||
TAG=${GITHUB_REF##refs/tags/}
|
||||
FOLDER="chloride-$TAG-windows-x64"
|
||||
ZIP="$FOLDER.zip"
|
||||
mv build/bin "$FOLDER"
|
||||
cp LICENSE.txt "$FOLDER"
|
||||
zip -r "$ZIP" "$FOLDER"
|
||||
echo "TAR_NAME=$ZIP" >> $GITHUB_ENV
|
||||
$TAG = $env:GITHUB_REF -replace 'refs/tags/', ''
|
||||
$ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' }
|
||||
$FOLDER = "chloride-$TAG-windows-$ARCH"
|
||||
$ZIP = "$FOLDER.zip"
|
||||
Rename-Item bin $FOLDER
|
||||
Copy-Item LICENSE.txt $FOLDER
|
||||
Compress-Archive -Path $FOLDER -DestinationPath $ZIP
|
||||
echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV
|
||||
shell: pwsh
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
@@ -153,6 +150,7 @@ jobs:
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
path: ./artifacts
|
||||
merge-multiple: true
|
||||
|
||||
- name: Create GitHub Release
|
||||
uses: ncipollo/release-action@v1
|
||||
|
||||
20
Makefile
20
Makefile
@@ -2,23 +2,35 @@
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# Default FLEX tool
|
||||
BINARY = bin/argon
|
||||
FLEX_TOOL = flex
|
||||
|
||||
CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
|
||||
|
||||
LEXER_SRC = src/lexer/lex.l
|
||||
LEXER_C = src/lexer/lex.yy.c
|
||||
LEXER_H = src/lexer/lex.yy.h
|
||||
|
||||
CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
|
||||
CFLAGS = $(ARCHFLAGS) -lm -lgc -lgmp -Wall -Wextra -Wno-unused-function -Werror=unused-result -Iexternal/cwalk/include -Iexternal/libdye/include
|
||||
BINARY = bin/argon
|
||||
|
||||
all: $(BINARY)
|
||||
|
||||
|
||||
$(LEXER_C) $(LEXER_H): $(LEXER_SRC)
|
||||
flex --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
|
||||
$(FLEX_TOOL) --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
|
||||
|
||||
$(BINARY): $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||
mkdir -p bin
|
||||
gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) -s
|
||||
|
||||
windows: $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||
(echo -n "external/xxhash/xxhash.c " ; \
|
||||
echo -n "external/cwalk/src/cwalk.c " ; \
|
||||
echo -n "external/libdye/src/dye.c " ; \
|
||||
find src -name '*.c' -print0 | xargs -0 echo -n) > sources.txt
|
||||
mkdir -p bin
|
||||
gcc -O3 -march=native -o $(BINARY) @sources.txt $(CFLAGS) -lbcrypt
|
||||
|
||||
native: $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||
mkdir -p bin
|
||||
gcc -O3 -march=native -o $(BINARY) $(CFILES) $(CFLAGS)
|
||||
|
||||
@@ -16,8 +16,11 @@
|
||||
#include <string.h>
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include <psapi.h>
|
||||
#ifndef _WIN32_WINNT
|
||||
#define _WIN32_WINNT 0x0602
|
||||
#endif
|
||||
#include <windows.h>
|
||||
#include <psapi.h>
|
||||
|
||||
double get_memory_usage_mb() {
|
||||
PROCESS_MEMORY_COUNTERS pmc;
|
||||
|
||||
Reference in New Issue
Block a user