From eeda81f746d391c4787145d0dbda97792ee2238a Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 20 Jun 2021 11:21:50 +0200 Subject: [PATCH] Move deprectated version of Spice parser/driver out of the way. --- crlcore/src/ccore/CMakeLists.txt | 13 ++++++------- crlcore/src/ccore/ParsersDrivers.cpp | 6 +++--- crlcore/src/ccore/{spice => spice-old}/Spice.cpp | 0 crlcore/src/ccore/{spice => spice-old}/Spice.h | 0 .../src/ccore/{spice => spice-old}/SpiceCommons.h | 0 .../src/ccore/{spice => spice-old}/SpiceDriver.cpp | 0 .../src/ccore/{spice => spice-old}/SpiceDriver.h | 0 .../src/ccore/{spice => spice-old}/SpiceParser.cpp | 0 .../src/ccore/{spice => spice-old}/SpiceParser.h | 0 9 files changed, 9 insertions(+), 10 deletions(-) rename crlcore/src/ccore/{spice => spice-old}/Spice.cpp (100%) rename crlcore/src/ccore/{spice => spice-old}/Spice.h (100%) rename crlcore/src/ccore/{spice => spice-old}/SpiceCommons.h (100%) rename crlcore/src/ccore/{spice => spice-old}/SpiceDriver.cpp (100%) rename crlcore/src/ccore/{spice => spice-old}/SpiceDriver.h (100%) rename crlcore/src/ccore/{spice => spice-old}/SpiceParser.cpp (100%) rename crlcore/src/ccore/{spice => spice-old}/SpiceParser.h (100%) diff --git a/crlcore/src/ccore/CMakeLists.txt b/crlcore/src/ccore/CMakeLists.txt index 3ed2f839..728e51cd 100644 --- a/crlcore/src/ccore/CMakeLists.txt +++ b/crlcore/src/ccore/CMakeLists.txt @@ -20,13 +20,12 @@ ${CRLCORE_SOURCE_DIR}/src/ccore/ispd04 ${CRLCORE_SOURCE_DIR}/src/ccore/ispd05 ${CRLCORE_SOURCE_DIR}/src/ccore/iccad04 - ${CRLCORE_SOURCE_DIR}/src/ccore/cspice + #${CRLCORE_SOURCE_DIR}/src/ccore/cspice ${CRLCORE_SOURCE_DIR}/src/ccore/lefdef ${CRLCORE_SOURCE_DIR}/src/ccore/blif ${CRLCORE_SOURCE_DIR}/src/ccore/alliance/ap ${CRLCORE_SOURCE_DIR}/src/ccore/alliance/vst ${CRLCORE_SOURCE_DIR}/src/ccore/cif - ${CRLCORE_SOURCE_DIR}/src/ccore/spice ${CRLCORE_SOURCE_DIR}/src/ccore/liberty ${CRLCORE_SOURCE_DIR}/src/ccore/toolbox ${HURRICANE_INCLUDE_DIR} @@ -106,10 +105,10 @@ ToolEngine.cpp GraphicToolEngine.cpp ) - set ( spice_cpps spice/SpiceParser.cpp - spice/SpiceDriver.cpp - spice/Spice.cpp - ) + #set ( spice_cpps spice/SpiceParser.cpp + # spice/SpiceDriver.cpp + # spice/Spice.cpp + # ) set ( bookshelf_cpps bookshelf/BookshelfParser.cpp bookshelf/BookshelfDriver.cpp ) @@ -297,7 +296,7 @@ ${ispd04_cpps} ${ispd05_cpps} ${blif_cpps} - ${spice_cpps} + #${spice_cpps} ${lefdef_cpps} ${openaccess_cpps} ) diff --git a/crlcore/src/ccore/ParsersDrivers.cpp b/crlcore/src/ccore/ParsersDrivers.cpp index d69ecd56..60e3db0f 100644 --- a/crlcore/src/ccore/ParsersDrivers.cpp +++ b/crlcore/src/ccore/ParsersDrivers.cpp @@ -21,7 +21,7 @@ #include "crlcore/ParsersDrivers.h" #include "Ap.h" #include "Vst.h" -#include "Spice.h" +//#include "Spice.h" #include "openaccess/OpenAccess.h" @@ -171,7 +171,7 @@ namespace CRL { registerSlot ( "vst" , (CellParser_t*)vstParser , "vbe" ); //registerSlot ( "vst" , (CellParser_t*)vstParser , "vhd" ); //registerSlot ( "vst" , (CellParser_t*)vstParser , "vhdl" ); - registerSlot ( "spi" , (CellParser_t*)spiceParser , "spi" ); + //registerSlot ( "spi" , (CellParser_t*)spiceParser , "spi" ); registerSlot ( "oa" , (CellParser_t*)OpenAccess::oaCellParser , "oa" ); //registerSlot ( "oa" , (LibraryParser_t*)OpenAccess::oaLibParser, "oa" ); } @@ -283,7 +283,7 @@ namespace CRL { registerSlot ( "ap" , (CellDriver_t*)apDriver , "ap" ); registerSlot ( "vst", (CellDriver_t*)vstDriver , "vst" ); //registerSlot ( "def", (CellDriver_t*)defDriver , "def" ); - registerSlot ( "spi", (CellDriver_t*)spiceDriver , "spi" ); + //registerSlot ( "spi", (CellDriver_t*)spiceDriver , "spi" ); //registerSlot ( "oa" , (CellDriver_t*)OpenAccess::oaDriver, "oa"); } diff --git a/crlcore/src/ccore/spice/Spice.cpp b/crlcore/src/ccore/spice-old/Spice.cpp similarity index 100% rename from crlcore/src/ccore/spice/Spice.cpp rename to crlcore/src/ccore/spice-old/Spice.cpp diff --git a/crlcore/src/ccore/spice/Spice.h b/crlcore/src/ccore/spice-old/Spice.h similarity index 100% rename from crlcore/src/ccore/spice/Spice.h rename to crlcore/src/ccore/spice-old/Spice.h diff --git a/crlcore/src/ccore/spice/SpiceCommons.h b/crlcore/src/ccore/spice-old/SpiceCommons.h similarity index 100% rename from crlcore/src/ccore/spice/SpiceCommons.h rename to crlcore/src/ccore/spice-old/SpiceCommons.h diff --git a/crlcore/src/ccore/spice/SpiceDriver.cpp b/crlcore/src/ccore/spice-old/SpiceDriver.cpp similarity index 100% rename from crlcore/src/ccore/spice/SpiceDriver.cpp rename to crlcore/src/ccore/spice-old/SpiceDriver.cpp diff --git a/crlcore/src/ccore/spice/SpiceDriver.h b/crlcore/src/ccore/spice-old/SpiceDriver.h similarity index 100% rename from crlcore/src/ccore/spice/SpiceDriver.h rename to crlcore/src/ccore/spice-old/SpiceDriver.h diff --git a/crlcore/src/ccore/spice/SpiceParser.cpp b/crlcore/src/ccore/spice-old/SpiceParser.cpp similarity index 100% rename from crlcore/src/ccore/spice/SpiceParser.cpp rename to crlcore/src/ccore/spice-old/SpiceParser.cpp diff --git a/crlcore/src/ccore/spice/SpiceParser.h b/crlcore/src/ccore/spice-old/SpiceParser.h similarity index 100% rename from crlcore/src/ccore/spice/SpiceParser.h rename to crlcore/src/ccore/spice-old/SpiceParser.h