Skip to content
Snippets Groups Projects
Commit 69756f94 authored by Patrick MADELA's avatar Patrick MADELA
Browse files

Use new approach based on python requires and fix versions differences (conan, maven, tags)

parent ff21c21c
No related branches found
No related tags found
No related merge requests found
from conan import ConanFile from conan import ConanFile
from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps
class NeslabExRecipe(ConanFile): class NeslabExRecipe(ConanFile):
name = "neslabex" name = "neslabex"
...@@ -8,6 +6,8 @@ class NeslabExRecipe(ConanFile): ...@@ -8,6 +6,8 @@ class NeslabExRecipe(ConanFile):
version = "1.0.11" version = "1.0.11"
package_type = "application" package_type = "application"
user = "soleil" user = "soleil"
python_requires = "base/[>=1.0]@soleil/stable"
python_requires_extend = "base.Device"
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
author = "Florent Langlois" author = "Florent Langlois"
...@@ -23,24 +23,3 @@ class NeslabExRecipe(ConanFile): ...@@ -23,24 +23,3 @@ class NeslabExRecipe(ConanFile):
self.requires("cpptango/9.2.5@soleil/stable") self.requires("cpptango/9.2.5@soleil/stable")
if self.settings.os == "Linux": if self.settings.os == "Linux":
self.requires("crashreporting2/[>=1.0]@soleil/stable") self.requires("crashreporting2/[>=1.0]@soleil/stable")
def layout(self):
cmake_layout(self)
def generate(self):
deps = CMakeDeps(self)
deps.generate()
tc = CMakeToolchain(self)
tc.variables["PROJECT_NAME"] = self.name
tc.variables["PROJECT_VERSION"] = self.version
tc.variables["EXECUTABLE_NAME"] = self.executable
tc.generate()
def build(self):
cmake = CMake(self)
cmake.configure()
cmake.build()
def package(self):
cmake = CMake(self)
cmake.install()
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</parent> </parent>
<groupId>fr.soleil.device</groupId> <groupId>fr.soleil.device</groupId>
<artifactId>NeslabEx-${aol}-${mode}</artifactId> <artifactId>NeslabEx-${aol}-${mode}</artifactId>
<version>1.0.13-SNAPSHOT</version> <version>1.0.12-SNAPSHOT</version>
<packaging>nar</packaging> <packaging>nar</packaging>
<name>NeslabEx</name> <name>NeslabEx</name>
<description>NeslabEx device</description> <description>NeslabEx device</description>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment