Compare commits

...

3 Commits

Author SHA1 Message Date
William Bell
4b2a747338 use msys/flex 2025-08-16 02:36:47 +01:00
William Bell
5277814af0 fix conan 2025-08-16 02:31:15 +01:00
William Bell
8928ab2d99 add cmake as dependency 2025-08-16 02:20:57 +01:00
2 changed files with 7 additions and 10 deletions

View File

@@ -117,8 +117,10 @@ jobs:
base-devel base-devel
mingw-w64-x86_64-gcc mingw-w64-x86_64-gcc
mingw-w64-x86_64-make mingw-w64-x86_64-make
mingw-w64-x86_64-cmake
mingw-w64-x86_64-python mingw-w64-x86_64-python
mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-pip
msys/flex
- name: Install Conan - name: Install Conan
run: | run: |
@@ -137,7 +139,7 @@ jobs:
$ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' } $ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' }
$FOLDER = "chloride-$TAG-windows-$ARCH" $FOLDER = "chloride-$TAG-windows-$ARCH"
$ZIP = "$FOLDER.zip" $ZIP = "$FOLDER.zip"
Rename-Item bin $FOLDER Rename-Item build/bin $FOLDER
Copy-Item LICENSE.txt $FOLDER Copy-Item LICENSE.txt $FOLDER
Compress-Archive -Path $FOLDER -DestinationPath $ZIP Compress-Archive -Path $FOLDER -DestinationPath $ZIP
echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV

View File

@@ -33,16 +33,11 @@ class ArgonConan(ConanFile):
os.environ["CONAN_NON_INTERACTIVE"] = "1" os.environ["CONAN_NON_INTERACTIVE"] = "1"
tc = CMakeToolchain(self) tc = CMakeToolchain(self)
if os.name == "nt": # Windows flex_path = which("flex")
flex_path = which("win_flex") or which("win_flex.exe") if not flex_path:
if not flex_path: raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
raise Exception("win_flex not found in PATH. Install winflexbison via choco.")
else:
flex_path = which("flex")
if not flex_path:
raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
tc.variables["FLEX_EXECUTABLE"] = flex_path.replace("\\", "\\\\") tc.variables["FLEX_EXECUTABLE"] = flex_path
tc.generate() tc.generate()
def build(self): def build(self):