scons-xo-exts-lib 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

scons_xo_exts_lib/Builders/dune.py

@@ -11,40 +11,98 @@ import subprocess
 from SCons.Script import Builder
 from SCons.Script import Environment
 
+from scons_xo_exts_lib.BuildSupport import NodeMangling
 
-def _get_dune_project(sources: list):
-    for source in sources:
-        source_str = str(source)
 
-        if "dune-project" in source_str:
-            return source_str
+def _get_dune_project(source: list):
+    for source_node in source:
+        path = source_node.abspath
 
-    raise RuntimeError("No dune-project in specified sources")
+        if "dune-project" in path:
+            return path
 
+    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)
 
+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")
 
-    cmd = f"{dune_exe} build {dune_flags} @install"
+    command = f"{dune_exe} {args_string} {dune_flags}"
+
     result = subprocess.run(
-        args=cmd,
+        args=command,
         capture_output=False,
         check=False,
-        cwd=dune_base_dir,
+        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})
+    env.Append(
+        BUILDERS={
+            "DuneBinary": dune_binary_builder,
+            "DuneImage": dune_image_builder,
+        },
+    )
 
 
 def exists(env: Environment):

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/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/__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.dist-info → scons_xo_exts_lib-1.0.2.dist-info}/METADATA

@@ -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.0.dist-info → scons_xo_exts_lib-1.0.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 scons_xo_exts_lib/Find.py,sha256=J5VcXfBjg9kW_o4v8S3ugnv-JKAV6wzD6xrIw1jMerA,767
 scons_xo_exts_lib/GenericExtensions.py,sha256=c56PZZuDHdche-x1ERC6gIcIENAP8ZD20EQkxvTXAz4,916
-scons_xo_exts_lib/Read.py,sha256=sXnCuW1-gMX-MeIpCvx45N8Sqnr8Fb4UsJfGdB8reeA,1042
-scons_xo_exts_lib/__init__.py,sha256=Eza5CXe9vm2-z7K6-duPg2qiceQBWKD0uy6Dend33lY,141
+scons_xo_exts_lib/Read.py,sha256=2W-NIeph4qgWC0ZbhMMKIsE0f8s3nGZZQKYBJGHhi24,1050
+scons_xo_exts_lib/__init__.py,sha256=kmNr_DmHM8t3z9CTZP73klGl0_qiGbFTolYne__r6kM,141
 scons_xo_exts_lib/Actions/Uv.py,sha256=kdocY_tAvzA4awBs4f6djy4Hku4alXh_L7Vy7llNprY,1172
 scons_xo_exts_lib/Actions/__init__.py,sha256=-JIt3g1eBf4bVQNNQd4JBeQNA7o0LK0W9tYKKX_r5s8,22
 scons_xo_exts_lib/BuildSupport/Make.py,sha256=JG7Wi_G9vQeU9UyKTnN8D8akzmrhFYhsQH2zDmO1-u8,472
@@ -11,13 +11,13 @@ scons_xo_exts_lib/Builders/__init__.py,sha256=-JIt3g1eBf4bVQNNQd4JBeQNA7o0LK0W9t
 scons_xo_exts_lib/Builders/bazel.py,sha256=eFJZysWV4v63RapZI2Xg0S1FgDJfLbpYtGElx6qENj8,866
 scons_xo_exts_lib/Builders/cmake.py,sha256=FoWPK-GUv56aswFdrE6JWqtTIKE2oymPKi_C2ZmNHGo,863
 scons_xo_exts_lib/Builders/dotnet.py,sha256=AD-OGbQuvCd1LuJSDtfdCE1OOKB8NQ4_hujaEvfZMbk,4426
-scons_xo_exts_lib/Builders/dune.py,sha256=tO_gMTnEDanr4C9MDWG2CcggByWaaXCjYHyhDiH1pFY,1277
+scons_xo_exts_lib/Builders/dune.py,sha256=cdPwunYSKM_UCm_OD4nBv6wMDo_AHVoG8kt5TX_KCg4,2681
 scons_xo_exts_lib/Builders/elisp.py,sha256=T7j4z6mvCXz1gd9oPoOLqOiVE3YLoY3q6y5wwhZAw8U,2723
 scons_xo_exts_lib/Builders/make.py,sha256=fa_cZjR-lTVqFGLjm5EyDBwVxcaaZCL-2h_QKb6RCzU,848
 scons_xo_exts_lib/Builders/ninja.py,sha256=FEOMGfTbMWOE2cSlOu9FPXJjYw-uOCY2tfSM-5XFao4,863
 scons_xo_exts_lib/Builders/orgmode.py,sha256=iyu4O0xWWVZqx_LNhBb5i1Dt30iuE8VpwmmDNQSMJ4U,1273
-scons_xo_exts_lib/Builders/pandoc.py,sha256=CAPyV9K1gdL_XWFodXpw8bEiFhu2_CvV8qNHWdKbifA,985
+scons_xo_exts_lib/Builders/pandoc.py,sha256=XJO5RVReYTsaCnqzsIvgTYOQo7ylBWP3rkIrN2FrNKI,981
 scons_xo_exts_lib/Builders/racket.py,sha256=yDj_YYtVk15SqrXrjLb8efbYjR8j6VGpLU2pYAVID5I,3171
-scons_xo_exts_lib-1.0.0.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
-scons_xo_exts_lib-1.0.0.dist-info/METADATA,sha256=DbEXjnGDrH6ta2z9kKJJF6Dy4_wARbg55-QV5AXbxL4,156
-scons_xo_exts_lib-1.0.0.dist-info/RECORD,,
+scons_xo_exts_lib-1.0.2.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
+scons_xo_exts_lib-1.0.2.dist-info/METADATA,sha256=rOE3D8VLLXOn5JxP7IjVpwkPnfiIxN9a_9-p-Sh0WPo,156
+scons_xo_exts_lib-1.0.2.dist-info/RECORD,,