scons-xo-exts-lib 1.0.0__tar.gz → 1.0.2__tar.gz

{scons_xo_exts_lib-1.0.0 → scons_xo_exts_lib-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scons-xo-exts-lib
-Version: 1.0.0
+Version: 1.0.2
 Summary: Scons extensions library by XGQT.
 Requires-Python: >=3.12
 Requires-Dist: scons>=4.8.1

scons_xo_exts_lib-1.0.2/src/scons_xo_exts_lib/Builders/dune.py

@@ -0,0 +1,109 @@
+#!/usr/bin/env python
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+import os
+import subprocess
+
+from SCons.Script import Builder
+from SCons.Script import Environment
+
+from scons_xo_exts_lib.BuildSupport import NodeMangling
+
+
+def _get_dune_project(source: list):
+    for source_node in source:
+        path = source_node.abspath
+
+        if "dune-project" in path:
+            return path
+
+    raise RuntimeError("No dune-project in specified sources")
+
+
+def _dune_command(env: Environment, args_string: str, cwd: str) -> int:
+    dune_exe = env.get("DUNE_EXE", "dune")
+    dune_flags = env.get("DUNE_FLAGS", "--display=short")
+
+    command = f"{dune_exe} {args_string} {dune_flags}"
+
+    result = subprocess.run(
+        args=command,
+        capture_output=False,
+        check=False,
+        cwd=cwd,
+        shell=True,
+    )
+
+    return result.returncode
+
+
+def _dune_get_install_prefix(target) -> str:
+    """
+    Guess the install prefix for "dune install --prefix=...".
+    """
+
+    separators = ["/bin/", "/lib/"]
+
+    target_node = NodeMangling.get_first_node(target)
+    path = str(target_node)
+
+    try:
+        for separator in separators:
+            if separator in path:
+                substrings = path.split(sep=separator, maxsplit=1)
+                prefix = substrings[0]
+
+                return os.path.abspath(prefix)
+
+        raise RuntimeError("Separator not found in target")
+
+    except Exception:
+        raise RuntimeError(f"Could not guess prefix, given: {path}")
+
+
+def dune_build_action(target, source, env) -> int:
+    dune_project = _get_dune_project(source=source)
+    dune_base_dir = os.path.dirname(dune_project)
+
+    result = _dune_command(
+        env=env,
+        args_string="build @install",
+        cwd=dune_base_dir,
+    )
+
+    return result
+
+
+def dune_image_action(target, source, env) -> int:
+    dune_project = _get_dune_project(source=source)
+    dune_base_dir = os.path.dirname(dune_project)
+
+    install_prefix = _dune_get_install_prefix(target=target)
+
+    result = _dune_command(
+        env=env,
+        args_string=f"install --prefix={install_prefix}",
+        cwd=dune_base_dir,
+    )
+
+    return result
+
+
+def generate(env: Environment) -> None:
+    dune_binary_builder = Builder(action=dune_build_action)
+    dune_image_builder = Builder(action=dune_image_action)
+
+    env.Append(
+        BUILDERS={
+            "DuneBinary": dune_binary_builder,
+            "DuneImage": dune_image_builder,
+        },
+    )
+
+
+def exists(env: Environment):
+    return env.Detect("dune")

{scons_xo_exts_lib-1.0.0 → scons_xo_exts_lib-1.0.2}/src/scons_xo_exts_lib/Builders/pandoc.py

@@ -19,7 +19,7 @@ def pandoc_action(target, source, env):
     inp = NodeMangling.get_first_node(source).abspath
     out = NodeMangling.get_first_node(target).abspath
 
-    cmd = f"{pandoc_exe} {pandoc_flags} -o {inp} {out}"
+    cmd = f"{pandoc_exe} {pandoc_flags} -o {out} {inp}"
     result = subprocess.run(
         args=cmd,
         capture_output=False,
@@ -31,9 +31,9 @@ def pandoc_action(target, source, env):
 
 
 def generate(env):
-    pandoc_binary_builder = Builder(action=pandoc_action)
+    pandoc_file_builder = Builder(action=pandoc_action)
 
-    env.Append(BUILDERS={"PandocFile": pandoc_binary_builder})
+    env.Append(BUILDERS={"PandocFile": pandoc_file_builder})
 
 
 def exists(env):

{scons_xo_exts_lib-1.0.0 → scons_xo_exts_lib-1.0.2}/src/scons_xo_exts_lib/Read.py

@@ -30,7 +30,7 @@ def read_line(file_path: str) -> str:
 
     lines = read_lines(file_path)
 
-    return lines[0]
+    return lines[0].strip()
 
 
 def read_version(base_path: str) -> str:

{scons_xo_exts_lib-1.0.0 → scons_xo_exts_lib-1.0.2}/src/scons_xo_exts_lib/__init__.py

@@ -4,5 +4,5 @@
 Scons extensions library by XGQT.
 """
 
-__version__ = "1.0.0"
+__version__ = "1.0.2"
 __description__ = "Scons extensions library by XGQT"

scons_xo_exts_lib-1.0.0/src/scons_xo_exts_lib/Builders/dune.py

@@ -1,51 +0,0 @@
-#!/usr/bin/env python
-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-import os
-import subprocess
-
-from SCons.Script import Builder
-from SCons.Script import Environment
-
-
-def _get_dune_project(sources: list):
-    for source in sources:
-        source_str = str(source)
-
-        if "dune-project" in source_str:
-            return source_str
-
-    raise RuntimeError("No dune-project in specified sources")
-
-
-def dune_build_action(target, source, env) -> int:
-    dune_project = _get_dune_project(sources=source)
-    dune_base_dir = os.path.dirname(dune_project)
-
-    dune_exe = env.get("DUNE_EXE", "dune")
-    dune_flags = env.get("DUNE_FLAGS", "--display=short")
-
-    cmd = f"{dune_exe} build {dune_flags} @install"
-    result = subprocess.run(
-        args=cmd,
-        capture_output=False,
-        check=False,
-        cwd=dune_base_dir,
-        shell=True,
-    )
-
-    return result.returncode
-
-
-def generate(env: Environment) -> None:
-    dune_binary_builder = Builder(action=dune_build_action)
-
-    env.Append(BUILDERS={"DuneBinary": dune_binary_builder})
-
-
-def exists(env: Environment):
-    return env.Detect("dune")