Compare commits

...

4 Commits

Author SHA1 Message Date
William Bell
923503493e fix release.yml 2025-08-15 20:04:55 +01:00
William Bell
686cb08f11 fix conan file 2025-08-15 19:56:54 +01:00
William Bell
1cfb4acda6 fix CMakeLists.txt 2025-08-15 19:52:33 +01:00
William Bell
436f30330b fix copying license 2025-08-15 19:45:12 +01:00
3 changed files with 11 additions and 6 deletions

View File

@@ -26,8 +26,11 @@ jobs:
# Windows # Windows
- name: Install build tools (Windows) - name: Install build tools (Windows)
if: runner.os == 'Windows' if: runner.os == 'Windows'
run: choco install winflexbison -y run: |
choco install winflexbison mingw -y
cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++
shell: pwsh shell: pwsh
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
@@ -73,7 +76,7 @@ jobs:
if: runner.os == 'Windows' if: runner.os == 'Windows'
run: | run: |
conan install . --build=missing conan install . --build=missing
conan build . conan build . --config Release
shell: pwsh shell: pwsh
- name: Determine if prerelease (Linux/macOS) - name: Determine if prerelease (Linux/macOS)
@@ -111,7 +114,7 @@ jobs:
FOLDER_NAME="chloride-$TAG-$OS-$ARCH" FOLDER_NAME="chloride-$TAG-$OS-$ARCH"
TAR_NAME="$FOLDER_NAME.tar.gz" TAR_NAME="$FOLDER_NAME.tar.gz"
mv build/bin "$FOLDER_NAME" mv build/bin "$FOLDER_NAME"
cp LICENSE "$FOLDER_NAME" cp LICENSE.txt "$FOLDER_NAME"
tar -czf "$TAR_NAME" "$FOLDER_NAME" tar -czf "$TAR_NAME" "$FOLDER_NAME"
echo "TAR_NAME=$TAR_NAME" >> $GITHUB_ENV echo "TAR_NAME=$TAR_NAME" >> $GITHUB_ENV
shell: bash shell: bash
@@ -124,7 +127,7 @@ jobs:
$FOLDER_NAME = "chloride-$TAG-windows-$ARCH" $FOLDER_NAME = "chloride-$TAG-windows-$ARCH"
$TAR_NAME = "$FOLDER_NAME.zip" $TAR_NAME = "$FOLDER_NAME.zip"
Rename-Item build\bin $FOLDER_NAME Rename-Item build\bin $FOLDER_NAME
Copy-Item LICENSE $FOLDER_NAME Copy-Item LICENSE.txt $FOLDER_NAME
Compress-Archive -Path $FOLDER_NAME -DestinationPath $TAR_NAME Compress-Archive -Path $FOLDER_NAME -DestinationPath $TAR_NAME
echo "TAR_NAME=$TAR_NAME" >> $env:GITHUB_ENV echo "TAR_NAME=$TAR_NAME" >> $env:GITHUB_ENV
shell: pwsh shell: pwsh

View File

@@ -52,7 +52,9 @@ find_package(BDWgc REQUIRED)
find_package(gmp REQUIRED) find_package(gmp REQUIRED)
target_compile_options(argon PRIVATE -O3 -Wall -Wextra -Wno-unused-function -s) target_compile_options(argon PRIVATE -O3 -Wall -Wextra -Wno-unused-function -s)
target_link_options(argon PRIVATE -static) if(NOT APPLE)
target_link_options(argon PRIVATE -static)
endif()
target_link_libraries(argon PRIVATE target_link_libraries(argon PRIVATE
BDWgc::BDWgc BDWgc::BDWgc

View File

@@ -41,7 +41,7 @@ class ArgonConan(ConanFile):
if not flex_path: if not flex_path:
raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.") raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
tc.variables["FLEX_EXECUTABLE"] = flex_path tc.variables["FLEX_EXECUTABLE"] = flex_path.replace("\\", "\\\\")
tc.generate() tc.generate()
def build(self): def build(self):