riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

* ./crlcore: 

- New: Install a general index for the HTML documentation.
    - Bug: In cyclop CMakeLists, forgot to list all the needed libraries for
        the linker.
    - New: Support of Python installation layout under Ubuntu 10.04.
        lib/python2.6/dist-packages
This commit is contained in:
Jean-Paul Chaput 2011-02-02 11:17:46 +00:00
parent 9eb7b14bc5
commit 9d970ed03d
6 changed files with 87 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crlcore/CMakeLists.txt
View File

@ -3,18 +3,19 @@
cmake_minimum_required(VERSION 2.4.0)
OPTION(BUILD_DOC "Build the documentation (latex+doxygen)" OFF)
OPTION(BUILD_DOC "Build the documentation (latex+doxygen)" OFF)
list(INSERT CMAKE_MODULE_PATH 0 "$ENV{BOOTSTRAP_TOP}/share/cmake/Modules/")
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}/$ENV{BOOTSTRAP_TOP}/share/cmake/Modules/")
find_package(Bootstrap REQUIRED)
setup_project_paths(VLSISAPD)
setup_project_paths(CORIOLIS)
list(INSERT CMAKE_MODULE_PATH 0 "${CRLCORE_SOURCE_DIR}/cmake_modules/")
print_cmake_module_path()
setup_sysconfdir("$ENV{CORIOLIS_TOP}")
set_cmake_policies()
check_distribution()
set_lib_link_mode()
setup_sysconfdir("$ENV{CORIOLIS_TOP}")
setup_boost(program_options filesystem python regex)
find_package(LibXml2 REQUIRED)

8
crlcore/doc/CMakeLists.txt
View File

@ -11,7 +11,6 @@
latex_get_output_path ( output_dir )
#file ( COPY "${CMAKE_CURRENT_SOURCE_DIR}/SoC.css" DESTINATION "${output_dir}/README" )
make_directory ( "${output_dir}/README" )
execute_process ( COMMAND cp -r "${CMAKE_CURRENT_SOURCE_DIR}/SoC.css" "${output_dir}/README" )
@ -21,7 +20,8 @@
${output_dir}/README.pdf
DESTINATION ${latexInstallDir} )
install ( DIRECTORY ${output_dir}/README DESTINATION ${htmlInstallDir} )
install ( FILES general-index.html DESTINATION ${htmlInstallDir}/en RENAME index.html )
IF(DOXYGEN_FOUND)
add_subdirectory(doxygen)
ENDIF(DOXYGEN_FOUND)
#IF(DOXYGEN_FOUND)
# add_subdirectory(doxygen)
#ENDIF(DOXYGEN_FOUND)

2
crlcore/doc/README.tex
View File

@ -2,7 +2,7 @@
\documentclass[11pt]{article}
\usepackage[T1]{fontenc}
\usepackage{ucs}
%\usepackage{ucs}
\usepackage[utf8x]{inputenc}
\usepackage{palatino}
\usepackage{marvosym}

61
crlcore/doc/general-index.html Normal file
View File

@ -0,0 +1,61 @@
<html>
<head>
<title>Coriolis 2 Documentation</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta http-equiv="Content-Style-Type" content="text/css">
<link rel="stylesheet" href="./SoC.css">
</head>
<body>
<h1>Coriolis 2 Documentation</h1>
<table width=80% align="center">
<tr>
<td align="left">
<ul><li><a href="./README/index.html">R<small>EADME</small></a><br>
General README about Coriolis 2
</li></ul>
</td>
<td align="left">
<ul><li><a href="./en/html/stratus/index.html">S<small>TRATUS</small></a></br>
Netlist Capture Language (Python)
</li></ul>
</td>
</tr>
<tr>
<td align="left">
<ul><li><a href="./en/html/hurricane/index.html">H<small>URRICANE</small></a><br>
Hurricane Database
</li></ul>
</td>
<td align="left">
<ul><li><a href="./en/html/dpgen/index.html">D<small>P</small>G<small>EN</small></a><br>
Stratus Extension for Data-Pathes
</li></ul>
</td>
</tr>
<tr>
<td align="left">
</td>
</tr>
<tr>
<td align="left">
</td>
<td align="left">
<ul><li><a href="./en/html/patterns/index.html">P<small>ATTERNS</small></a><br>
Stratus Extension for Pattern generation
</li></ul>
</td>
</tr>
<tr>
<td align="left">
</td>
<td align="left">
<ul><li><a href="./en/html/stratus_developper/index.html">S<small>TRATUS</small> internals</a><br>
Stratus internal's Documentation
</li></ul>
</td>
</tr>
</table>
</body>
</html>

6
crlcore/src/ccore/Utilities.cpp
View File

@ -2,13 +2,13 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved
// Copyright (c) UPMC/LIP6 2008-2011, All Rights Reserved
//
// ===================================================================
//
// $Id$
//
// x-----------------------------------------------------------------x
// +-----------------------------------------------------------------+
// | |
// | C O R I O L I S |
// | Alliance / Hurricane Interface |
@ -20,7 +20,7 @@
// | *************************************************************** |
// | U p d a t e s |
// | |
// x-----------------------------------------------------------------x
// +-----------------------------------------------------------------+

14
crlcore/src/cyclop/CMakeLists.txt
View File

@ -20,6 +20,20 @@
add_executable ( cyclop ${cpps} ${MOCcpps} )
target_link_libraries ( cyclop crlcore
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES}
${BOOKSHELF_LIBRARY}
${AGDS_LIBRARY}
${CIF_LIBRARY}
${CONFIGURATION_LIBRARY}
${LEFDEF_LIBRARIES}
${OA_LIBRARIES}
${QT_LIBRARIES}
${Boost_LIBRARIES}
${PYTHON_LIBRARIES}
-lutil
${LIBXML2_LIBRARIES}
)
install ( TARGETS cyclop DESTINATION bin )