From d2209579ab8fa1cb7465cd7dcbbb49cdcd55918d Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Tue, 3 May 2016 13:32:06 +0200 Subject: [PATCH] Modify the init system to manage NDA restriced configuration files. --- .../etc/{ => 130}/hcmos9gp/technology.conf | 0 .../{ => 180}/scn6m_deep_09/technology.conf | 0 crlcore/etc/CMakeLists.txt | 7 ++--- crlcore/etc/c35b4/technology.conf | 29 ------------------ crlcore/etc/cmos065/technology.conf | 30 ------------------- crlcore/etc/techno.conf | 2 +- crlcore/python/helpers/__init__.py | 15 +++++++--- 7 files changed, 15 insertions(+), 68 deletions(-) rename crlcore/etc/{ => 130}/hcmos9gp/technology.conf (100%) rename crlcore/etc/{ => 180}/scn6m_deep_09/technology.conf (100%) delete mode 100644 crlcore/etc/c35b4/technology.conf delete mode 100644 crlcore/etc/cmos065/technology.conf diff --git a/crlcore/etc/hcmos9gp/technology.conf b/crlcore/etc/130/hcmos9gp/technology.conf similarity index 100% rename from crlcore/etc/hcmos9gp/technology.conf rename to crlcore/etc/130/hcmos9gp/technology.conf diff --git a/crlcore/etc/scn6m_deep_09/technology.conf b/crlcore/etc/180/scn6m_deep_09/technology.conf similarity index 100% rename from crlcore/etc/scn6m_deep_09/technology.conf rename to crlcore/etc/180/scn6m_deep_09/technology.conf diff --git a/crlcore/etc/CMakeLists.txt b/crlcore/etc/CMakeLists.txt index 6128eefc..bf6b0ab6 100644 --- a/crlcore/etc/CMakeLists.txt +++ b/crlcore/etc/CMakeLists.txt @@ -1,11 +1,10 @@ install ( FILES techno.conf DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( DIRECTORY common DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( DIRECTORY ispd05 DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( DIRECTORY cmos DESTINATION ${SYS_CONF_DIR}/coriolis2 ) + install ( DIRECTORY ispd05 DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( DIRECTORY vsc200 DESTINATION ${SYS_CONF_DIR}/coriolis2 ) install ( DIRECTORY scmos_deep_018 DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( DIRECTORY scn6m_deep_09 DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( DIRECTORY hcmos9gp DESTINATION ${SYS_CONF_DIR}/coriolis2 ) - install ( DIRECTORY cmos065 DESTINATION ${SYS_CONF_DIR}/coriolis2 ) + install ( DIRECTORY 180 DESTINATION ${SYS_CONF_DIR}/coriolis2 ) + install ( DIRECTORY 130 DESTINATION ${SYS_CONF_DIR}/coriolis2 ) diff --git a/crlcore/etc/c35b4/technology.conf b/crlcore/etc/c35b4/technology.conf deleted file mode 100644 index 7bb5b2b0..00000000 --- a/crlcore/etc/c35b4/technology.conf +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode:Python; explicit-buffer-name: "technology.conf" -*- -# -# AMS 0.35 microns. - -from Hurricane import DbU - - -technoConfig = { 'name' : 'c35b4' - , 'gridValue' : 0.025 - , 'gridUnit' : DbU.UnitPowerMicro - , 'gridsPerLambda': 24 - } - -gdsLayersTable = \ - ( ("nWell" , "NTUB" , 5) - , ("nImplant", "NPLUS" , 23) - , ("pImplant", "PPLUS" , 24) - , ("active" , "DIFF" , 10) - , ("poly" , "POLY1" , 20) - , ("cut0" , "CONT" , 34) - , ("metal1" , "MET1" , 35) - , ("cut1" , "VIA1" , 36) - , ("metal2" , "MET2" , 37) - , ("metcap" , "METCAP" , 55) - , ("cut2" , "VIA2" , 38) - , ("metal3" , "MET3" , 39) - , ("cut3" , "VIA3" , 41) - , ("metal4" , "MET4" , 42) - ) diff --git a/crlcore/etc/cmos065/technology.conf b/crlcore/etc/cmos065/technology.conf deleted file mode 100644 index 7d39a62e..00000000 --- a/crlcore/etc/cmos065/technology.conf +++ /dev/null @@ -1,30 +0,0 @@ -# -*- Mode:Python; explicit-buffer-name: "technology.conf" -*- - -from Hurricane import DbU - - -technoConfig = { 'name' : 'cmos065' - , 'gridValue' : 0.005 - , 'gridUnit' : DbU.UnitPowerMicro - , 'gridsPerLambda': 24 - } - -gdsLayersTable = \ - ( ("nWell" , "NWELL" , 3) - , ("nImplant", "NPLUS" , 26) - , ("pImplant", "PPLUS" , 25) - , ("active" , "ACTIVE" , 6) - , ("poly" , "POLY" , 17) - , ("cut0" , "C0" , 30) - , ("metal1" , "M1" , 31) - , ("cut1" , "VIA1X" , 51) - , ("metal2" , "M2X" , 32) - , ("cut2" , "VIA2X" , 52) - , ("metal3" , "M3X" , 33) - , ("cut3" , "VIA3X" , 53) - , ("metal4" , "M4X" , 34) - , ("cut4" , "VIA4X" , 54) - , ("metal5" , "M5X" , 35) - , ("cut5" , "VIA5X" , 55) - , ("metal6" , "M6X" , 36) - ) diff --git a/crlcore/etc/techno.conf b/crlcore/etc/techno.conf index 4eae5fc1..67f51417 100644 --- a/crlcore/etc/techno.conf +++ b/crlcore/etc/techno.conf @@ -1,4 +1,4 @@ # -*- Mode:Python -*- symbolicTechno = 'cmos' -realTechno = 'hcmos9gp' +realTechno = '130/hcmos9gp' diff --git a/crlcore/python/helpers/__init__.py b/crlcore/python/helpers/__init__.py index 77841a72..982139f2 100644 --- a/crlcore/python/helpers/__init__.py +++ b/crlcore/python/helpers/__init__.py @@ -26,9 +26,10 @@ import traceback import Hurricane sysConfDir = None +ndaConfDir = None symbolicTechno = 'cmos' symbolicDir = None -realTechno = 'hcmos9gp' +realTechno = '130/hcmos9gp' realDir = None tab = None _trace = None @@ -246,6 +247,7 @@ def setTraceLevel ( level ): def initTechno ( quiet ): + global ndaConfDir global realDir global realTechno global symbolicDir @@ -265,14 +267,19 @@ def initTechno ( quiet ): if moduleGlobals.has_key('symbolicTechnology'): symbolicTechno = symbolicTechnology else: - print '[WARNING] The symbolic technology name is not set. Using .' + print '[WARNING] The symbolic technology name is not set. Using <%s>.' % symbolicTechnology if moduleGlobals.has_key('realTechnology'): realTechno = realTechnology else: - print '[WARNING] The real technology name is not set. Using .' + print '[WARNING] The real technology name is not set. Using <%s>.' % realTechnology + + if moduleGlobals.has_key('NdaDirectory'): + ndaConfDir = os.path.join( NdaDirectory, 'etc/coriolis2' ) + else: + ndaConfDir = sysConfDir symbolicDir = os.path.join( sysConfDir, symbolicTechno ) - realDir = os.path.join( sysConfDir, realTechno ) + realDir = os.path.join( ndaConfDir, realTechno ) if not quiet: print ' - Technologies: %s+%s.' % (symbolicTechno,realTechno)