pyalamake 2.4.0__tar.gz → 2.4.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyalamake
-Version: 2.4.0
+Version: 2.4.2
 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>

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

@@ -20,7 +20,7 @@ dependencies = [
 
 # common values
 name = 'pyalamake'
-version = '2.4.0'
+version = '2.4.2'
 requires-python = '>=3.9'
 authors = [{ name = 'J. Arrizza', email = 'cppgent0@gmail.com' }]
 maintainers = [

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

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

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

@@ -94,6 +94,28 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
         # do not fix_path()
         return path
 
+    # --------------------
+    ## get the root of the arduino libraries
+    #
+    # @return the root arduino library directory
+    @classmethod
+    def arduino_avr_root_dir(cls):
+        # TODO get these using arduinocli
+        path = f'{cls.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.8'
+        # do not fix_path()
+        return path
+
+    # --------------------
+    ## get the library directory for arduino built-in libraries e.g. Wire
+    #
+    # @return the arduino built-in library root directory
+    @classmethod
+    def arduino_builtin_root_dir(cls):
+        # TODO get these using arduinocli
+        path = f'{cls.arduino_avr_root_dir()}/libraries'
+        # do not fix_path()
+        return path
+
     # --------------------
     ## get the library directory for arduino core source files
     #
@@ -101,7 +123,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     @classmethod
     def arduino_core_src_dir(cls):
         # TODO get these using arduinocli
-        path = f'{cls.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.8/cores/arduino'
+        path = f'{cls.arduino_avr_root_dir()}/cores/arduino'
         # do not fix_path()
         return path
 
@@ -113,8 +135,8 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     def arduino_core_includes(cls):
         # TODO get these using arduinocli
         incs = [
-            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',
+            cls.arduino_core_src_dir(),
+            f'{cls.arduino_avr_root_dir()}/variants/standard',
         ]
         # do not fix_path()
         return incs
@@ -129,6 +151,17 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
         path = f'{cls.arduino_root_dir()}/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino7/bin'
         return path
 
+    # --------------------
+    ## get the directory for avrdude.conf
+    #
+    # @return the avrdude directory
+    @classmethod
+    def avrdude_root_dir(cls):
+        # TODO get this using arduinocli
+        path = f'{cls.arduino_root_dir()}/packages/arduino/tools/avrdude/8.0.0-arduino1'
+        # do not fix_path()
+        return path
+
     # --------------------
     ## get the directory for avrdude.conf
     #
@@ -136,7 +169,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     @classmethod
     def avrdude_dir(cls):
         # TODO get this using arduinocli
-        path = f'{cls.arduino_root_dir()}/packages/arduino/tools/avrdude/8.0.0-arduino1/bin'
+        path = f'{cls.avrdude_root_dir()}/bin'
         # do not fix_path()
         return path
 
@@ -147,7 +180,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     @classmethod
     def avrdude_conf_dir(cls):
         # TODO get this using arduinocli
-        path = f'{cls.arduino_root_dir()}/packages/arduino/tools/avrdude/8.0.0-arduino1/etc'
+        path = f'{cls.avrdude_root_dir()}/etc'
         # do not fix_path()
         return path
 
@@ -190,7 +223,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()')
+        svc.log.warn('@@>>@@ !DEPRECATE!: pyalamake.python_includes()')
         import sysconfig
 
         incs = [sysconfig.get_path('include')]
@@ -203,7 +236,7 @@ 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()')
+        svc.log.warn('@@>>@@ !DEPRECATE!: pyalamake.python_link_libs()')
         import sysconfig
 
         if svc.pyosal.os_name == 'msys2':
@@ -253,7 +286,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()')
+        svc.log.warn('@@>>@@ !DEPRECATE!: pyalamake.ruby_includes()')
         incs = [cls._get_ruby_inc1(), cls._get_ruby_inc2()]
 
         # do not fix_path()
@@ -265,7 +298,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return path
     @classmethod
     def _get_ruby_inc1(cls):
-        svc.log.warn('@@>>@@ DEPRECATE: pyalamake.ruby_inc1()')
+        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()
@@ -289,7 +322,7 @@ class _MetaOsal(type):  # pylint: disable=too-many-public-methods
     # @return path
     @classmethod
     def _get_ruby_inc2(cls):
-        svc.log.warn('@@>>@@ DEPRECATE: pyalamake.ruby_inc2()')
+        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()
@@ -310,7 +343,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()')
+        svc.log.warn('@@>>@@ !DEPRECATE!: pyalamake.ruby_link_dirs()')
         dirs = [cls._get_ruby_lib()]
 
         # do not fix_path()
@@ -322,7 +355,7 @@ 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()')
+        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()
@@ -343,7 +376,7 @@ 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()')
+        svc.log.warn('@@>>@@ !DEPRECATE!: pyalamake.ruby_link_libs()')
         libs = []
         if svc.pyosal.os_name == 'msys2':
             libs.append('x64-ucrt-ruby330.dll')
@@ -442,7 +475,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()')
+        svc.log.warn('@@>>@@ !DEPRECATE!: pyalamake.run_cmd()')
         result = subprocess.run(
             cmd,
             capture_output=True,  # Capture stdout and stderr

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

@@ -55,7 +55,7 @@ class AlaMake:
     @property
     def is_win(self):
         # TODO deprecated
-        svc.log.warn('@@>>@@ DEPRECATED alamake.is_win; use is_msys2')
+        svc.log.warn('@@>>@@ !DEPRECATED! alamake.is_win; use is_msys2')
         return svc.pyosal.os_name == 'msys2'
 
     # --------------------

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyalamake
-Version: 2.4.0
+Version: 2.4.2
 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>