Merge pull request #80 from vkottler/dev/2.7.5

2.7.5 - Add support for extra source directories

.github/workflows/python-package.yml

@@ -76,7 +76,7 @@ jobs:
 
  - run: |
  mk python-release owner=vkottler \
- repo=yambs version=2.7.4
+ repo=yambs version=2.7.5
  if: |
  matrix.python-version == '3.11'
  && matrix.system == 'ubuntu-latest'

README.md

@@ -1,12 +1,12 @@
 <!--
  =====================================
  generator=datazen
- version=3.1.3
- hash=e7ae68711a56d6cf890b6a6d9ecbac52
+ version=3.1.4
+ hash=b26d761fc77bb1ddee83a2faa6a6fa5f
  =====================================
 -->
 
-# yambs ([2.7.4](https://pypi.org/project/yambs/))
+# yambs ([2.7.5](https://pypi.org/project/yambs/))
 
 [![python](https://img.shields.io/pypi/pyversions/yambs.svg)](https://pypi.org/project/yambs/)
 ![Build Status](https://github.com/vkottler/yambs/workflows/Python%20Package/badge.svg)

local/variables/package.yaml

@@ -1,5 +1,5 @@
 ---
 major: 2
 minor: 7
-patch: 4
+patch: 5
 entry: mbs

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "yambs"
-version = "2.7.4"
+version = "2.7.5"
 description = "Yet another meta build-system."
 readme = "README.md"
 requires-python = ">=3.11"

setup.py

@@ -1,6 +1,6 @@
 # =====================================
 # generator=datazen
-# version=3.1.3
+# version=3.1.4
 # hash=f3af34a4b5815c617489419b194b30b5
 # =====================================
 

tasks/conf.py

@@ -1,6 +1,6 @@
 # =====================================
 # generator=datazen
-# version=3.1.3
+# version=3.1.4
 # hash=9f62028523c3b5a953733ca89dcc3018
 # =====================================
 """

tests/data/valid/scenarios/native/src/apps/test_app1.cc

@@ -34,6 +34,7 @@ int main(void) {
 
  Example4::method1();
  Example4::method2();
+ Example4::method3();
 
  return 0;
 }

tests/data/valid/scenarios/native/src/test.h

@@ -4,5 +4,6 @@ namespace Example4 {
 
 void method1(void);
 void method2(void);
+void method3(void);
 
 } // namespace Example4

tests/data/valid/scenarios/native/src_extra/method3.cc

@@ -0,0 +1,10 @@
+#include "test.h"
+
+namespace Example4 {
+
+void method3() {
+ method1();
+ method2();
+}
+
+} // namespace Example4

tests/data/valid/scenarios/native/yambs.yaml

@@ -4,16 +4,14 @@ cflag_groups:
  opt: [-O2]
 
 extra_dist: [extra]
+extra_sources: [src_extra]
 
 project:
  name: yambs
  github:
  owner: &self vkottler
 
 variants:
- debug:
- suffix: "-12"
-
  # Toggle this to test regeneration.
  # new_variant: {}
 

yambs/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
-# version=3.1.3
-# hash=aaab3e6d3985b3eaea023dad3c4aea9b
+# version=3.1.4
+# hash=ec366500d47c9484008309e85a10fb06
 # =====================================
 
 """
@@ -10,4 +10,4 @@
 
 DESCRIPTION = "Yet another meta build-system."
 PKG_NAME = "yambs"
-VERSION = "2.7.4"
+VERSION = "2.7.5"

yambs/__main__.py

@@ -1,6 +1,6 @@
 # =====================================
 # generator=datazen
-# version=3.1.3
+# version=3.1.4
 # hash=baa87aaac0a761679ca051feeebbec02
 # =====================================
 """

yambs/app.py

@@ -1,6 +1,6 @@
 # =====================================
 # generator=datazen
-# version=3.1.3
+# version=3.1.4
 # hash=4b61ad6ad675ba2556b5e4af32b9d400
 # =====================================
 

yambs/commands/all.py

@@ -1,6 +1,6 @@
 # =====================================
 # generator=datazen
-# version=3.1.3
+# version=3.1.4
 # hash=a579de7276b0c8f219e976ab8cc6a008
 # =====================================
 

yambs/data/schemas/config_common.yaml

@@ -35,6 +35,11 @@ properties:
  items:
  type: string
 
+ extra_sources:
+ type: array
+ items:
+ type: string
+
  project:
  $ref: package://yambs/schemas/Project.yaml
 

yambs/entry.py

@@ -1,6 +1,6 @@
 # =====================================
 # generator=datazen
-# version=3.1.3
+# version=3.1.4
 # hash=8fa30f62c899316f16c8a16146b7ef7e
 # =====================================
 

yambs/environment/native.py

@@ -10,6 +10,7 @@
 # third-party
 from vcorelib.io import ARBITER
 from vcorelib.logging import LoggerMixin
+from vcorelib.paths import Pathlike, normalize
 
 # internal
 from yambs.aggregation import collect_files, populate_sources, sources_headers
@@ -27,6 +28,13 @@ def resolve_build_dir(build_root: Path, variant: str, path: Path) -> Path:
  return build_root.joinpath(variant, path.relative_to(BUILD_DIR_PATH))
 
 
+def combine_if_not_absolute(root: Path, candidate: Pathlike) -> Path:
+ """https://github.com/vkottler/ifgen/blob/master/ifgen/paths.py"""
+
+ candidate = normalize(candidate)
+ return candidate if candidate.is_absolute() else root.joinpath(candidate)
+
+
 class NativeBuildEnvironment(LoggerMixin):
  """A class implementing a native-build environment."""
 
@@ -77,8 +85,11 @@ def write_third_party_line(
 
  out = None
 
- # Get the relative part of the path from the third-party root.
- rel_part = path.relative_to(self.config.third_party_root)
+ try:
+ # Get the relative part of the path from the third-party root.
+ rel_part = path.relative_to(self.config.third_party_root)
+ except ValueError:
+ rel_part = Path("..", path.relative_to(self.config.root))
 
  # Ignore applications.
  if APP_ROOT not in str(rel_part):
@@ -234,7 +245,10 @@ def generate(self, sources_only: bool = False) -> None:
  )
 
  # Handle additional source directories (belonging to dependencies).
- for path in self.dependency_manager.source_dirs:
+ for path in self.dependency_manager.source_dirs | {
+ combine_if_not_absolute(self.config.root, x)
+ for x in self.config.data.get("extra_sources", [])
+ }:
  collect_files(path, files=self.sources)
  populate_sources(
  self.sources,