From fe4d14010cad9c7fc0e97249bf2eed09c8cb5d66 Mon Sep 17 00:00:00 2001 From: gregkub <gregoire.kubler@proton.me> Date: Thu, 2 May 2024 14:43:36 +0200 Subject: [PATCH] fix : various bugs --- MANIFEST.in | 6 +++--- include/aidge/utils/Directories.hpp | 17 ++++++++++++++--- pyproject.toml | 6 +++--- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index eef7aa3b8..ffcf58d65 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ include project_name.txt -recursive-include aidge-core *.py -recursive-include include *.h *.hpp -recursive-include src *.c *.cpp +recursive-include aidge_core *.py +recursive-include include *.hpp +recursive-include src *.cpp diff --git a/include/aidge/utils/Directories.hpp b/include/aidge/utils/Directories.hpp index 3bc07b9dd..ca49e1b57 100644 --- a/include/aidge/utils/Directories.hpp +++ b/include/aidge/utils/Directories.hpp @@ -14,11 +14,22 @@ #define AIDGE_DIRECTORIES_H_ -#include <string> // std::string -#include <sstream> // std::stringstream +#include <algorithm> +#include <errno.h> #include <iostream> +#include <sstream> // std::stringstream +#include <string> // std::string #include <sys/stat.h> -#include <errno.h> +#ifndef _S_ISTYPE +#define _S_ISTYPE(mode, mask) (((mode) & _S_IFMT) == (mask)) +#endif +#ifndef S_ISREG +#define S_ISREG(mode) _S_ISTYPE((mode), _S_IFREG) +#endif +#ifndef S_ISDIR +#define S_ISDIR(mode) _S_ISTYPE((mode), _S_IFDIR) +#endif + #ifdef WIN32 #include <direct.h> diff --git a/pyproject.toml b/pyproject.toml index 1bb9a89c8..dc41b7da1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ classifiers = [ ] [build-system] -requires = ["setuptools>=68", "setuptools-scm"] +requires = ["setuptools>=68", "setuptools-scm", "cmake"] build-backend = "setuptools.build_meta" ##################################################### @@ -29,8 +29,8 @@ AIGE_DEPENDENCIES = "" # format => "dep_1 dep_2 ... dep_n" [tool.setuptools] # packages=["aidge_core", "export"] -# [tool.setuptools_scm] -# version_file = "version.py" +[tool.setuptools_scm] +version_file = "version.py" ##################################################### -- GitLab