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

* ./crlcore: 

- Change: In Banner, use a wider cartouche.
    - Change: In README, small adjustments.
    - Packaging: Second try, svn 1470.
This commit is contained in:
Jean-Paul Chaput 2010-06-01 12:15:23 +00:00
parent 3fea4150e6
commit 4f0803096b
3 changed files with 54 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
crlcore/doc/README.tex
View File

@ -78,11 +78,15 @@
\newcommand {\RHELV} {\textsc{rhel 5}\xspace} \newcommand {\RHELV} {\textsc{rhel 5}\xspace}
\newcommand {\CentOSV} {\textsc{CentOS 5}\xspace} \newcommand {\CentOSV} {\textsc{CentOS 5}\xspace}
\newcommand {\SLV} {\textsc{SL 5}\xspace} \newcommand {\SLV} {\textsc{SL 5}\xspace}
\newcommand {\Fedora} {\textsc{Fedora}\xspace}
\newcommand {\FedoraXII} {\textsc{Fedora 12}\xspace} \newcommand {\FedoraXII} {\textsc{Fedora 12}\xspace}
\newcommand {\FedoraXIII} {\textsc{Fedora 13}\xspace} \newcommand {\FedoraXIII} {\textsc{Fedora 13}\xspace}
\newcommand {\Karmik} {\textsc{Ubuntu Karmik}\xspace} \newcommand {\Karmik} {\textsc{Ubuntu Karmik}\xspace}
\newcommand {\Lucid} {\textsc{Ubuntu Lucid}\xspace}
\newcommand {\QtIV} {\textsc{Qt 4}\xspace} \newcommand {\QtIV} {\textsc{Qt 4}\xspace}
\newcommand {\rpm} {\texttt{rpm}\xspace} \newcommand {\rpm} {\texttt{rpm}\xspace}
\newcommand {\alien} {\texttt{alien}\xspace}
\newcommand {\boost} {\texttt{boost}\xspace}
\newcommand {\tty} {\texttt{tty}\xspace} \newcommand {\tty} {\texttt{tty}\xspace}
\newcommand {\BoxRouter} {\textsc{BoxRouter}\xspace} \newcommand {\BoxRouter} {\textsc{BoxRouter}\xspace}
\newcommand {\BoxRouterRef} {\xhref{\BoxRouter}% \newcommand {\BoxRouterRef} {\xhref{\BoxRouter}%
@ -124,14 +128,14 @@
{\xhref{\texttt{http://www-soc.lip6.fr/en/users/damiendupuis/thesis/}}% {\xhref{\texttt{http://www-soc.lip6.fr/en/users/damiendupuis/thesis/}}%
{http://www-soc.lip6.fr/en/users/damiendupuis/thesis/}\xspace} {http://www-soc.lip6.fr/en/users/damiendupuis/thesis/}\xspace}
\newcommand {\coriolisIIfcXIIIirpm}{\crlFtpRef{coriolis2-1.0.1456-1.fc13.i686.rpm}\xspace} \newcommand {\coriolisIIfcXIIIirpm}{\crlFtpRef{coriolis2-1.0.1470-1.fc13.i686.rpm}\xspace}
\newcommand {\coriolisIIfcXIIIxrpm}{\crlFtpRef{coriolis2-1.0.1456-1.fc13.x86\_64.rpm}\xspace} \newcommand {\coriolisIIfcXIIIxrpm}{\crlFtpRef{coriolis2-1.0.1470-1.fc13.x86\_64.rpm}\xspace}
\newcommand {\coriolisIIfcXIIirpm} {\crlFtpRef{coriolis2-1.0.1456-1.fc12.i386.rpm}\xspace} \newcommand {\coriolisIIfcXIIirpm} {\crlFtpRef{coriolis2-1.0.1470-1.fc12.i686.rpm}\xspace}
\newcommand {\coriolisIIfcXIIxrpm} {\crlFtpRef{coriolis2-1.0.1456-1.fc12.x86\_64.rpm}\xspace} \newcommand {\coriolisIIfcXIIxrpm} {\crlFtpRef{coriolis2-1.0.1470-1.fc12.x86\_64.rpm}\xspace}
\newcommand {\coriolisIIslVirpm} {\crlFtpRef{coriolis2-1.0.1456-1.sl5\_soc.i386.rpm}\xspace} \newcommand {\coriolisIIslVirpm} {\crlFtpRef{coriolis2-1.0.1470-1.sl5\_soc.i386.rpm}\xspace}
\newcommand {\coriolisIIslVxrpm} {\crlFtpRef{coriolis2-1.0.1456-1.sl5\_soc.x86\_64.rpm}\xspace} \newcommand {\coriolisIIslVxrpm} {\crlFtpRef{coriolis2-1.0.1470-1.sl5\_soc.x86\_64.rpm}\xspace}
\newcommand {\coriolisIIkarmikideb}{\crlFtpRef{coriolis2\_1.0.1456-1\_sl5\_soc\_i386.deb}\xspace} \newcommand {\coriolisIILucidideb} {\crlFtpRef{coriolis2\_1.0.1470-1\_fc13\_i386.deb}\xspace}
\newcommand {\coriolisIIkarmikxdeb}{\crlFtpRef{coriolis2\_1.0.1456-1\_sl5\_soc\_x86\_64.deb}\xspace} \newcommand {\coriolisIILucidxdeb} {\crlFtpRef{coriolis2\_1.0.1470-1\_fc13\_amd64.deb}\xspace}
\newcommand {\qtIVsrpm} {\slSocSrpmsRef{qt4-4.5.0-8.sl5soc.src.rpm}\xspace} \newcommand {\qtIVsrpm} {\slSocSrpmsRef{qt4-4.5.0-8.sl5soc.src.rpm}\xspace}
\newcommand {\qtIVirpm} {\slRpmsiRef{qt4-4.5.0-8.sl5soc.i386.rpm}\xspace} \newcommand {\qtIVirpm} {\slRpmsiRef{qt4-4.5.0-8.sl5soc.i386.rpm}\xspace}
\newcommand {\qtIVdevelirpm} {\slRpmsiRef{qt4-devel-4.5.0-8.sl5soc.i386.rpm}\xspace} \newcommand {\qtIVdevelirpm} {\slRpmsiRef{qt4-devel-4.5.0-8.sl5soc.i386.rpm}\xspace}
@ -247,9 +251,10 @@
\section{Credits \& Licenses} \section{Credits \& Licenses}
\begin{center} \begin{center}
\Hurricane \dotfill\ Rémy \Escassut \& Christian \Masson \\ \Hurricane \dotfill\ Rémy \Escassut \& Christian \Masson \\
\Knik \dotfill Damien \Dupuis \\ \Knik \dotfill\ Damien \Dupuis \\
\Kite, \Viewer \dotfill Jean-Paul \Chaput \\ \Kite, \Viewer \dotfill\ Jean-Paul \Chaput \\
Software Engineering \dotfill\ Christophe \Alexandre \\
\end{center} \end{center}
The \Hurricane data-base is copyright\textcopyright\ \Bull 2000-2010 and is The \Hurricane data-base is copyright\textcopyright\ \Bull 2000-2010 and is
@ -266,7 +271,7 @@
\section{Release Notes} \section{Release Notes}
\subsection{Release 1.0.1456} \subsection{Release 1.0.1470}
This is the first preliminary release of the \CoriolisII framework. This is the first preliminary release of the \CoriolisII framework.
@ -299,22 +304,31 @@
\begin{center} \begin{center}
\begin{tabular}{|c|l|} \begin{tabular}{|c|l|}
\hline \hline
\FedoraXIII & \coriolisIIfcXIIIirpm \\ \FedoraXIII & \coriolisIIfcXIIIirpm \\
& \coriolisIIfcXIIIxrpm \\ & \coriolisIIfcXIIIxrpm \\
\hline \hline
\FedoraXII & \coriolisIIfcXIIirpm \\ \FedoraXII & \coriolisIIfcXIIirpm \\
& \coriolisIIfcXIIxrpm \\ & \coriolisIIfcXIIxrpm \\
\hline \hline
\RHELV & \coriolisIIslVirpm \\ \RHELV & \coriolisIIslVirpm \\
\CentOSV & \coriolisIIslVxrpm \\ \CentOSV & \coriolisIIslVxrpm \\
\SLV & \\ \SLV & \\
%\hline \hline
%\Karmik & \coriolisIIkarmikideb \\ \Lucid & \coriolisIILucidideb \\
% & \coriolisIIkarmikxdeb \\ & \coriolisIILucidxdeb \\
\hline \hline
\end{tabular} \end{tabular}
\end{center} \end{center}
\noindent\textbf{Note:}\ The \Lucid packages have not beeing natively
compiled but converted from \Fedora with \alien, they might not work as
well as under \Fedora. As they uses slightly different versions of \boost,
you have to create the following link~:
\begin{verbatim}
> sudo ln -s /usr/lib/libboost_program_options.so.1.40.0 \
/usr/lib/libboost_program_options-mt.so.1.41.0
\end{verbatim}
\newpage \newpage
For \RHELV based distributions, additionnal \QtIV packages are needed: For \RHELV based distributions, additionnal \QtIV packages are needed:

38
crlcore/src/ccore/Banner.cpp
View File

@ -321,16 +321,17 @@ namespace CRL {
, string date , string date
, string authors , string authors
, string contributors ) , string contributors )
: _name(name) : _name (name)
, _version(version) , _version (version)
, _purpose(purpose) , _purpose (purpose)
, _date(date) , _date (date)
, _authors(authors) , _authors (authors)
, _contributors(contributors) , _contributors (contributors)
, _screenWidth(80) , _screenWidth (80)
, _font(BannerFont::getBannerFont("Unknown_Bold_Normal_14")) , _cartoucheWidth(64)
, _lines(NULL) , _font (BannerFont::getBannerFont("Unknown_Bold_Normal_14"))
, _banner() , _lines (NULL)
, _banner ()
{ {
_redraw (); _redraw ();
} }
@ -381,7 +382,7 @@ namespace CRL {
_banner << "\n" << head << _purpose << "\n"; _banner << "\n" << head << _purpose << "\n";
} }
half = ( _screenWidth - 44 ) / 2; half = ( _screenWidth - _cartoucheWidth ) / 2;
head.clear (); head.clear ();
head.append ( half, ' ' ); head.append ( half, ' ' );
@ -389,7 +390,7 @@ namespace CRL {
if ( _version.size() ) { if ( _version.size() ) {
string nameVersion = _name + " " + _version; string nameVersion = _name + " " + _version;
_banner << "\n" << head << "Coriolis CAD System 1.0," _banner << "\n" << head << "Coriolis CAD System 1.0,"
<< setw(19) << nameVersion; << setw(_cartoucheWidth-25) << nameVersion;
} }
// Date. // Date.
@ -397,7 +398,8 @@ namespace CRL {
time_t t; time_t t;
time(&t); time(&t);
_banner << "\n" << head << "Copyright (c) " << _date _banner << "\n" << head << "Copyright (c) " << _date
<< "-" << localtime(&t)->tm_year+1900 << ", ASIM/LIP6/UPMC"; << "-" << localtime(&t)->tm_year+1900 << ","
<< setw(_cartoucheWidth-25) << "SoC/LIP6/UPMC";
} }
// Authors. // Authors.
@ -413,9 +415,9 @@ namespace CRL {
author = _authors.substr ( start , tail-start ); author = _authors.substr ( start , tail-start );
if ( !token ) if ( !token )
_banner << "\n" << head << "Author(s) :" << setw(32) << author; _banner << "\n" << head << "Author(s):" << setw(_cartoucheWidth-11) << author;
else else
_banner << "\n" << head << setw(43) << author; _banner << "\n" << head << setw(_cartoucheWidth-1) << author;
} }
} }
} }
@ -433,15 +435,15 @@ namespace CRL {
contributor = _contributors.substr ( start , tail-start ); contributor = _contributors.substr ( start , tail-start );
if ( !token ) if ( !token )
_banner << "\n" << head << "Contributors(s) :" << setw(26) << contributor; _banner << "\n" << head << "Contributors(s):" << setw(_cartoucheWidth-17) << contributor;
else else
_banner << "\n" << head << setw(43) << contributor; _banner << "\n" << head << setw(_cartoucheWidth-1) << contributor;
} }
} }
} }
// E-mail. // E-mail.
_banner << "\n" << head << "E-mail : coriolis-cvs@asim.lip6.fr"; _banner << "\n" << head << "E-mail:" << setw(_cartoucheWidth-8) << "coriolis-cvs@asim.lip6.fr";
// Separate the banner from the following text. // Separate the banner from the following text.
_banner << "\n"; _banner << "\n";

1
crlcore/src/ccore/crlcore/Banner.h
View File

@ -192,6 +192,7 @@ namespace CRL {
string _authors; string _authors;
string _contributors; string _contributors;
unsigned int _screenWidth; unsigned int _screenWidth;
size_t _cartoucheWidth;
const BannerFont* _font; const BannerFont* _font;
string* _lines; string* _lines;
ostringstream _banner; ostringstream _banner;