diff --git a/alliance/src/attila/doc/Makefile.am b/alliance/src/attila/doc/Makefile.am index 605823b2..ff3f0f18 100644 --- a/alliance/src/attila/doc/Makefile.am +++ b/alliance/src/attila/doc/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = attila +SUBDIRS = attila man1 pdfdir = $(prefix)/doc/pdf pdf_DATA = attila.pdf diff --git a/alliance/src/attila/doc/attila.pdf b/alliance/src/attila/doc/attila.pdf index 3dedfaf4..ad0fe82b 100644 Binary files a/alliance/src/attila/doc/attila.pdf and b/alliance/src/attila/doc/attila.pdf differ diff --git a/alliance/src/attila/doc/builddoc.sh b/alliance/src/attila/doc/builddoc.sh index 7a467bbe..bf1ede48 100755 --- a/alliance/src/attila/doc/builddoc.sh +++ b/alliance/src/attila/doc/builddoc.sh @@ -107,7 +107,7 @@ echo " - Building Makefile.am for doc dir." DOC_AM="Makefile.am" echo "" > $DOC_AM - echo "SUBDIRS = $TOOL" >> $DOC_AM + echo "SUBDIRS = $TOOL man1" >> $DOC_AM echo "" >> $DOC_AM echo "pdfdir = \$(prefix)/doc/pdf" >> $DOC_AM echo "pdf_DATA = $TOOL.pdf" >> $DOC_AM diff --git a/alliance/src/attila/src/attila.sh b/alliance/src/attila/src/attila.sh index 552b10c3..2ee8113f 100755 --- a/alliance/src/attila/src/attila.sh +++ b/alliance/src/attila/src/attila.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: attila.sh,v 1.7 2002/10/09 13:23:18 jpc Exp $ +# $Id: attila.sh,v 1.8 2002/10/13 19:39:33 jpc Exp $ # # /------------------------------------------------------------------\ # | | @@ -34,37 +34,51 @@ { echo "" echo "" - echo "Usage : attila [-h] [-U] [-F] [-A] \\" - echo " [--help] [--user] [--full] [--asim] \\" + echo "Usage : attila [-h] [-L] [-U] [-F] [-A] \\" + echo " [--help] [--local] [--user] [--full] [--asim] \\" echo " [--prefix=] [--builddir=] \\" - echo " <--tool= [--tool= [...]]" + echo " <--tool= [--tool= [...]] \\" + echo " [-c- [...]] \\" + echo " [-m- [...]] \\" + echo "" echo "" echo "Options :" - echo " o [-h|--help] : Print this help." - echo " o [-U|--user] : Perform a \"USER\" compilation/installation." + echo " o [-h|--help] : Print this help." + echo " o [-L|--local] : Print this help." + echo " o [-U|--user] :" + echo " Perform a \"USER\" compilation/installation." echo " The tool(s) will be compiled then installed under the" echo " directory given by the \"--prefix\" argument." - echo " o [-F|--full] : Compile/install the requested tool(s) for all" + echo " o [-F|--full] :" + echo " Compile/install the requested tool(s) for all" echo " avalaibles architectures. Currently only Linux and Solaris" echo " are supported." - echo " o [-A|--asim] : Install the tool(s) in the ASIM shared direc-" + echo " o [-A|--asim] :" + echo " Install the tool(s) in the ASIM shared direc-" echo " tory (aka \"\$ALLIANCE_TOP\"), this must be used to upgrade" echo " a tool. This option implies \"--full\"." echo " NOTE : it will erase any previous installed version of" echo " the tool. The temporary build directory (--builddir) will" echo " also be erased." - echo " o [--prefix=] : Override the default top directory" + echo " o [--prefix=] :" + echo " Override the default top directory" echo " where the tool will be installed. By defaults tools are" echo " installed under :" echo " \"\$HOME/alliance/\$OS/install\"." - echo " o [--builddir=] : Override the default top directory" + echo " o [--builddir=] :" + echo " Override the default top directory" echo " where the tool will be compiled. By defaults tools are" echo " compiled under :" echo " \"\$HOME/alliance/\$OS/build\"." - echo " o [--tool=] : The name of the tool to be processed, at" + echo " o [--tool=] :" + echo " The name of the tool to be processed, at" echo " least one must be present." - echo " o [--rule=] : The name of the rule to be executed by the" - echo " Makefile (default : \"install\")." + echo " o [-c- [...]] :" + echo " Arguments to be directly passed to configure." + echo " o [-m- [...]] :" + echo " Arguments to be directly passed to make. If there is none," + echo " the default rule for Alliance (i.e. \"install\") will be" + echo " called." echo "" echo "" } @@ -245,7 +259,7 @@ get_string() { - string=`echo $1 | cut -d '=' -f 2` + string=`echo $1 | cut -d '=' -f 2-` echo $string } @@ -448,8 +462,8 @@ cd $TOOL echo " - Making rule $RULE for $TOOL." - $SRC_DIR/$TOOL/configure --prefix=$INSTALL_DIR - $MAKE prefix=$INSTALL_DIR $RULE + $SRC_DIR/$TOOL/configure --prefix=$INSTALL_DIR $ARGS_CONFIGURE + $MAKE prefix=$INSTALL_DIR $ARGS_MAKE cd .. if [ "$ASIM" = "y" ]; then @@ -505,7 +519,9 @@ TOOLS="" - RULE="install" + ARGS_CONFIGURE="" + ARGS_MAKE="" + ARGS_MAKE_DEFAULT="install" ASIM="n" FULL="n" @@ -531,64 +547,80 @@ COMMAND_LINE="" + PARSE_STATE="attila" while [ $# -gt 0 ]; do - case $1 in - # Long arguments. - --help) print_help; - exit 0;; - --ssh) RSH="ssh";; - --user) ASIM="n";; - --full) FULL="y";; - --asim) ASIM="y"; FULL="y";; - --asim-noloop) ASIM="y";; - --local) ATTILA_LOCAL="y";; - --prefix=*) INSTALL_DIR=`get_string $1` - if [ $? -ne 0 ]; then - echo -n "attila: Bad directory in argument \"$1\"." - print_usage - exit 1 - fi;; - --builddir=*) BUILD_DIR=`get_string $1` - if [ $? -ne 0 ]; then - echo -n "attila: Bad directory in argument \"$1\"." - print_usage - exit 1 - fi;; - --tool=*) TOOL=`get_string $1` - if [ "$TOOL" = "attila" ]; then AUTO="attila"; fi - TOOLS="$TOOLS $TOOL" - if [ $? -ne 0 ]; then - echo -n "attila: Bad tool name in argument \"$1\"." - print_usage - exit 1 - fi;; - --rule=*) RULE=`get_string $1` - if [ $? -ne 0 ]; then - echo -n "attila: Bad rule name argument \"$1\"." - print_usage - exit 1 - fi;; + case $PARSE_STATE in - # Short arguments. - -*) SHORTS="$1"; NB=2; CH=`echo $SHORTS | cut -c$NB` + "attila") case $1 in + # Long arguments. + --help) print_help; + exit 0;; + --ssh) RSH="ssh";; + --user) ASIM="n";; + --full) FULL="y";; + --asim) ASIM="y"; FULL="y";; + --asim-noloop) ASIM="y";; + --local) ATTILA_LOCAL="y";; + --prefix=*) INSTALL_DIR=`get_string $1` + if [ $? -ne 0 ]; then + echo -n "attila: Bad directory in argument \"$1\"." + print_usage + exit 1 + fi;; + --builddir=*) BUILD_DIR=`get_string $1` + if [ $? -ne 0 ]; then + echo -n "attila: Bad directory in argument \"$1\"." + print_usage + exit 1 + fi;; + --tool=*) TOOL=`get_string $1` + if [ "$TOOL" = "attila" ]; then AUTO="attila"; fi + + TOOLS="$TOOLS $TOOL" + if [ $? -ne 0 ]; then + echo -n "attila: Bad tool name in argument \"$1\"." + print_usage + exit 1 + fi;; + -c-) PARSE_STATE="configure";; + -m-) PARSE_STATE="make";; + + # Short arguments. + -*) SHORTS="$1"; NB=2; CH=`echo $SHORTS | cut -c$NB` + + while [ "$CH" != "" ]; do + case $CH in + h) print_usage; exit 0;; + L) ATTILA_LOCAL="y";; + S) RSH="ssh";; + U) ASIM="n";; + F) FULL="y";; + A) ASIM="n"; FULL="y";; + + *) echo "attila:error: Invalid option \`$CH'." + print_usage; exit 1;; + esac + + NB=`expr $NB + 1` + CH=`echo $SHORTS | cut -c$NB` + done;; + esac;; - while [ "$CH" != "" ]; do - case $CH in - h) print_usage; exit 0;; - S) RSH="ssh";; - U) ASIM="n";; - F) FULL="y";; - A) ASIM="n"; FULL="y";; + "configure") case $1 in + "-m-") PARSE_STATE="make";; + "-c-") PARSE_STATE="configure";; + *) ARGS_CONFIGURE="$ARGS_CONFIGURE $1";; + esac;; + + "make") case $1 in + "-m-") PARSE_STATE="make";; + "-c-") PARSE_STATE="configure";; + *) ARGS_MAKE="$ARGS_MAKE $1";; + esac;; - *) echo "attila:error: Invalid option \`$CH'." - print_usage; exit 1;; - esac - NB=`expr $NB + 1` - CH=`echo $SHORTS | cut -c$NB` - done;; esac COMMAND_LINE="$COMMAND_LINE $1" @@ -611,6 +643,10 @@ BUILD_DIR=`echo $BUILD_DIR | sed "s,^$HOME/,,"` fi + if [ -z "$ARGS_MAKE" ]; then + ARGS_MAKE="$ARGS_MAKE_DEFAULT" + fi + # -------------------------------------------------------------------- # Do the work. @@ -632,12 +668,14 @@ ARGS="$ARGS --user" fi if [ "$ATTILA_LOCAL" = "y" ]; then ARGS="$ARGS --local"; fi - ARGS="$ARGS --rule=$RULE" for TOOL in $TOOLS; do ARGS="$ARGS --tool=$TOOL" done + if [ ! -z "$ARGS_CONFIGURE" ]; then ARGS="$ARGS -c- $ARGS_CONFIGURE"; fi + if [ ! -z "$ARGS_MAKE" ]; then ARGS="$ARGS -m- $ARGS_MAKE"; fi + ENVIRONMENT="" ENVIRONMENT="$ENVIRONMENT ALLIANCE_TOP=$ALLIANCE_TOP; export ALLIANCE_TOP;" diff --git a/alliance/src/nero/doc/Makefile.am b/alliance/src/nero/doc/Makefile.am index 4f86cb27..0c33137c 100644 --- a/alliance/src/nero/doc/Makefile.am +++ b/alliance/src/nero/doc/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = nero +SUBDIRS = nero man1 pdfdir = $(prefix)/doc/pdf pdf_DATA = nero.pdf diff --git a/alliance/src/nero/doc/builddoc.sh b/alliance/src/nero/doc/builddoc.sh index ae910ef0..3eb29099 100755 --- a/alliance/src/nero/doc/builddoc.sh +++ b/alliance/src/nero/doc/builddoc.sh @@ -107,7 +107,7 @@ echo " - Building Makefile.am for doc dir." DOC_AM="Makefile.am" echo "" > $DOC_AM - echo "SUBDIRS = $TOOL" >> $DOC_AM + echo "SUBDIRS = $TOOL man1" >> $DOC_AM echo "" >> $DOC_AM echo "pdfdir = \$(prefix)/doc/pdf" >> $DOC_AM echo "pdf_DATA = $TOOL.pdf" >> $DOC_AM diff --git a/alliance/src/nero/doc/man1/nero.1 b/alliance/src/nero/doc/man1/nero.1 index e3aa45ef..e13b1ea0 100644 --- a/alliance/src/nero/doc/man1/nero.1 +++ b/alliance/src/nero/doc/man1/nero.1 @@ -1,4 +1,4 @@ -.\\" auto-generated by docbook2man-spec $Revision: 1.3 $ +.\\" auto-generated by docbook2man-spec $Revision: 1.4 $ .TH "NERO" "1" "13 October 2002" "ASIM/LIP6" "Alliance - nero User's Manual" .SH NAME nero \- Negotiating Router @@ -6,7 +6,7 @@ nero \- Negotiating Router .sp \fBnero\fR [ \fB-h\fR ] [ \fB-v\fR ] [ \fB-V\fR ] [ \fB-c\fR ] [ \fB-2\fR ] [ \fB-3\fR ] [ \fB-4\fR ] [ \fB-5\fR ] [ \fB-6\fR ] [ \fB-L\fR ] [ \fB-G\fR ] [ \fB--help\fR ] [ \fB--verbose\fR ] [ \fB--very-verbose\fR ] [ \fB--core-dump\fR ] [ \fB--local\fR ] [ \fB--global\fR ] - [ \fB--place \fIplacement\fB\fR ] \fB\fInetlist\fB\fR \fB\fIlayout\fB\fR + [ \fB-p \fIplacement\fB\fR ] \fB\fInetlist\fB\fR \fB\fIlayout\fB\fR .SH "DESCRIPTION" .PP nero is a simple router suited for small diff --git a/alliance/src/nero/doc/man_nero.sgm b/alliance/src/nero/doc/man_nero.sgm index eb6ecdea..b8d6d106 100644 --- a/alliance/src/nero/doc/man_nero.sgm +++ b/alliance/src/nero/doc/man_nero.sgm @@ -37,7 +37,7 @@ --local --global - --place placement + -p placement netlist layout diff --git a/alliance/src/nero/doc/nero.pdf b/alliance/src/nero/doc/nero.pdf index 63b243be..aaf5c124 100644 Binary files a/alliance/src/nero/doc/nero.pdf and b/alliance/src/nero/doc/nero.pdf differ diff --git a/alliance/src/nero/doc/nero/man_nero.html b/alliance/src/nero/doc/nero/man_nero.html index b482b630..9469a792 100644 --- a/alliance/src/nero/doc/nero/man_nero.html +++ b/alliance/src/nero/doc/nero/man_nero.html @@ -82,7 +82,7 @@ NAME="AEN27">

nero [-h] [-v] [-V] [-c] [-2] [-3] [-4] [-5] [-6] [-L] [-G]
[--help] [--verbose] [--very-verbose] [--core-dump] [--local] [--global]
[--place [-h] [-v] [-V] [-c] [-2] [-3] [-4] [-5] [-6] [-L] [-G]
[--help] [--verbose] [--very-verbose] [--core-dump] [--local] [--global]
[-p placement