From 9d970ed03ddff7a20e3a3c44c19d7c6225f31519 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 2 Feb 2011 11:17:46 +0000 Subject: [PATCH] * ./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 --- crlcore/CMakeLists.txt | 7 ++-- crlcore/doc/CMakeLists.txt | 8 ++-- crlcore/doc/README.tex | 2 +- crlcore/doc/general-index.html | 61 +++++++++++++++++++++++++++++++ crlcore/src/ccore/Utilities.cpp | 6 +-- crlcore/src/cyclop/CMakeLists.txt | 14 +++++++ 6 files changed, 87 insertions(+), 11 deletions(-) create mode 100644 crlcore/doc/general-index.html diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt index 8c3e5bbb..f432b7f4 100644 --- a/crlcore/CMakeLists.txt +++ b/crlcore/CMakeLists.txt @@ -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) diff --git a/crlcore/doc/CMakeLists.txt b/crlcore/doc/CMakeLists.txt index d93a73e5..7f7c31cd 100644 --- a/crlcore/doc/CMakeLists.txt +++ b/crlcore/doc/CMakeLists.txt @@ -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) diff --git a/crlcore/doc/README.tex b/crlcore/doc/README.tex index 212a17c1..4f74fdc0 100644 --- a/crlcore/doc/README.tex +++ b/crlcore/doc/README.tex @@ -2,7 +2,7 @@ \documentclass[11pt]{article} \usepackage[T1]{fontenc} - \usepackage{ucs} + %\usepackage{ucs} \usepackage[utf8x]{inputenc} \usepackage{palatino} \usepackage{marvosym} diff --git a/crlcore/doc/general-index.html b/crlcore/doc/general-index.html new file mode 100644 index 00000000..27920d23 --- /dev/null +++ b/crlcore/doc/general-index.html @@ -0,0 +1,61 @@ + + + + Coriolis 2 Documentation + + + + + +

Coriolis 2 Documentation

+ + + + + + + + + + + + + + + + + + + + +
+
  • README
    + General README about Coriolis 2 +
+ 		+
  • STRATUS
    + Netlist Capture Language (Python) +
+
+ + +
  • DPGEN
    + Stratus Extension for Data-Pathes +
+
+
+ +
  • PATTERNS
    + Stratus Extension for Pattern generation +
+
+ + +
+ + + diff --git a/crlcore/src/ccore/Utilities.cpp b/crlcore/src/ccore/Utilities.cpp index 62f1b8e3..6e31acf6 100644 --- a/crlcore/src/ccore/Utilities.cpp +++ b/crlcore/src/ccore/Utilities.cpp @@ -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 +// +-----------------------------------------------------------------+ diff --git a/crlcore/src/cyclop/CMakeLists.txt b/crlcore/src/cyclop/CMakeLists.txt index e274f337..8c41910e 100644 --- a/crlcore/src/cyclop/CMakeLists.txt +++ b/crlcore/src/cyclop/CMakeLists.txt @@ -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 )