diff --git a/vlsisapd/doc/agds/agds.dox b/vlsisapd/doc/agds/agds.dox index d7e3e27b..6c88e557 100644 --- a/vlsisapd/doc/agds/agds.dox +++ b/vlsisapd/doc/agds/agds.dox @@ -38,13 +38,13 @@ \image latex transistorCif.pdf AGDS example layout width=.25\linewidth \subsection agdsC C++ - Here is the C++ code (\c mainAgds.cpp) used to generate the transistor.agds file. (Source is available in examples directory). - \include mainAgds.cpp + Here is the C++ code (\c driveAgds.cpp) used to generate the transistor.agds file. (Source is available in examples directory). + \include driveAgds.cpp \subsection agdsPython Python - Here is the Python code (\c testAgds.py) used to generate the transistor.agds file. (Source is available in examples directory). - \include testAgds.py + Here is the Python code (\c driveAgds.py) used to generate the transistor.agds file. (Source is available in examples directory). + \include driveAgds.py - \note In order to run the \c testAgds.py script, user must ensure that $PYTHONPATH variable points to the directory containing pyAGDS.so module. + \note In order to run the \c driveAgds.py script, user must ensure that $PYTHONPATH variable points to the directory containing pyAGDS.so module. */ diff --git a/vlsisapd/doc/cif/cif.dox b/vlsisapd/doc/cif/cif.dox index 562ceed7..8a0f6c62 100644 --- a/vlsisapd/doc/cif/cif.dox +++ b/vlsisapd/doc/cif/cif.dox @@ -26,12 +26,12 @@ \image latex transistorCif.pdf CIF example layout width=.25\linewidth \subsection cifC C++ - Here is the C++ code (\c mainCif.cpp) used to generate the transistor.cif file. (Source is available in examples directory). - \include mainCif.cpp + Here is the C++ code (\c driveCif.cpp) used to generate the transistor.cif file. (Source is available in examples directory). + \include driveCif.cpp \subsection cifPython Python - Here is the Python code (\c testCif.py) used to generate the transistor.cif file. (Source is available in examples directory). - \include testCif.py + Here is the Python code (\c driveCif.py) used to generate the transistor.cif file. (Source is available in examples directory). + \include driveCif.py - \note In order to run the \c testCif.py script, user must ensure that $PYTHONPATH variable points to the directory containing pyCIF.so module. + \note In order to run the \c driveCif.py script, user must ensure that $PYTHONPATH variable points to the directory containing pyCIF.so module. */ diff --git a/vlsisapd/examples/agds/CMakeLists.txt b/vlsisapd/examples/agds/CMakeLists.txt index cafa0fdf..f158a2d0 100644 --- a/vlsisapd/examples/agds/CMakeLists.txt +++ b/vlsisapd/examples/agds/CMakeLists.txt @@ -1 +1,2 @@ ADD_SUBDIRECTORY(cplusplus) +ADD_SUBDIRECTORY(python) diff --git a/vlsisapd/examples/agds/cplusplus/CMakeLists.txt b/vlsisapd/examples/agds/cplusplus/CMakeLists.txt index 9f1b315f..ced5790e 100644 --- a/vlsisapd/examples/agds/cplusplus/CMakeLists.txt +++ b/vlsisapd/examples/agds/cplusplus/CMakeLists.txt @@ -1,4 +1,5 @@ INCLUDE_DIRECTORIES ( ${VLSISAPD_SOURCE_DIR}/src/agds/src ) -ADD_EXECUTABLE ( testAgds mainAgds.cpp ) -TARGET_LINK_LIBRARIES ( testAgds agds ) # 'testAgds' is the name of the executable and 'agds' the name of the target library in agds/src/CMakeLists.txt -INSTALL ( TARGETS testAgds DESTINATION bin ) +ADD_EXECUTABLE ( driveAgds driveAgds.cpp ) +TARGET_LINK_LIBRARIES ( driveAgds agds ) # 'driveAgds' is the name of the executable and 'agds' the name of the target library in agds/src/CMakeLists.txt +INSTALL ( TARGETS driveAgds DESTINATION share/doc/coriolis2/examples/vlsisapd/agds ) +INSTALL ( FILES driveAgds.cpp DESTINATION share/doc/coriolis2/examples/vlsisapd/agds ) diff --git a/vlsisapd/examples/agds/cplusplus/mainAgds.cpp b/vlsisapd/examples/agds/cplusplus/driveAgds.cpp similarity index 100% rename from vlsisapd/examples/agds/cplusplus/mainAgds.cpp rename to vlsisapd/examples/agds/cplusplus/driveAgds.cpp diff --git a/vlsisapd/examples/agds/python/CMakeLists.txt b/vlsisapd/examples/agds/python/CMakeLists.txt new file mode 100644 index 00000000..4bbe1a4e --- /dev/null +++ b/vlsisapd/examples/agds/python/CMakeLists.txt @@ -0,0 +1 @@ +INSTALL ( FILES driveAgds.py DESTINATION share/doc/coriolis2/examples/vlsisapd/agds ) diff --git a/vlsisapd/examples/agds/python/testAgds.py b/vlsisapd/examples/agds/python/driveAgds.py similarity index 100% rename from vlsisapd/examples/agds/python/testAgds.py rename to vlsisapd/examples/agds/python/driveAgds.py diff --git a/vlsisapd/examples/cif/CMakeLists.txt b/vlsisapd/examples/cif/CMakeLists.txt index cafa0fdf..f158a2d0 100644 --- a/vlsisapd/examples/cif/CMakeLists.txt +++ b/vlsisapd/examples/cif/CMakeLists.txt @@ -1 +1,2 @@ ADD_SUBDIRECTORY(cplusplus) +ADD_SUBDIRECTORY(python) diff --git a/vlsisapd/examples/cif/cplusplus/CMakeLists.txt b/vlsisapd/examples/cif/cplusplus/CMakeLists.txt index c81abaf9..cb844611 100644 --- a/vlsisapd/examples/cif/cplusplus/CMakeLists.txt +++ b/vlsisapd/examples/cif/cplusplus/CMakeLists.txt @@ -1,4 +1,5 @@ INCLUDE_DIRECTORIES ( ${VLSISAPD_SOURCE_DIR}/src/cif/src ) -ADD_EXECUTABLE ( testCif mainCif.cpp ) -TARGET_LINK_LIBRARIES ( testCif cif ) # 'testCif' is the name of the executable and 'cif' the name of the target library in cif/src/CMakeLists.txt -INSTALL ( TARGETS testCif DESTINATION bin ) +ADD_EXECUTABLE ( driveCif driveCif.cpp ) +TARGET_LINK_LIBRARIES ( driveCif cif ) # 'driveCif' is the name of the executable and 'cif' the name of the target library in cif/src/CMakeLists.txt +INSTALL ( TARGETS driveCif DESTINATION share/doc/coriolis2/examples/vlsisapd/cif ) +INSTALL ( FILES driveCif.cpp DESTINATION share/doc/coriolis2/examples/vlsisapd/cif ) diff --git a/vlsisapd/examples/cif/cplusplus/mainCif.cpp b/vlsisapd/examples/cif/cplusplus/driveCif.cpp similarity index 100% rename from vlsisapd/examples/cif/cplusplus/mainCif.cpp rename to vlsisapd/examples/cif/cplusplus/driveCif.cpp diff --git a/vlsisapd/examples/cif/python/CMakeLists.txt b/vlsisapd/examples/cif/python/CMakeLists.txt new file mode 100644 index 00000000..8aee30b3 --- /dev/null +++ b/vlsisapd/examples/cif/python/CMakeLists.txt @@ -0,0 +1 @@ +INSTALL ( FILES driveCif.py DESTINATION share/doc/coriolis2/examples/vlsisapd/cif ) diff --git a/vlsisapd/examples/cif/python/testCif.py b/vlsisapd/examples/cif/python/driveCif.py similarity index 100% rename from vlsisapd/examples/cif/python/testCif.py rename to vlsisapd/examples/cif/python/driveCif.py