scons-xo-exts-lib 1.0.1__py3-none-any.whl → 1.1.0__py3-none-any.whl

scons_xo_exts_lib/BuildSupport/NodeMangling.py

@@ -11,9 +11,6 @@ import re
 
 def get_first_node(nodes):
     if isinstance(nodes, list):
-        if len(nodes) != 1:
-            raise ValueError("Given nodes is not a one-element list")
-
         return nodes[0]
 
     return nodes

scons_xo_exts_lib/Builders/bazel.py

@@ -17,6 +17,8 @@ def bazel_action(target, source, env):
     bazel_flags = env.get("BAZEL_FLAGS", "")
 
     cmd = f"{bazel_exe} build {bazel_flags} {bazel_pkgs}"
+    print(cmd)
+
     result = subprocess.run(
         args=cmd,
         capture_output=False,

scons_xo_exts_lib/Builders/cmake.py

@@ -17,6 +17,8 @@ def cmake_action(target, source, env):
     cmake_flags = env.get("CMAKE_FLAGS", "")
 
     cmd = f"{cmake_exe} {cmake_flags} {cmake_targets}"
+    print(cmd)
+
     result = subprocess.run(
         args=cmd,
         capture_output=False,

scons_xo_exts_lib/Builders/dotnet.py

@@ -54,10 +54,12 @@ def _dotnet_command(env: Environment, source, args: List[str]) -> None:
     subprocess_env.update(extra_variables)
 
     dotnet_exe = _dotnet_get_dotnet_exe(env=env)
-    subprocess_args = [dotnet_exe] + args
+
+    cmd = [dotnet_exe] + args
+    print(cmd)
 
     result = subprocess.run(
-        args=subprocess_args,
+        args=cmd,
         capture_output=False,
         check=False,
         cwd=source_directory,

scons_xo_exts_lib/Builders/dune.py

@@ -28,10 +28,11 @@ 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}"
+    cmd = f"{dune_exe} {args_string} {dune_flags}"
+    print(cmd)
 
     result = subprocess.run(
-        args=command,
+        args=cmd,
         capture_output=False,
         check=False,
         cwd=cwd,

scons_xo_exts_lib/Builders/elisp.py

@@ -8,6 +8,8 @@
 import os
 import subprocess
 
+from SCons.Node import FS
+
 from SCons.Script import Builder
 from SCons.Script import Environment
 
@@ -15,13 +17,24 @@ from scons_xo_exts_lib.BuildSupport import NodeMangling
 
 
 def _elisp_construct_load_path(sources: list) -> str:
+    """
+    :param sources: list of files to construct a load path from
+    :returns: Emacs load path command-line options
+    """
+
     load_path_flags: set[str] = set()
 
     for source in sources:
-        dir_name = os.path.dirname(str(source))
-        load_flag = f"-L {dir_name}"
+        if isinstance(source, FS.File):
+            dir_name = source.get_dir().relpath
+        else:
+            dir_name = os.path.dirname(str(source))
+
+        # Then check if the directory **really** exists.
+        if dir_name and os.path.exists(dir_name):
+            load_flag = f"-L {dir_name}"
 
-        load_path_flags.add(load_flag)
+            load_path_flags.add(load_flag)
 
     return " ".join(load_path_flags)
 
@@ -58,6 +71,8 @@ def elisp_autoloads_action(target, source, env) -> int:
     flags = f'--eval "({func})"'
 
     cmd = f"{base_args} {flags}"
+    print(cmd)
+
     result = subprocess.run(
         args=cmd,
         capture_output=False,
@@ -80,6 +95,8 @@ def elisp_binary_action(target, source, env) -> int:
     flags = f"{comp_flags} {load_path} -f {func}"
 
     cmd = f"{base_args} {flags} {srcs}"
+    print(cmd)
+
     result = subprocess.run(
         args=cmd,
         capture_output=False,

scons_xo_exts_lib/Builders/elixir.py

@@ -0,0 +1,67 @@
+#!/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_mix_project(source: list):
+    for source_node in source:
+        path = source_node.abspath
+
+        if "mix.exs" in path:
+            return path
+
+    raise RuntimeError("No mix-project in specified sources")
+
+
+def _mix_command(env: Environment, args_string: str, cwd: str) -> int:
+    mix_exe = env.get(key="MIX_EXE", default="mix")
+    mix_flags = env.get(key="MIX_FLAGS", default="")
+
+    cmd = f"{mix_exe} {args_string} {mix_flags}"
+    print(cmd)
+
+    result = subprocess.run(
+        args=cmd,
+        capture_output=False,
+        check=False,
+        cwd=cwd,
+        shell=True,
+    )
+
+    return result.returncode
+
+
+def elixir_build_action(target, source, env) -> int:
+    elixir_project = _get_mix_project(source=source)
+    elixir_base_dir = os.path.dirname(elixir_project)
+
+    result = _mix_command(
+        env=env,
+        args_string="escript.build",
+        cwd=elixir_base_dir,
+    )
+
+    return result
+
+
+def generate(env: Environment) -> None:
+    elixir_binary_builder = Builder(action=elixir_build_action)
+
+    env.Append(
+        BUILDERS={
+            "ElixirBinary": elixir_binary_builder,
+        },
+    )
+
+
+def exists(env: Environment):
+    return env.Detect("elixir")

scons_xo_exts_lib/Builders/make.py

@@ -17,6 +17,8 @@ def make_action(target, source, env):
     make_flags = env.get("MAKE_FLAGS", "")
 
     cmd = f"{make_exe} {make_flags} {make_targets}"
+    print(cmd)
+
     result = subprocess.run(
         args=cmd,
         capture_output=False,

scons_xo_exts_lib/Builders/meson.py

@@ -0,0 +1,44 @@
+#!/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_xo_exts_lib.BuildSupport import NodeMangling
+
+
+def meson_action(target, source, env):
+    source_dir = NodeMangling.get_first_directory(nodes=source)
+    builddir = NodeMangling.get_first_directory(nodes=target)
+
+    meson_exe = env.get("MESON_EXE", "meson")
+    meson_flags = env.get("MESON_FLAGS", "")
+
+    cmd = f"{meson_exe} setup --reconfigure {meson_flags} {builddir}"
+    print(cmd)
+
+    result = subprocess.run(
+        args=cmd,
+        cwd=source_dir,
+        capture_output=False,
+        check=False,
+        shell=True,
+    )
+
+    return result.returncode
+
+
+def generate(env):
+    meson_builddir_builder = Builder(action=meson_action)
+
+    env.Append(BUILDERS={"MesonBuilddir": meson_builddir_builder})
+
+
+def exists(env):
+    return env.Detect("meson")

scons_xo_exts_lib/Builders/ninja.py

@@ -9,16 +9,21 @@ import subprocess
 
 from SCons.Script import Builder
 
+from scons_xo_exts_lib.BuildSupport import NodeMangling
+
 
 def ninja_action(target, source, env):
-    ninja_targets = " ".join(str(t) for t in target)
+    source_dir = NodeMangling.get_first_directory(nodes=source)
 
     ninja_exe = env.get("NINJA_EXE", "ninja")
     ninja_flags = env.get("NINJA_FLAGS", "")
 
-    cmd = f"{ninja_exe} {ninja_flags} {ninja_targets}"
+    cmd = f"{ninja_exe} {ninja_flags} -C ."
+    print(cmd)
+
     result = subprocess.run(
         args=cmd,
+        cwd=source_dir,
         capture_output=False,
         check=False,
         shell=True,

scons_xo_exts_lib/Builders/orgmode.py

@@ -29,6 +29,8 @@ def orgmode_action(target, source, env):
     flags = f'{emacs_exec_flags} {load_flags} {inp} --eval "{fun}"'
 
     cmd = f"{emacs_exe} {flags}"
+    print(cmd)
+
     result = subprocess.run(
         args=cmd,
         capture_output=False,

scons_xo_exts_lib/Builders/pandoc.py

@@ -19,7 +19,9 @@ 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}"
+    print(cmd)
+
     result = subprocess.run(
         args=cmd,
         capture_output=False,
@@ -31,9 +33,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/Builders/racket.py

@@ -41,6 +41,7 @@ def _racket_raco(env: Environment, source_node, args: str) -> None:
 
     directory: str = NodeMangling.get_first_directory(source_node)
     cmd = f"{raco} {args}"
+    print(cmd)
 
     result = subprocess.run(
         args=cmd,

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.1"
+__version__ = "1.1.0"
 __description__ = "Scons extensions library by XGQT"

scons_xo_exts_lib-1.1.0.dist-info/METADATA

@@ -0,0 +1,39 @@
+Metadata-Version: 2.4
+Name: scons-xo-exts-lib
+Version: 1.1.0
+Summary: Scons extensions library by XGQT.
+Author-email: Maciej Barć <xgqt@xgqt.org>
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+Classifier: Environment :: Console
+Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Dist: scons>=4.8.1
+Project-URL: Home, https://gitlab.com/xgqt/xgqt-python-lib-scons-xo-exts/
+
+# SCons XO Exts
+
+SCons extensions
+
+## About
+
+Extensions for SCons, includes Python libraries and builders.
+
+## Repository
+
+Upstream repository is <https://gitlab.com/xgqt/xgqt-python-lib-scons-xo-exts/>.
+
+## Package
+
+Download from PYPI: <https://pypi.org/project/scons-xo-exts-lib/>.
+
+## License
+
+### Code
+
+Code in this project is licensed under the MPL, version 2.0.
+
+    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/.
+

scons_xo_exts_lib-1.1.0.dist-info/RECORD

@@ -0,0 +1,25 @@
+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=2W-NIeph4qgWC0ZbhMMKIsE0f8s3nGZZQKYBJGHhi24,1050
+scons_xo_exts_lib/__init__.py,sha256=V1FJp26qXQhpZq5CZsurO3EvJdDKquvchPvZ-z3wME0,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
+scons_xo_exts_lib/BuildSupport/NodeMangling.py,sha256=WJoGrBAtJP_XLNf12nVy1plnwuo4n4_5aY1Fddb0uxg,681
+scons_xo_exts_lib/BuildSupport/__init__.py,sha256=-JIt3g1eBf4bVQNNQd4JBeQNA7o0LK0W9tYKKX_r5s8,22
+scons_xo_exts_lib/Builders/__init__.py,sha256=-JIt3g1eBf4bVQNNQd4JBeQNA7o0LK0W9tYKKX_r5s8,22
+scons_xo_exts_lib/Builders/bazel.py,sha256=d70Aj0_CSOuSmQsjxpJaPcajNIEPAjdwt37B4gkKVu4,882
+scons_xo_exts_lib/Builders/cmake.py,sha256=fiUjoHibdDnJerX0QAxj3ZTTTsW8-nq2xNQ_W7TzRWo,879
+scons_xo_exts_lib/Builders/dotnet.py,sha256=TgeQxScdXQ4m9GHQy4ngiVXHTeoABke-eWuuUtl6SiQ,4418
+scons_xo_exts_lib/Builders/dune.py,sha256=EG3dXQD94Lc6rXHpcCe35d6z53C2AkkhoVEWoZ578PA,2688
+scons_xo_exts_lib/Builders/elisp.py,sha256=mGwUX4GUREXMbtGPGX936reZ9soxt4SQfBCNx8FteNk,3136
+scons_xo_exts_lib/Builders/elixir.py,sha256=YBy68YzWkcjzUEe9WJNXv6MlqTS8V55C3jftJVVGsLA,1532
+scons_xo_exts_lib/Builders/make.py,sha256=bmCli9168zTsTdZTY1v9SOI1HSOye-aOT0mnNg8cyzQ,864
+scons_xo_exts_lib/Builders/meson.py,sha256=f6sriAIsfqNJ8c0SAUs5EPBWFGvvQisnIHb8LCtkh20,1064
+scons_xo_exts_lib/Builders/ninja.py,sha256=5cI4siYvoxnScQuPvJzHWDqJ5he5FFdF7Euip774L_s,960
+scons_xo_exts_lib/Builders/orgmode.py,sha256=ahpwVOVfbJph6N-yrSlgaX9lMWhssKbZAzYyAe0ZMIU,1289
+scons_xo_exts_lib/Builders/pandoc.py,sha256=g3fxWNjIjnFT1XcKTOH_59Z34HAyOAi-OKkfSeDxr24,997
+scons_xo_exts_lib/Builders/racket.py,sha256=iqk_Di6SDB4N8GajjYZxyDLv8zvEW0MyQ2dNRFZBJQs,3186
+scons_xo_exts_lib-1.1.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+scons_xo_exts_lib-1.1.0.dist-info/METADATA,sha256=pKAwkgSUbjGKJckR-kC6Trja2ry0KfQoMzdOR8UEo-c,1018
+scons_xo_exts_lib-1.1.0.dist-info/RECORD,,

{scons_xo_exts_lib-1.0.1.dist-info → scons_xo_exts_lib-1.1.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.11.0
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any

scons_xo_exts_lib-1.0.1.dist-info/METADATA

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

scons_xo_exts_lib-1.0.1.dist-info/RECORD

@@ -1,23 +0,0 @@
-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=NI8aNGXEGdlP6U0bH9kKNrKOVF8GHDh2EsvsxxExrJc,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
-scons_xo_exts_lib/BuildSupport/NodeMangling.py,sha256=ynoh1GqQo1BHrNmlzugKsXHjlJkh9QuByGQAl8-UCdY,780
-scons_xo_exts_lib/BuildSupport/__init__.py,sha256=-JIt3g1eBf4bVQNNQd4JBeQNA7o0LK0W9tYKKX_r5s8,22
-scons_xo_exts_lib/Builders/__init__.py,sha256=-JIt3g1eBf4bVQNNQd4JBeQNA7o0LK0W9tYKKX_r5s8,22
-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=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/racket.py,sha256=yDj_YYtVk15SqrXrjLb8efbYjR8j6VGpLU2pYAVID5I,3171
-scons_xo_exts_lib-1.0.1.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
-scons_xo_exts_lib-1.0.1.dist-info/METADATA,sha256=jOoblyTTD5oYdT0i30R2yz6wlOrCq2fDW7rtJAEJs-s,156
-scons_xo_exts_lib-1.0.1.dist-info/RECORD,,