Merge pull request #40 from efabless/enable_local_dependencies

Added support for local dependencies
efabless · Mar 21, 2024 · b460606 · b460606
2 parents b6b0b4c + ce41756
commit b460606
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/cace/__version__.py b/cace/__version__.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-__version__ = '2.1.11'
+__version__ = '2.1.12'
 
 if __name__ == '__main__':
     print(__version__, end='')
diff --git a/cace/common/cace_read.py b/cace/common/cace_read.py
@@ -73,6 +73,7 @@ def cace_read(filename, debug=False):
     listkeys = [
         'conditions',
         'default_conditions',
+        'dependencies',
         'variables',
         'pins',
         'measure',

diff --git a/cace/common/cace_regenerate.py b/cace/common/cace_regenerate.py
@@ -913,7 +913,20 @@ def set_xschem_paths(dsheet, symbolpath, tclstr=None):
                 dependdir = os.path.join(
                     dependency['path'], dependency['name'], 'xschem'
                 )
-                tcllist.append('append XSCHEM_LIBRARY_PATH :' + dependdir)
+                if not os.path.isdir(dependdir):
+                    dependdir = os.path.join(
+                        dependency['path'], dependency['name']
+                    )
+                    if not os.path.isdir(dependdir):
+                        print(
+                            'Error:  Cannot find xschem library in '
+                            + dependency['name']
+                        )
+                        print('Current directory is: ' + os.getcwd())
+                        print('Dependdir is: ' + dependdir)
+                        dependdir = None
+                if dependdir:
+                    tcllist.append('append XSCHEM_LIBRARY_PATH :' + dependdir)
 
     return ' ; '.join(tcllist)