From: Jock Tanner <tanner.of.kha@gmail.com>
Date: Fri, 20 Mar 2020 14:00:27 +0000 (+0000)
Subject: Update according to the latest check toolkit.
X-Git-Tag: partial-core-ls180-gdsii~162
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c8ed73f3a18e9dd8dc8478da5be4c8b12f3a987b;p=soclayout.git

Update according to the latest check toolkit.
---

diff --git a/experiments7/Makefile b/experiments7/Makefile
index 37e242d..d3c8e31 100755
--- a/experiments7/Makefile
+++ b/experiments7/Makefile
@@ -14,6 +14,9 @@
 
  include ./mk/design-flow.mk
 
+alu16_r.ap alu16_r.vst: alu16.vst
+	-@echo "Overriding rules to generate layout by doAlu16.py custom script."
+	-$(call scl_cols,$(call c2env, ./doAlu16.py))
 
 blif:      alu16.blif
 vst:       alu16.vst
diff --git a/experiments7/coriolis2/settings.py b/experiments7/coriolis2/settings.py
index 864dcba..b4f7c85 100644
--- a/experiments7/coriolis2/settings.py
+++ b/experiments7/coriolis2/settings.py
@@ -1,7 +1,5 @@
 # -*- Mode:Python -*-
-from __future__ import print_function
 
-import os
 import Cfg
 import CRL
 import Viewer
@@ -32,21 +30,8 @@ Cfg.getParamInt('katana.vTracksReservedLocal').setInt(6)
 
 Cfg.Configuration.popDefaultPriority()
 
-if os.environ.has_key('CELLS_TOP'):
-    cellsTop = os.environ['CELLS_TOP']
-else:
-    cellsTop = '../../../cells'
-
 af = CRL.AllianceFramework.get()
 env = af.getEnvironment()
-env.addSYSTEM_LIBRARY(
-  library=cellsTop + '/nsxlib', mode=CRL.Environment.Prepend
-)
-env.addSYSTEM_LIBRARY(
-  library=cellsTop + '/mpxlib', mode=CRL.Environment.Prepend
-)
 env.setCLOCK('^clk$|m_clock')
 env.setPOWER('vdd')
 env.setGROUND('vss')
-
-print('Successfully read user configuration')
diff --git a/experiments7/doAlu16.py b/experiments7/doAlu16.py
index 9ac210b..17d7b3e 100755
--- a/experiments7/doAlu16.py
+++ b/experiments7/doAlu16.py
@@ -370,6 +370,7 @@ def alu16(editor=None, **kwargs):
 
     result = place_and_route(cell)
 
+    cell.setName(cell.getName()+'_r')
     af.saveCell(cell, CRL.Catalog.State.Views)
     RSavePlugin.ScriptMain(editor=editor, **kwargs)