* attila/src/attila.sh :

- Ajout de l'argument "--rule=<rulename>" pour pouvoir executer n'importe quelle regle et pas seulement "install" ("uninstall" peut etre pratique... - Modif de la doc en consequence. * attila/doc/builddoc.sh : - Un petit bug sur la preservation des repertoires CVS de la doc html et du man.
2002-10-01 14:02:11 +00:00 · 2002-10-01 14:02:11 +00:00 · 5f124293be
parent e3ccbfdf67
commit 5f124293be
7 changed files with 157 additions and 19 deletions
--- a/alliance/src/attila/doc/Makefile.am
+++ b/alliance/src/attila/doc/Makefile.am
@ -1,10 +1,10 @@

-SUBDIRS = attila man1
+SUBDIRS = attila

 pdfdir = $(prefix)/doc/pdf
 pdf_DATA = attila.pdf

 EXTRA_DIST = $(pdf_DATA) \
-             ./man_attila.sgm \
-             ./attila.sgm
+             ./attila.sgm \
+             ./man_attila.sgm

--- a/alliance/src/attila/doc/attila.pdf
+++ b/alliance/src/attila/doc/attila.pdf
--- a/alliance/src/attila/doc/attila/man_attila.html
+++ b/alliance/src/attila/doc/attila/man_attila.html
@ -102,12 +102,17 @@ CLASS="REPLACEABLE"
 ><I
 >name2</I
 ></TT
->...]</P
+>...]<BR> {--rule=<TT
+CLASS="REPLACEABLE"
+><I
+>rulename</I
+></TT
+>}</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN50"
+NAME="AEN53"
 ></A
 ><H2
 > Description </H2
@ -197,6 +202,18 @@ CLASS="LITERAL"
 ><P
 > Run <TT
 CLASS="LITERAL"
+>autostuff</TT
+> for the tool in the
+          <TT
+CLASS="LITERAL"
+>~/alliance/src</TT
+> directory.
+          </P
+></LI
+><LI
+><P
+> Run <TT
+CLASS="LITERAL"
 >configure</TT
 > in the build
          directory (see below).
@ -263,7 +280,7 @@ VALIGN="TOP"
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN84"
+NAME="AEN91"
 ></A
 ><H3
 > Directory Structure </H3
@ -345,7 +362,7 @@ CLASS="LITERAL"
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN108"
+NAME="AEN115"
 ></A
 ><H3
 > CVS checkout </H3
@ -409,7 +426,7 @@ CLASS="LITERAL"
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN129"
+NAME="AEN136"
 ></A
 ><H3
 > Guessing <TT
@ -456,7 +473,7 @@ CLASS="LITERAL"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN142"
+NAME="AEN149"
 ></A
 ><H2
 > Guessing <TT
@ -557,7 +574,7 @@ CLASS="LITERAL"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN163"
+NAME="AEN170"
 ></A
 ><H2
 > Arguments </H2
@ -714,6 +731,36 @@ CLASS="FILENAME"
        name of the tool to be installed.
        </P
 ></LI
+><LI
+><P
+> <TT
+CLASS="USERINPUT"
+><B
+>--rule=<TT
+CLASS="FILENAME"
+>rulename</TT
+></B
+></TT
+> :
+        name of the rule to be passed to the <TT
+CLASS="LITERAL"
+>make</TT
+> command.
+        By default : <TT
+CLASS="USERINPUT"
+><B
+>install</B
+></TT
+>. In the unlikely
+        case you wants to remove a tool, you can pass
+        <TT
+CLASS="USERINPUT"
+><B
+>uninstall</B
+></TT
+>.
+        </P
+></LI
 ></UL
 >
    </P
@ -721,7 +768,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN205"
+NAME="AEN219"
 ></A
 ><H2
 > Configuration file <TT
@ -884,7 +931,7 @@ CLASS="LITERAL"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN250"
+NAME="AEN264"
 ></A
 ><H2
 > Examples </H2
@ -994,6 +1041,38 @@ CLASS="USERINPUT"
 ></TD
 ></TR
 ></TABLE
+>
+    </P
+><P
+>    Remove <TT
+CLASS="LITERAL"
+>poire</TT
+> tool from the system-wide tree.
+    (<TT
+CLASS="LITERAL"
+>poire</TT
+> is the old name of <TT
+CLASS="LITERAL"
+>nero</TT
+>).
+    <TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="SCREEN"
+>$ <TT
+CLASS="USERINPUT"
+><B
+>attila --asim --tool=poire --rule=uninstall</B
+></TT
+>
+    </PRE
+></TD
+></TR
+></TABLE
 >
    </P
 ></DIV
--- a/alliance/src/attila/doc/builddoc.sh
+++ b/alliance/src/attila/doc/builddoc.sh
@ -89,7 +89,7 @@
 echo "EXTRA_DIST = \$(pkghtml_DATA)" >> $DOC_AM
 mv $DOC_AM $TOOL/Makefile.am

- if [ -f ./CVS-$TOOL ]; then
+ if [ -d ./CVS-$TOOL ]; then
   mv ./CVS-$TOOL $TOOL/CVS
   mv ./CVS-SS-$TOOL $TOOL/stylesheet-images/CVS
 fi
--- a/alliance/src/attila/doc/man1/attila.1
+++ b/alliance/src/attila/doc/man1/attila.1
@ -1,13 +1,18 @@
-.\\" auto-generated by docbook2man-spec $Revision: 1.1 $
-.TH "ATTILA" "1" "29 September 2002" "ASIM/LIP6" "Alliance - attila User's Manual"
+.\\" auto-generated by docbook2man-spec $Revision: 1.2 $
+.TH "ATTILA" "1" "01 October 2002" "ASIM/LIP6" "Alliance - attila User's Manual"
 .SH NAME
 attila \- A Tool Installer
 .SH SYNOPSIS
 .sp
 \fBattila\fR [ \fB-h\fR ]  [ \fB-S\fR ]  [ \fB-U\fR ]  [ \fB-F\fR ]  [ \fB-A\fR ] 
+
 [ \fB--help\fR ]  [ \fB--ssh\fR ]  [ \fB--user\fR ]  [ \fB--asim\fR ] 
+
 [ \fB--prefix=\fIINSTALL_DIR\fB\fR ]  [ \fB--builddir=\fIBUILD_DIR\fB\fR ] 
+
 \fB--tool=\fIname1\fB\fR [ \fB--tool=\fIname2\fB\fR\fI...\fR ] 
+
+ \fB--rule=\fIrulename\fB\fR
 .SH "DESCRIPTION"
 .PP
 attila automates the process of compiling
@ -35,9 +40,12 @@ your ~/.rhosts to access them whithout
 passwords. You also can uses ssh (but the
 procedure to allow automatic login is more complicated).
 .IP 3. 
+Run autostuff for the tool in the
+~/alliance/src directory.
+.IP 4. 
 Run configure in the build
 directory (see below).
-.IP 4. 
+.IP 5. 
 Install the tool in the local install directory (see below)
 or in the system-wide \fBAlliance\fR directory
 rooted under /asim/alliance.
@ -175,6 +183,13 @@ override the default building directory.
 \(bu
 \fB--tool=\fIname1\fB\fR\ :
 name of the tool to be installed.
+.TP 0.2i
+\(bu
+\fB--rule=\fIrulename\fB\fR\ :
+name of the rule to be passed to the make command.
+By default\ : \fBinstall\fR. In the unlikely
+case you wants to remove a tool, you can pass
+\fBuninstall\fR.
 .PP
 .SH "CONFIGURATION FILE ATTILA.CONF"
 .PP
@ -258,3 +273,12 @@ $ \fBattila --tool=mbk --tool=genlib\fR
    
 .sp
 .fi
+.PP
+Remove poire tool from the system-wide tree.
+(poire is the old name of nero).
+.sp
+.nf
+$ \fBattila --asim --tool=poire --rule=uninstall\fR
+    
+.sp
+.fi
--- a/alliance/src/attila/doc/man_attila.sgm
+++ b/alliance/src/attila/doc/man_attila.sgm
@ -34,6 +34,8 @@
        <sbr>
        <arg choice="req">--tool=<replaceable>name1</replaceable></arg>
        <arg rep="repeat">--tool=<replaceable>name2</replaceable></arg>
+        <sbr>
+        <arg choice="req">--rule=<replaceable>rulename</replaceable></arg>
    </cmdsynopsis>
  </refsynopsisdiv>

@ -69,6 +71,11 @@
          procedure to allow automatic login is more complicated).
          </para>
        </listitem>
+        <listitem>
+          <para> Run <literal>autostuff</literal> for the tool in the
+          <literal>~/alliance/src</literal> directory.
+          </para>
+        </listitem>
        <listitem>
          <para> Run <literal>configure</literal> in the build
          directory (see below).
@ -261,6 +268,14 @@
        name of the tool to be installed.
        </para>
      </listitem>
+      <listitem>
+        <para> <userinput>--rule=<filename>rulename</filename></userinput>&nbsp;:
+        name of the rule to be passed to the <literal>make</literal> command.
+        By default&nbsp;: <userinput>install</userinput>. In the unlikely
+        case you wants to remove a tool, you can pass
+        <userinput>uninstall</userinput>.
+        </para>
+      </listitem>
    </itemizedlist>
    </para>
  </refsect1>
@ -357,6 +372,13 @@ $ <userinput>attila --asim --tool=nero</userinput>
 $ <userinput>attila --tool=mbk --tool=genlib</userinput>
    </screen>
    </para>
+    <para>
+    Remove <literal>poire</literal> tool from the system-wide tree.
+    (<literal>poire</literal> is the old name of <literal>nero</literal>).
+    <screen>
+$ <userinput>attila --asim --tool=poire --rule=uninstall</userinput>
+    </screen>
+    </para>

  </refsect1>

--- 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.3 2002/09/30 18:30:11 jpc Exp $
+# $Id: attila.sh,v 1.4 2002/10/01 14:02:11 jpc Exp $
 #                                                                        
 # /------------------------------------------------------------------\
 # |                                                                  |
@ -63,6 +63,8 @@
   echo "           \"\$HOME/alliance/\$OS/build\"."
   echo "     o [--tool=<name1>] : The name of the tool to be processed, at"
   echo "         least one must be present."
+   echo "     o [--rule=<rule>] : The name of the rule to be executed by the"
+   echo "         Makefile (default : \"install\")."
   echo ""
   echo ""
 }
@ -298,6 +300,7 @@
   fi


+   cd $HOME
  # Check out minimal set of files if needed.
   for file in $CVS_STARTUP_FILES; do
     if [ ! -f $HOME/alliance/src/$file ]; then
@ -306,6 +309,7 @@
   done


+
  # Checks for tools sources.
   echo "  o  Checking tools sources."
   for TOOL in $TOOLS; do
@ -397,7 +401,7 @@


   cd $HOME/alliance/src
-   if [ ! -f $TOOL/Makefile.in ]; then
+   if [ ! -f Makefile.in ]; then
     ./autostuff
   fi

@ -434,8 +438,9 @@
     fi
     cd $TOOL

+     echo "     - Making rule $RULE for $TOOL."
     $SRC_DIR/$TOOL/configure --prefix=$INSTALL_DIR
-     $MAKE prefix=$INSTALL_DIR install
+     $MAKE prefix=$INSTALL_DIR $RULE

     cd ..
     if [ "$ASIM" = "y" ]; then
@ -491,6 +496,7 @@


               TOOLS=""
+                RULE="install"

                ASIM="n"
                FULL="n"
@ -547,6 +553,12 @@
                      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;;

    # Short arguments.
     -*) SHORTS="$1"; NB=2; CH=`echo $SHORTS | cut -c$NB`
@ -608,6 +620,7 @@ if [ "$FULL" = "y" ]; then
   else
     ARGS="$ARGS --user"
   fi
+   ARGS="$ARGS --rule=$RULE"

   for TOOL in $TOOLS; do
     ARGS="$ARGS --tool=$TOOL"