pyalamake 2.3.2__tar.gz → 2.4.0__tar.gz

{pyalamake-2.3.2/src/pyalamake.egg-info → pyalamake-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyalamake
-Version: 2.3.2
+Version: 2.4.0
 Summary: python module to generate Makefiles for arduino, GTest, C/C++, etc.
 Author-email: "J. Arrizza" <cppgent0@gmail.com>
 Maintainer-email: "J. Arrizza" <cppgent0@gmail.com>
@@ -19,6 +19,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: falcon-logger
+Requires-Dist: pyosal
 Dynamic: license-file
 
 * website: [Website](https://arrizza.com/pyalamake.html)
@@ -116,7 +117,7 @@ OK   do_arduino_install: install rc=0 Servo
   It will generate two files:
     * Makefile - a top level makefile that handles including the correct
     makefile for the current OS.
-    * One of Makefile.ubuntu, Makefile.macos, Makefile.win - the OS specific makefile
+    * One of Makefile.ubuntu, Makefile.macos, Makefile.msys2 - the OS specific makefile
 
 * run `make help` to confirm that all of the targets have been generated
 * run `make xx` to run build a specific target.

{pyalamake-2.3.2 → pyalamake-2.4.0}/README.md

@@ -93,7 +93,7 @@ OK   do_arduino_install: install rc=0 Servo
   It will generate two files:
     * Makefile - a top level makefile that handles including the correct
     makefile for the current OS.
-    * One of Makefile.ubuntu, Makefile.macos, Makefile.win - the OS specific makefile
+    * One of Makefile.ubuntu, Makefile.macos, Makefile.msys2 - the OS specific makefile
 
 * run `make help` to confirm that all of the targets have been generated
 * run `make xx` to run build a specific target.

{pyalamake-2.3.2 → pyalamake-2.4.0}/pyproject.toml

@@ -15,11 +15,12 @@ classifiers = [
 # additional packages to install
 dependencies = [
     'falcon-logger',
+    'pyosal',
 ]
 
 # common values
 name = 'pyalamake'
-version = '2.3.2'
+version = '2.4.0'
 requires-python = '>=3.9'
 authors = [{ name = 'J. Arrizza', email = 'cppgent0@gmail.com' }]
 maintainers = [

{pyalamake-2.3.2 → pyalamake-2.4.0}/setup.cfg

@@ -9,7 +9,7 @@ disable = C0114,C0115,C0116,C0415,R0801,R0903,R0912,R0913,R0917,W0511
 max-line-length = 140
 ignore = E266,E402,E731,E203
 statistics = True
-exclude = venv/*, pf_*, setup.py, debug/*, release/*
+exclude = venv/*, out/*, pf_*, setup.py, debug/*, release/*
 
 [coverage:run]
 omit = 

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/constants_version.py

@@ -6,4 +6,4 @@ from dataclasses import dataclass
 @dataclass
 class ConstantsVersion:
     ## current App version
-    version = '2.3.2'
+    version = '2.4.0'

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/gbl.py

@@ -1,5 +1,4 @@
-import os
-import sys
+from pyosal import pyosal
 
 
 # --------------------
@@ -24,18 +23,7 @@ class Gbl:
     ## constructor
     def __init__(self):
         ## holds the current OS name
-        self.os_name = 'unknown'
-        # NOTE: has to use os.path.isfile here since the current OS is unknown
-        if os.path.isfile('/sys/firmware/devicetree/base/model'):  # pragma: no cover
-            self.os_name = 'rpi'
-        elif sys.platform == 'win32':  # pragma: no cover
-            self.os_name = 'win'
-        elif sys.platform == 'darwin':  # pragma: no cover
-            self.os_name = 'macos'
-        elif sys.platform == 'linux':
-            self.os_name = 'ubuntu'
-        else:
-            print(f'unrecognized OS: "{sys.platform}"')  # pragma: no cover ; defence only
+        self.os_name = pyosal.os_name
 
     # --------------------
     ## override the default build directory name

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/osal.py

@@ -42,7 +42,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return C++ compiler
     @classmethod
     def cpp_compiler(cls):
-        if svc.gbl.os_name == 'macos':
+        if svc.pyosal.os_name == 'macos':
             comp = 'g++-15'
         else:
             comp = 'g++'
@@ -53,7 +53,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return C compiler
     @classmethod
     def c_compiler(cls):
-        if svc.gbl.os_name == 'macos':
+        if svc.pyosal.os_name == 'macos':
             comp = 'gcc-15'
         else:
             comp = 'gcc'
@@ -67,9 +67,9 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the root arduino directory
     @classmethod
     def arduino_root_dir(cls):
-        if svc.gbl.os_name == 'macos':
+        if svc.pyosal.os_name == 'macos':
             path = os.path.expanduser('~/Library/Arduino15')
-        elif svc.gbl.os_name == 'win':
+        elif svc.pyosal.os_name == 'msys2':
             path = os.path.expanduser('~/AppData/Local/Arduino15')
             path = path.replace('\\', '/')
         else:  # ubuntu
@@ -83,9 +83,10 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the root arduino library directory
     @classmethod
     def arduino_library_dir(cls):
-        if svc.gbl.os_name == 'macos':
+        # TODO use arduino_root_dir?
+        if svc.pyosal.os_name == 'macos':
             path = os.path.expanduser('~/Library/Arduino15/libraries')
-        elif svc.gbl.os_name == 'win':
+        elif svc.pyosal.os_name == 'msys2':
             path = os.path.expanduser('~/AppData/Local/Arduino15/libraries')
             path = path.replace('\\', '/')
         else:  # ubuntu
@@ -99,8 +100,8 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the arduino core's root source directory
     @classmethod
     def arduino_core_src_dir(cls):
-        # path = f'{cls.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.6/cores/arduino'
-        path = f'{cls.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.7/cores/arduino'
+        # TODO get these using arduinocli
+        path = f'{cls.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.8/cores/arduino'
         # do not fix_path()
         return path
 
@@ -110,11 +111,10 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the list of include directories
     @classmethod
     def arduino_core_includes(cls):
+        # TODO get these using arduinocli
         incs = [
-            # f'{cls.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.6/cores/arduino',
-            f'{cls.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.7/cores/arduino',
-            # f'{cls.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.6/variants/standard',
-            f'{cls.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.7/variants/standard',
+            f'{cls.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.8/cores/arduino',
+            f'{cls.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.8/variants/standard',
         ]
         # do not fix_path()
         return incs
@@ -125,6 +125,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the tools directory
     @classmethod
     def arduino_tools_dir(cls):
+        # TODO get this using arduinocli
         path = f'{cls.arduino_root_dir()}/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino7/bin'
         return path
 
@@ -134,7 +135,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the avrdude directory
     @classmethod
     def avrdude_dir(cls):
-        # path = f'{cls.arduino_root_dir()}/packages/arduino/tools/avrdude/6.3.0-arduino17/bin'
+        # TODO get this using arduinocli
         path = f'{cls.arduino_root_dir()}/packages/arduino/tools/avrdude/8.0.0-arduino1/bin'
         # do not fix_path()
         return path
@@ -145,7 +146,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the avrdude directory
     @classmethod
     def avrdude_conf_dir(cls):
-        # path = f'{cls.arduino_root_dir()}/packages/arduino/tools/avrdude/6.3.0-arduino17/etc'
+        # TODO get this using arduinocli
         path = f'{cls.arduino_root_dir()}/packages/arduino/tools/avrdude/8.0.0-arduino1/etc'
         # do not fix_path()
         return path
@@ -159,9 +160,9 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     @classmethod
     def gtest_includes(cls):
         incs = []
-        if svc.gbl.os_name == 'win':
+        if svc.pyosal.os_name == 'msys2':
             incs.append('c:/msys64/mingw64/include')
-        elif svc.gbl.os_name == 'macos':
+        elif svc.pyosal.os_name == 'macos':
             incs.append('/opt/homebrew/Cellar/googletest/1.17.0/include')
 
         # do not fix_path()
@@ -174,9 +175,9 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     @classmethod
     def gtest_link_dirs(cls):
         dirs = []
-        if svc.gbl.os_name == 'win':
+        if svc.pyosal.os_name == 'msys2':
             dirs.append('c:/msys64/mingw64/lib')
-        elif svc.gbl.os_name == 'macos':
+        elif svc.pyosal.os_name == 'macos':
             dirs.append('/opt/homebrew/Cellar/googletest/1.17.0/lib')
         # do not fix_path()
         return dirs
@@ -189,6 +190,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the list of include directories
     @classmethod
     def python_includes(cls):
+        svc.log.warn('@@>>@@ DEPRECATE: pyalamake.python_includes()')
         import sysconfig
 
         incs = [sysconfig.get_path('include')]
@@ -201,9 +203,10 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the list of link libraries
     @classmethod
     def python_link_libs(cls):
+        svc.log.warn('@@>>@@ DEPRECATE: pyalamake.python_link_libs()')
         import sysconfig
 
-        if svc.gbl.os_name == 'win':
+        if svc.pyosal.os_name == 'msys2':
             libs = [sysconfig.get_config_var('installed_base'), 'c:/msys64/mingw64/lib']
         else:
             libs = [sysconfig.get_config_var('LIBDIR')]
@@ -219,21 +222,27 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     ## default include path(s) for python when installed using vfox
     @property
     def vfox_python_includes(cls):
+        if svc.pyosal.os_name in ['msys2']:
+            return [f'{cls._home}/.vfox/cache/python/v-3.12.3/python-3.12.3/include']
         return [f'{cls._home}/.vfox/cache/python/v-3.12.3/python-3.12.3/include/python3.12']
 
     # --------------------
     ## default library path(s) for python when installed using vfox
     @property
     def vfox_python_link_dirs(cls):
+        if svc.pyosal.os_name in ['msys2']:
+            return [f'{cls._home}/.vfox/cache/python/v-3.12.3/python-3.12.3/libs']
         return [f'{cls._home}/.vfox/cache/python/v-3.12.3/python-3.12.3/lib']
 
     # --------------------
     ## default libraries for python when installed using vfox
     # ubuntu: not used
     # macos : needed
-    # win   : TODO
+    # win   : needed
     @property
     def vfox_python_libs(cls):
+        if svc.pyosal.os_name in ['msys2']:
+            return 'python312'
         return 'python3.12'
 
     # === ruby related
@@ -244,6 +253,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the list of include directories
     @classmethod
     def ruby_includes(cls):
+        svc.log.warn('@@>>@@ DEPRECATE: pyalamake.ruby_includes()')
         incs = [cls._get_ruby_inc1(), cls._get_ruby_inc2()]
 
         # do not fix_path()
@@ -255,17 +265,19 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return path
     @classmethod
     def _get_ruby_inc1(cls):
+        svc.log.warn('@@>>@@ DEPRECATE: pyalamake.ruby_inc1()')
         cmd = ['ruby', '-rrbconfig', '-e', 'puts RbConfig::CONFIG["rubyhdrdir"]']
         result = subprocess.run(cmd, capture_output=True, text=True, check=True, shell=False)
         lines = result.stdout.strip().splitlines()
         if lines:
             inc1 = lines[0].strip()
         else:
-            if svc.gbl.os_name == 'macos':
+            if svc.pyosal.os_name == 'macos':
                 inc1 = '/opt/homebrew/Cellar/ruby/3.3.5/include/ruby-3.3.0'
-            elif svc.gbl.os_name == 'ubuntu':
+            elif svc.pyosal.os_name == 'ubuntu':
                 inc1 = '/usr/include/ruby-3.2.0'
-            else:
+            else:  # 'msys2'
+                # TODO get from vfox
                 # TODO del; check if these work in msys2
                 #  C:/Ruby33-x64/include/ruby-3.3.0
                 inc1 = 'unknown_inc1'
@@ -277,17 +289,18 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return path
     @classmethod
     def _get_ruby_inc2(cls):
+        svc.log.warn('@@>>@@ DEPRECATE: pyalamake.ruby_inc2()')
         cmd = ['ruby', '-rrbconfig', '-e', 'puts RbConfig::CONFIG["rubyarchhdrdir"]']
         result = subprocess.run(cmd, capture_output=True, text=True, check=True, shell=False)
         lines = result.stdout.strip().splitlines()
         if lines:
             inc2 = lines[0].strip()
         else:
-            if svc.gbl.os_name == 'macos':
+            if svc.pyosal.os_name == 'macos':
                 inc2 = '/opt/homebrew/Cellar/ruby/3.3.5/include/ruby-3.3.0'
-            elif svc.gbl.os_name == 'ubuntu':
+            elif svc.pyosal.os_name == 'ubuntu':
                 inc2 = '/usr/include/x86_64-linux-gnu/ruby-3.2.0'
-            else:
+            else:  # 'wini'
                 inc2 = 'C:/ruby/include/ruby-3.3.0/x64-mingw-ucrt'
         return inc2
 
@@ -297,6 +310,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the list of link directories
     @classmethod
     def ruby_link_dirs(cls):
+        svc.log.warn('@@>>@@ DEPRECATE: pyalamake.ruby_link_dirs()')
         dirs = [cls._get_ruby_lib()]
 
         # do not fix_path()
@@ -308,14 +322,15 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return link library
     @classmethod
     def _get_ruby_lib(cls):
+        svc.log.warn('@@>>@@ DEPRECATE: pyalamake.get_ruby_lib()')
         cmd = ['ruby', '-rrbconfig', '-e', 'puts RbConfig::CONFIG["libdir"]']
         result = subprocess.run(cmd, capture_output=True, text=True, check=True, shell=False)
         lines = result.stdout.strip().splitlines()
         if lines:
             lib = lines[0].strip()
-        elif svc.gbl.os_name == 'macos':
+        elif svc.pyosal.os_name == 'macos':
             lib = '/opt/homebrew/Cellar/ruby/3.3.5/lib'
-        elif svc.gbl.os_name == 'win':
+        elif svc.pyosal.os_name == 'msys2':
             lib = 'C:/ruby/lib'
         else:  # ubuntu
             lib = '/usr/lib'
@@ -328,8 +343,9 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return the list of link libraries
     @classmethod
     def ruby_link_libs(cls):
+        svc.log.warn('@@>>@@ DEPRECATE: pyalamake.ruby_link_libs()')
         libs = []
-        if svc.gbl.os_name == 'win':
+        if svc.pyosal.os_name == 'msys2':
             libs.append('x64-ucrt-ruby330.dll')
         # do not fix_path()
         return libs
@@ -340,12 +356,15 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     def vfox_ruby_includes(cls):
         incs = []
         # these must be first:
-        if svc.gbl.os_name == 'ubuntu':
-            incs.append(f'{cls._home}/.vfox/cache/ruby/v-3.4.5/ruby-3.4.5/include/ruby-3.4.0/x86_64-linux')
-        elif svc.gbl.os_name == 'macos':
-            incs.append(f'{cls._home}/.vfox/cache/ruby/v-3.4.5/ruby-3.4.5/include/ruby-3.4.0/arm64-darwin20')
-
-        incs.append(f'{cls._home}/.vfox/cache/ruby/v-3.4.5/ruby-3.4.5/include/ruby-3.4.0')
+        root_dir = f'{cls._home}/.vfox/cache/ruby/v-3.4.5/ruby-3.4.5/include/ruby-3.4.0'
+        if svc.pyosal.os_name == 'ubuntu':
+            incs.append(f'{root_dir}/x86_64-linux')
+        elif svc.pyosal.os_name == 'macos':
+            incs.append(f'{root_dir}/arm64-darwin20')
+        elif svc.pyosal.os_name == 'msys2':
+            incs.append(f'{root_dir}//x64-mingw-ucrt')
+
+        incs.append(root_dir)
         return incs
 
     # --------------------
@@ -358,9 +377,14 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     ## default libraries for ruby when installed using vfox
     # ubuntu: not used
     # macos : needed
-    # win   : TODO
+    # win   : needed
     @property
     def vfox_ruby_libs(cls):
+        if svc.pyosal.os_name == 'msys2':
+            return 'x64-ucrt-ruby340.dll'
+        if svc.pyosal.os_name == 'ubuntu':
+            return 'ruby-static'
+        # macos:
         return 'ruby.3.4-static'
 
     # === nodejs related
@@ -370,17 +394,23 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     @property
     def vfox_nodejs_includes(cls):
         return [
-            f'{cls._home}/.vfox/cache/nodejs/v-21.5.0/nodejs-21.5.0/include/node',
+            f'{cls._home}/.vfox/cache/nodejs/v-24.16.0/nodejs-24.16.0/include/node',
         ]
 
+    # --------------------
+    ## default library path(s) for ruby when installed using vfox
+    @property
+    def vfox_nodejs_link_dirs(cls):
+        return [f'{cls._home}/.vfox/cache/nodejs/v-24.16.0/nodejs-24.16.0']
+
     # --------------------
     ## default libraries for ruby when installed using vfox
     # ubuntu: not used
     # macos : needed
-    # win   : TODO
+    # win   : needed
     @property
     def vfox_nodejs_libs(cls):
-        return 'ruby.3.4-static'
+        return 'node'
 
     # === utility functions
 
@@ -412,6 +442,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return rc, output lines
     @classmethod
     def run_cmd(cls, cmd):
+        svc.log.warn('@@>>@@ DEPRECATE: pyalamake.run_cmd()')
         result = subprocess.run(
             cmd,
             capture_output=True,  # Capture stdout and stderr
@@ -429,7 +460,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     def _unfix_path(cls, path):
         path = os.path.expanduser(path)
         path = svc.gbl.mf_variables.unfix_path(path)
-        if svc.gbl.os_name == 'win':
+        if svc.pyosal.os_name == 'msys2':
             # assumes there is only one character and it is for a drive letter
             # can only be done at the start of the path
             m = re.search(r'^/(.)/(.*)', path)

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/package_opengl.py

@@ -14,7 +14,7 @@ class PackageOpengl:
     def find(self, pkgname):
         svc.log.line(f'finding package: {pkgname}')
 
-        if svc.gbl.os_name == 'ubuntu':
+        if svc.pyosal.os_name == 'ubuntu':
             #
             @dataclass
             class OpenGl:
@@ -23,7 +23,7 @@ class PackageOpengl:
                 link_dir = []  # not needed
                 link_options = []  # not needed
 
-        elif svc.gbl.os_name == 'macos':
+        elif svc.pyosal.os_name == 'macos':
             # TODO use this for include_dir: brew --prefix freeglut
             @dataclass
             class OpenGl:

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/path_handle.py

@@ -16,7 +16,7 @@ class PathHandle:
 
         home = os.path.expanduser('~')
         home_pfx = home
-        if svc.gbl.os_name == 'win':
+        if svc.pyosal.os_name == 'msys2':
             home_pfx = home_pfx.replace('\\', '/')
             home_pfx = home_pfx.replace('//', '/')
 
@@ -32,7 +32,7 @@ class PathHandle:
         if self._embedded.startswith(home_pfx):
             # make the embedded paths more similar
             self._embedded = self._embedded.replace(home_pfx, 'os_home')
-        if svc.gbl.os_name == 'win':
+        if svc.pyosal.os_name == 'msys2':
             # convert "stuff/c:/xx" to stuff/c/xx
             # note: if the path starts with "c:/" then it is left as is
             # make can handle c:/abc/def format as long as it is at the start of the path

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/pyalamake.py

@@ -1,4 +1,5 @@
 from falcon_logger import FalconLogger
+from pyosal import pyosal
 
 from .arduino_shared import ArduinoShared
 from .compile_cmd_json import CompileCmdJson
@@ -22,6 +23,7 @@ class AlaMake:
         svc.gbl = Gbl()
         svc.gbl.mf_variables = MakefileVariables()
         svc.osal = Osal  # not an instance, it is the class
+        svc.pyosal = pyosal
 
         ## list of targets
         self._targets = []
@@ -46,25 +48,33 @@ class AlaMake:
     ## return True if OS is RPI
     @property
     def is_rpi(self):
-        return svc.gbl.os_name == 'rpi'
+        return svc.pyosal.os_name == 'rpi'
 
     # --------------------
-    ## return True if OS is Windows/Msys2
+    ## return True if OS is Window powershell (future)
     @property
     def is_win(self):
-        return svc.gbl.os_name == 'win'
+        # TODO deprecated
+        svc.log.warn('@@>>@@ DEPRECATED alamake.is_win; use is_msys2')
+        return svc.pyosal.os_name == 'msys2'
+
+    # --------------------
+    ## return True if OS is Msys2
+    @property
+    def is_msys2(self):
+        return svc.pyosal.os_name == 'msys2'
 
     # --------------------
     ## return True if OS is macoOS
     @property
     def is_macos(self):
-        return svc.gbl.os_name == 'macos'
+        return svc.pyosal.os_name == 'macos'
 
     # --------------------
     ## return True if OS is Ubuntu
     @property
     def is_ubuntu(self):
-        return svc.gbl.os_name == 'ubuntu'
+        return svc.pyosal.os_name == 'ubuntu'
 
     # --------------------
     ## return the version string for pyalamake
@@ -324,7 +334,7 @@ class AlaMake:
     # @param ut_path  (UT only) the path to the makefile to generate; default: Makefile
     # @return None
     def makefile(self, ut_path=None):
-        svc.log.start(f'generating makefile for OS {svc.gbl.os_name}...')
+        svc.log.start(f'generating makefile for OS {svc.pyosal.os_name}...')
 
         self._gather_targets()
 
@@ -332,7 +342,7 @@ class AlaMake:
         if ut_path:  # pragma: no cover ; only path used in UTs
             path = ut_path
         else:
-            path = f'Makefile.{svc.gbl.os_name}'  # pragma: no cover ; not used in UTs
+            path = f'Makefile.{svc.pyosal.os_name}'  # pragma: no cover ; not used in UTs
         svc.log.highlight(f'generating makefile {path}...')
         self._gen_variables()
         self._gen_rules()
@@ -486,11 +496,11 @@ class AlaMake:
         content += '    OS_NAME := $(shell  c:/msys64/usr/bin/uname.exe -s)\n'
         content += '    ifeq ($(findstring MINGW64,$(OS_NAME)),MINGW64)\n'
         content += '        PLATFORM := msys2\n'
-        content += '        include Makefile.win\n'
+        content += '        include Makefile.msys2\n'
         content += '    else ifeq ($(findstring MSYS,$(OS_NAME)),MSYS)\n'
         content += '        # for CLion\n'
         content += '        PLATFORM := msys2\n'
-        content += '        include Makefile.win\n'
+        content += '        include Makefile.msys2\n'
         content += '    else\n'
         content += '        # Handle other operating systems or raise an error\n'
         content += '        $(error Unsupported windows OS: "$(OS_NAME)")\n'

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/svc.py

@@ -10,6 +10,9 @@ class svc:  # pylint: disable=invalid-name
     ## holds OS Abstraction Layer
     osal = None
 
+    ## holds common OS commands
+    pyosal = None
+
     # --------------------
     ## abort the current script.
     # Note: do not use logging here since it may fail to write correctly
@@ -20,9 +23,13 @@ class svc:  # pylint: disable=invalid-name
     def abort(cls, msg='abort occurred, exiting'):
         if svc.log:
             svc.log.save()
-        import sys
 
-        print('')
-        print(f'ABRT {msg}')
-        sys.stdout.flush()
-        sys.exit(1)
+        if svc.pyosal:
+            svc.pyosal.abort(msg)
+        else:
+            import sys
+
+            print(f'ABRT {msg}')
+            sys.stdout.flush()
+            sys.stdout.buffer.flush()
+            sys.exit(1)

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/target_arduino.py

@@ -151,7 +151,7 @@ class TargetArduino(TargetBase):
     # @param _lib  unused
     # @return None
     def _add_pkg_wire(self, _lib):
-        path = PathHandle(f'{svc.osal.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.7/libraries/Wire/src')
+        path = PathHandle(f'{svc.osal.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.8/libraries/Wire/src')
         # built-in package, no installation
         self.add_sources(
             [
@@ -166,7 +166,7 @@ class TargetArduino(TargetBase):
     # @param _lib  unused
     # @return None
     def _add_pkg_spi(self, _lib):
-        path = PathHandle(f'{svc.osal.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.7/libraries/SPI/src')
+        path = PathHandle(f'{svc.osal.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.8/libraries/SPI/src')
         # built-in package, no installation
         self.add_sources(f'{path.fixed}/SPI.cpp')
         self.add_include_directories(path.fixed)  # pylint: disable=E1101

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/target_base.py

@@ -208,7 +208,7 @@ class TargetBase(TargetBaseMin):  # pylint: disable=too-many-instance-attributes
     #
     # @return None
     def add_homebrew(self):
-        if svc.gbl.os_name == 'macos':  # pragma: no cover ; only used on macos
+        if svc.pyosal.os_name == 'macos':  # pragma: no cover ; only used on macos
             self.add_link_directories(svc.osal.homebrew_link_dirs())  # pylint: disable=E1101
             self.add_include_directories(svc.osal.homebrew_inc_dirs())  # pylint: disable=E1101
 

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/target_c_cpp_lib_base.py

@@ -130,7 +130,7 @@ class TargetCCppLibBase(TargetBase):
 
             self._writeln(f'-include {mmd_inc_ph.fixed}')
             self._writeln(f'{obj_ph.fixed}: {src_file_ph.fixed}')
-            if self._lib_type == 'shared' and svc.gbl.os_name != 'win':
+            if self._lib_type == 'shared' and svc.pyosal.os_name != 'msys2':
                 fpic = '-fPIC '
             else:
                 fpic = ''
@@ -152,10 +152,10 @@ class TargetCCppLibBase(TargetBase):
         self.add_rule(rule)
         tgt_deps = f'{self.target}-init '
 
-        if svc.gbl.os_name == 'win':  # pragma: no cover ; used only on windows
+        if svc.pyosal.os_name == 'msys2':  # pragma: no cover ; used only on windows
             extension = 'dll'
             fpic = ''
-        elif svc.gbl.os_name == 'macos':
+        elif svc.pyosal.os_name == 'macos':
             fpic = ''
             if self._lib_type == 'bundle':
                 extension = 'bundle'

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/target_gtest.py

@@ -51,13 +51,13 @@ class TargetGtest(TargetBase):
 
         ## list of link libraries to add
         self.add_link_libraries(['gtest', 'pthread'])  # pylint: disable=E1101
-        if svc.gbl.os_name != 'macos':  # pragma: no cover ; only skipped on macos
+        if svc.pyosal.os_name != 'macos':  # pragma: no cover ; only skipped on macos
             self.add_link_libraries('gcov')  # pylint: disable=E1101
 
         ## list of link directories to add
         self.add_link_directories(svc.osal.gtest_link_dirs())  # pylint: disable=E1101
 
-        if svc.gbl.os_name == 'macos':  # pragma: no cover ; only used on macos
+        if svc.pyosal.os_name == 'macos':  # pragma: no cover ; only used on macos
             self.add_link_options('--coverage')
 
         ## list of coverage directories

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake/target_swig.py

@@ -58,7 +58,7 @@ class TargetSwig(TargetBase):
     # @return None
     def engine(self, arg):
         if arg == 'ruby':
-            self._engine = '-ruby'
+            self._engine = '-ruby -c++'
         elif arg == 'python':
             self._engine = '-python'
         elif arg == 'jsc':

{pyalamake-2.3.2 → pyalamake-2.4.0/src/pyalamake.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyalamake
-Version: 2.3.2
+Version: 2.4.0
 Summary: python module to generate Makefiles for arduino, GTest, C/C++, etc.
 Author-email: "J. Arrizza" <cppgent0@gmail.com>
 Maintainer-email: "J. Arrizza" <cppgent0@gmail.com>
@@ -19,6 +19,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: falcon-logger
+Requires-Dist: pyosal
 Dynamic: license-file
 
 * website: [Website](https://arrizza.com/pyalamake.html)
@@ -116,7 +117,7 @@ OK   do_arduino_install: install rc=0 Servo
   It will generate two files:
     * Makefile - a top level makefile that handles including the correct
     makefile for the current OS.
-    * One of Makefile.ubuntu, Makefile.macos, Makefile.win - the OS specific makefile
+    * One of Makefile.ubuntu, Makefile.macos, Makefile.msys2 - the OS specific makefile
 
 * run `make help` to confirm that all of the targets have been generated
 * run `make xx` to run build a specific target.

{pyalamake-2.3.2 → pyalamake-2.4.0}/src/pyalamake.egg-info/requires.txt

@@ -1 +1,2 @@
 falcon-logger
+pyosal