diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 99ad4ba..09be638 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -120,6 +120,7 @@ jobs: mingw-w64-x86_64-cmake mingw-w64-x86_64-python mingw-w64-x86_64-python-pip + mingw-w64-x86_64-flex - name: Install Conan run: | @@ -138,7 +139,7 @@ jobs: $ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' } $FOLDER = "chloride-$TAG-windows-$ARCH" $ZIP = "$FOLDER.zip" - Rename-Item bin $FOLDER + Rename-Item build/bin $FOLDER Copy-Item LICENSE.txt $FOLDER Compress-Archive -Path $FOLDER -DestinationPath $ZIP echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV diff --git a/conanfile.py b/conanfile.py index 4ecd8d9..0fd71de 100644 --- a/conanfile.py +++ b/conanfile.py @@ -33,16 +33,11 @@ class ArgonConan(ConanFile): os.environ["CONAN_NON_INTERACTIVE"] = "1" tc = CMakeToolchain(self) - if os.name == "nt": # Windows - flex_path = which("win_flex") or which("win_flex.exe") - if not flex_path: - 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.") + 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() def build(self):