pyalamake 2.2.0__tar.gz → 2.2.2__tar.gz

{pyalamake-2.2.0/src/pyalamake.egg-info → pyalamake-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyalamake
-Version: 2.2.0
+Version: 2.2.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.2.0 → pyalamake-2.2.2}/pyproject.toml

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

{pyalamake-2.2.0 → pyalamake-2.2.2}/src/pyalamake/compile_cmd_json.py

@@ -155,6 +155,20 @@ class _CompileCmdJson(CompileCmdJsonBase):
                 # first token is the command
                 token = self._get_full_path(token)
 
+            # print(f'@@@ line2: "{token}"')
+            if token.find('$(') != -1:
+                # print(f'@@@ line2 before: "{token}"')
+                m = re.search(r'\$\((.*?)\)', token)
+                val = svc.gbl.mf_variables.get_value(m.group(1))
+                # print(f'@@@ line2 val   : "{val}"')
+                token = token.replace(f'$({m.group(1)})', val)
+                # print(f'@@@ line2 after: {token}')
+
+            if token.startswith('-I/'):
+                # TODO how to check if the value is a system directory or not??
+                # currently assumes if the path starts with '/' then it is a system include
+                token = token.replace('-I', '-isystem')
+
             tokens.append(token)
         self._curr_cmd['arguments'] = tokens
 
@@ -164,9 +178,13 @@ class _CompileCmdJson(CompileCmdJsonBase):
     # @param cmd  the command to get info about
     # @return None
     def _get_full_path(self, cmd):
-        if cmd.startswith('$'):
-            m = re.match(r'\$\((.*)\)', cmd)
+        # print(f'@@@ get_full_path: {cmd}')
+
+        if cmd.find('$(') != -1:
+            # print(f'@@@ get_full_path before: {cmd}')
+            m = re.match(r'\$\((.*?)\)', cmd)
             cmd = svc.gbl.mf_variables.get_value(m.group(1))
+            # print(f'@@@ get_full_path after : {cmd}')
 
         result = subprocess.run(
             f'which {cmd}',
@@ -175,4 +193,5 @@ class _CompileCmdJson(CompileCmdJsonBase):
             text=True,  # Decode output as string
             check=True,
         )  # Raise error for non-zero exit codes
+        # print(f'@@@ get_full_path stdout: {result.stdout.strip()}')
         return result.stdout.strip()

{pyalamake-2.2.0 → pyalamake-2.2.2}/src/pyalamake/constants_version.py

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

{pyalamake-2.2.0 → pyalamake-2.2.2}/src/pyalamake/target_arduino.py

@@ -179,9 +179,14 @@ class TargetArduino(TargetBase):
 
             self._writeln(f'-include {PathHandle(mmd_inc).fixed}')
             self._writeln(f'{obj_ph.fixed}: {file_ph.fixed}')
-            self._writeln(
-                f'\t{self._shared.cpp} {self._shared.cpp_opts} {self._compile_opts} {self._inc_dirs} {file_ph.fixed} -o {obj_ph.fixed}'
-            )
+            if file.endswith('.c'):
+                compiler = self._shared.cc
+                compiler_opts = self._shared.cc_opts
+            else:
+                compiler = self._shared.cpp
+                compiler_opts = self._shared.cpp_opts
+
+            self._writeln(f'\t{compiler} {compiler_opts} {self._compile_opts} {self._inc_dirs} {file_ph.fixed} -o {obj_ph.fixed}')
             self._app_deps += f'{obj_ph.fixed} '
             build_deps += f'{file_ph.fixed} '
 

{pyalamake-2.2.0 → pyalamake-2.2.2/src/pyalamake.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyalamake
-Version: 2.2.0
+Version: 2.2.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>