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

scons_xo_exts_lib/Builders/orgmode.py

@@ -8,11 +8,62 @@
 import os
 import subprocess
 
+from shutil import move
+
 from SCons.Script import Builder
 
 from scons_xo_exts_lib.BuildSupport import NodeMangling
 
 
+def _orgmode_extension_to_backend(file_extension: str) -> list[str]:
+    match file_extension:
+        case "info":
+            return "texinfo"
+        case "markdown":
+            return "md"
+        case "pdf":
+            return "latex"
+        case "texi":
+            return "texinfo"
+        case _:
+            return file_extension
+
+
+def _orgmode_extension_to_libraries(file_extension: str) -> list[str]:
+    elisp_libs = []
+
+    backend = _orgmode_extension_to_backend(file_extension=file_extension)
+
+    if backend != file_extension:
+        elisp_libs.append(f"ox-{backend}")
+
+    return elisp_libs
+
+
+def _orgmode_get_export_flags(target_file: str, source_file: str) -> str:
+    file_extension = os.path.splitext(target_file)[1][1:]
+    backend = _orgmode_extension_to_backend(file_extension=file_extension)
+
+    if file_extension == "texi":
+        fun = "org-texinfo-export-to-texinfo"
+    else:
+        fun = f"org-{backend}-export-to-{file_extension}"
+
+    load_elisp_libs = [
+        "org",
+        "ox-latex",
+    ]
+
+    extension_libs = _orgmode_extension_to_libraries(file_extension=file_extension)
+
+    load_elisp_libs.extend(extension_libs)
+
+    load_flags = " ".join([f"-l {s}" for s in load_elisp_libs])
+    flags = f"{load_flags} {source_file} -f {fun}"
+
+    return flags
+
+
 def orgmode_action(target, source, env):
     emacs_exe = env.get("EMACS_EXE", "emacs")
     emacs_exec_flags = env.get("EMACS_EXEC_FLAGS", "-batch -q --no-site-file")
@@ -22,13 +73,11 @@ def orgmode_action(target, source, env):
     inp = NodeMangling.get_first_node(source).abspath
     out = NodeMangling.get_first_node(target).abspath
 
-    ext = os.path.splitext(out)[1][1:]
-    fun = f'(org-export-to-file \'{ext} \\"{out}\\")'
-
-    load_flags = "-l org -l ox-latex"
-    flags = f'{emacs_exec_flags} {load_flags} {inp} --eval "{fun}"'
+    orgmode_flags = _orgmode_get_export_flags(target_file=out, source_file=inp)
+    flags = f"{emacs_exec_flags} {orgmode_flags}"
 
     cmd = f"{emacs_exe} {flags}"
+
     print(cmd)
 
     result = subprocess.run(
@@ -39,6 +88,14 @@ def orgmode_action(target, source, env):
         cwd=cwd,
     )
 
+    # When the target basename is different than export basename we have to do
+    # a file move.
+    if not os.path.exists(out):
+        out_extension = os.path.splitext(out)[1]
+        inp_basename = os.path.splitext(inp)[0]
+
+        move(f"{inp_basename}{out_extension}", out)
+
     return result.returncode
 
 

scons_xo_exts_lib/__init__.py

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

{scons_xo_exts_lib-1.1.0.dist-info → scons_xo_exts_lib-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scons-xo-exts-lib
-Version: 1.1.0
+Version: 1.2.0
 Summary: Scons extensions library by XGQT.
 Author-email: Maciej Barć <xgqt@xgqt.org>
 Requires-Python: >=3.12

{scons_xo_exts_lib-1.1.0.dist-info → scons_xo_exts_lib-1.2.0.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=2W-NIeph4qgWC0ZbhMMKIsE0f8s3nGZZQKYBJGHhi24,1050
-scons_xo_exts_lib/__init__.py,sha256=V1FJp26qXQhpZq5CZsurO3EvJdDKquvchPvZ-z3wME0,141
+scons_xo_exts_lib/__init__.py,sha256=YCFtUmKJgk8iQ0PRZ_ftYorGLAEmAZ_RpSXOijk5OgM,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
@@ -17,9 +17,9 @@ scons_xo_exts_lib/Builders/elixir.py,sha256=YBy68YzWkcjzUEe9WJNXv6MlqTS8V55C3jft
 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/orgmode.py,sha256=Vs1NJ8KU8PNntTjRDdQB3lZmk6dadXcyc22z4-5rqhY,2825
 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.2.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+scons_xo_exts_lib-1.2.0.dist-info/METADATA,sha256=120m0l_BGXA2Tk319_2P4Fxtd2xqy94orR9QwlLEjdw,1018
+scons_xo_exts_lib-1.2.0.dist-info/RECORD,,