* attila/etc/attila.conf :
- Ajout de la macro "oldgcc.m4" dans la liste des CVS_STARTUP_FILES, pour nero & ocp. * attila/src/attila.sh : - Recherche de l'OS deplacee de "compile_tool()" vers "load_conf()". - Ajout d'une phase de substitution de l'OS dans la variable ALLIANCE_TOP (fonction "switch_os()"). Necessaire, car dans le cas d'une reinstallation complete ALLIANCE_TOP peut etre transmis au travers du rsh/ssh avec pour valeur celle de la machine d'ou a ete lance attila. Donc si on part d'une Linux vers une Solaris on n'utilisera pas le bon ALLIANCE_TOP, d'ou la phase de substitution. Remarque : si ALLIANCE_TOP est forcee a "/asim/alliance" ca marche toujours. Remarque 2 : tout cela est tres fortement dependant du schema de nommage adopte a l'ASIM ...
This commit is contained in:
parent
b9f5507598
commit
379fba288e
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# $Id: attila.conf,v 1.5 2002/10/15 18:55:47 jpc Exp $
|
||||
# $Id: attila.conf,v 1.6 2002/11/11 20:47:27 jpc Exp $
|
||||
#
|
||||
# -*- Mode: Shell-script -*-
|
||||
#
|
||||
|
@ -53,6 +53,7 @@
|
|||
CVS_STARTUP_FILES="$CVS_STARTUP_FILES alliance.m4"
|
||||
CVS_STARTUP_FILES="$CVS_STARTUP_FILES motif.m4"
|
||||
CVS_STARTUP_FILES="$CVS_STARTUP_FILES xpm.m4"
|
||||
CVS_STARTUP_FILES="$CVS_STARTUP_FILES oldgcc.m4"
|
||||
CVS_STARTUP_FILES="$CVS_STARTUP_FILES configure.in"
|
||||
CVS_STARTUP_FILES="$CVS_STARTUP_FILES Makefile.am"
|
||||
#CVS_STARTUP_FILES="$CVS_STARTUP_FILES install.sh"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# $Id: attila.sh,v 1.9 2002/10/17 22:42:09 jpc Exp $
|
||||
# $Id: attila.sh,v 1.10 2002/11/11 20:47:31 jpc Exp $
|
||||
#
|
||||
# /------------------------------------------------------------------\
|
||||
# | |
|
||||
|
@ -194,6 +194,26 @@
|
|||
|
||||
|
||||
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
# Function : `switch_os()'.
|
||||
|
||||
switch_os ()
|
||||
{
|
||||
TOP_PATH="$1"
|
||||
|
||||
SUBST_PATH="$TOP_PATH"
|
||||
for _OS in $ALL_OSS; do
|
||||
SUBST_PATH=`echo $SUBST_PATH | sed "s,$_OS,__OS__,"`
|
||||
done
|
||||
|
||||
SUBST_PATH=`echo $SUBST_PATH | sed "s,__OS__,$ALLIANCE_OS,"`
|
||||
|
||||
echo "$SUBST_PATH"
|
||||
}
|
||||
|
||||
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
# Function : `load_conf()'.
|
||||
#
|
||||
|
@ -208,6 +228,11 @@
|
|||
|
||||
load_conf ()
|
||||
{
|
||||
ALLIANCE_OS=`guess_os`
|
||||
echo " o Guessed OS : $ALLIANCE_OS"
|
||||
|
||||
ALLIANCE_TOP=`switch_os $ALLIANCE_TOP`
|
||||
|
||||
echo " o Loading configuration file."
|
||||
|
||||
if [ "$ATTILA_ALLIANCE_TOP" = "__ALLIANCE_INSTALL_DIR__" ]; then
|
||||
|
@ -375,7 +400,6 @@
|
|||
|
||||
echo " o Compilation environment."
|
||||
|
||||
ALLIANCE_OS=`guess_os`
|
||||
case "$ALLIANCE_OS" in
|
||||
"Linux") MAKE="make";;
|
||||
"Solaris") MAKE="gmake";;
|
||||
|
@ -508,6 +532,7 @@
|
|||
# Internal variables.
|
||||
|
||||
|
||||
ALL_OSS="Linux Solaris"
|
||||
CC=gcc
|
||||
CXX=g++
|
||||
export CC CXX
|
||||
|
|
Loading…
Reference in New Issue